resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit f389e3a2 parents de46364 df51d2680 files · +2736 −1045Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 80 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+23−2

         init();
     }
     _isRunning = true;
+    _isFinished = false;
     emit runningStateChanged();
     QScriptValue result = _engine.evaluate(_scriptContents);
                         _numAvatarSoundSentBytes = 0;
                     }
                 }
                 QByteArray audioPacket = byteArrayWithPopulatedHeader(silentFrame
                                                                       ? PacketTypeSilentAudioFrame
                                                                       : PacketTypeMicrophoneAudioNoEcho);
                 QDataStream packetStream(&audioPacket, QIODevice::Append);
+                // pack a placeholder value for sequence number for now, will be packed when destination node is known
+                int numPreSequenceNumberBytes = audioPacket.size();
+                packetStream << (quint16)0;
                 // use the orientation and position of this avatar for the source of this audio
                 packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));
                 glm::quat headOrientation = _avatarData->getHeadOrientation();
                                               numAvailableSamples * sizeof(int16_t));
                 }
-                nodeList->broadcastToNodes(audioPacket, NodeSet() << NodeType::AudioMixer);
+                // write audio packet to AudioMixer nodes
+                NodeList* nodeList = NodeList::getInstance();
+                foreach(const SharedNodePointer& node, nodeList->getNodeHash()) {
+                    // only send to nodes of type AudioMixer
+                    if (node->getType() == NodeType::AudioMixer) {
+                        // pack sequence number
+                        quint16 sequence = _outgoingScriptAudioSequenceNumbers[node->getUUID()]++;
+                        memcpy(audioPacket.data() + numPreSequenceNumberBytes, &sequence, sizeof(quint16));
+                        // send audio packet
+                        nodeList->writeDatagram(audioPacket, node);
+                    }
+                }
             }
         }
         _engine.clearExceptions();
     }
 }
+void ScriptEngine::nodeKilled(SharedNodePointer node) {
+    _outgoingScriptAudioSequenceNumbers.remove(node->getUUID());
+}