Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
Showing the changes to interface/src/Application.cpp (1 of 36 files). Show all
Unified · Split
| @@ -2182,7 +2182,8 @@ int Application::sendNackPackets() { · 2181 unmodified lines | ||
| 2182 | 2182 | OctreeSceneStats& stats = _octreeServerSceneStats[nodeUUID]; |
| 2183 | 2183 | |
| 2184 | 2184 | // make copy of missing sequence numbers from stats |
| 2185 | − const QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers = stats.getMissingSequenceNumbers(); | |
| 2185 | + const QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers = | |
| 2186 | + stats.getIncomingOctreeSequenceNumberStats().getMissingSet(); | |
| 2186 | 2187 | |
| 2187 | 2188 | _octreeSceneStatsLock.unlock(); |
| 2188 | 2189 | |
| @@ -3304,6 +3305,10 @@ void Application::nodeKilled(SharedNodePointer node) { · 1115 unmodified lines | ||
| 3304 | 3305 | _particleEditSender.nodeKilled(node); |
| 3305 | 3306 | _modelEditSender.nodeKilled(node); |
| 3306 | 3307 | |
| 3308 | + if (node->getType() == NodeType::AudioMixer) { | |
| 3309 | + QMetaObject::invokeMethod(&_audio, "resetIncomingMixedAudioSequenceNumberStats"); | |
| 3310 | + } | |
| 3311 | + | |
| 3307 | 3312 | if (node->getType() == NodeType::VoxelServer) { |
| 3308 | 3313 | QUuid nodeUUID = node->getUUID(); |
| 3309 | 3314 | // see if this is the first we've heard of this node... |
| @@ -3627,6 +3632,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 317 unmodified lines | ||
| 3627 | 3632 | // when the application is about to quit, stop our script engine so it unwinds properly |
| 3628 | 3633 | connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop())); |
| 3629 | 3634 | |
| 3635 | + NodeList* nodeList = NodeList::getInstance(); | |
| 3636 | + connect(nodeList, &NodeList::nodeKilled, scriptEngine, &ScriptEngine::nodeKilled); | |
| 3637 | + | |
| 3630 | 3638 | scriptEngine->moveToThread(workerThread); |
| 3631 | 3639 | |
| 3632 | 3640 | // Starts an event loop, and emits workerThread->started() |