Showing the changes to interface/src/Application.cpp (1 of 55 files). Show all
Unified · Split
| @@ -420,7 +420,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 419 unmodified lines | |||
| 420 | _trayIcon->show(); | 420 | _trayIcon->show(); |
| 421 | 421 | ||
| 422 | // set the local loopback interface for local sounds from audio scripts | 422 | // set the local loopback interface for local sounds from audio scripts |
| 423 | AudioScriptingInterface::getInstance().setLocalLoopbackInterface(&_audio); | 423 | AudioScriptingInterface::getInstance().setLocalAudioInterface(&_audio); |
| 424 | 424 | ||
| 425 | #ifdef HAVE_RTMIDI | 425 | #ifdef HAVE_RTMIDI |
| 426 | // setup the MIDIManager | 426 | // setup the MIDIManager |
| @@ -456,23 +456,22 @@ Application::~Application() { · 29 unmodified lines | |||
| 456 | // ask the datagram processing thread to quit and wait until it is done | 456 | // ask the datagram processing thread to quit and wait until it is done |
| 457 | _nodeThread->quit(); | 457 | _nodeThread->quit(); |
| 458 | _nodeThread->wait(); | 458 | _nodeThread->wait(); |
| 459 | |||
| 460 | // kill any audio injectors that are still around | ||
| 461 | AudioScriptingInterface::getInstance().stopAllInjectors(); | ||
| 459 | 462 | ||
| 460 | // stop the audio process | 463 | // stop the audio process |
| 461 | QMetaObject::invokeMethod(&_audio, "stop"); | 464 | QMetaObject::invokeMethod(&_audio, "stop"); |
| 462 | 465 | ||
| 463 | // ask the audio thread to quit and wait until it is done | 466 | // ask the audio thread to quit and wait until it is done |
| 464 | _audio.thread()->quit(); | 467 | _audio.thread()->quit(); |
| 465 | _audio.thread()->wait(); | 468 | _audio.thread()->wait(); |
| 466 | |||
| 467 | // kill any audio injectors that are still around | ||
| 468 | AudioScriptingInterface::getInstance().stopAllInjectors(); | ||
| 469 | 469 | ||
| 470 | _octreeProcessor.terminate(); | 470 | _octreeProcessor.terminate(); |
| 471 | _voxelHideShowThread.terminate(); | 471 | _voxelHideShowThread.terminate(); |
| 472 | _voxelEditSender.terminate(); | 472 | _voxelEditSender.terminate(); |
| 473 | _entityEditSender.terminate(); | 473 | _entityEditSender.terminate(); |
| 474 | 474 | ||
| 475 | |||
| 476 | VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown | 475 | VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown |
| 477 | Menu::getInstance()->deleteLater(); | 476 | Menu::getInstance()->deleteLater(); |
| 478 | 477 | ||
| @@ -1537,11 +1536,6 @@ void Application::idle() { · 1058 unmodified lines | |||
| 1537 | _idleLoopStdev.reset(); | 1536 | _idleLoopStdev.reset(); |
| 1538 | } | 1537 | } |
| 1539 | 1538 | ||
| 1540 | if (Menu::getInstance()->isOptionChecked(MenuOption::BuckyBalls)) { | ||
| 1541 | PerformanceTimer perfTimer("buckyBalls"); | ||
| 1542 | _buckyBalls.simulate(timeSinceLastUpdate / 1000.f, Application::getInstance()->getAvatar()->getHandData()); | ||
| 1543 | } | ||
| 1544 | |||
| 1545 | // After finishing all of the above work, restart the idle timer, allowing 2ms to process events. | 1539 | // After finishing all of the above work, restart the idle timer, allowing 2ms to process events. |
| 1546 | idleTimer->start(2); | 1540 | idleTimer->start(2); |
| 1547 | 1541 | ||
| @@ -3005,13 +2999,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 1457 unmodified lines | |||
| 3005 | _audioReflector.render(); | 2999 | _audioReflector.render(); |
| 3006 | } | 3000 | } |
| 3007 | 3001 | ||
| 3008 | if (Menu::getInstance()->isOptionChecked(MenuOption::BuckyBalls)) { | ||
| 3009 | PerformanceTimer perfTimer("buckyBalls"); | ||
| 3010 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | ||
| 3011 | "Application::displaySide() ... bucky balls..."); | ||
| 3012 | _buckyBalls.render(); | ||
| 3013 | } | ||
| 3014 | |||
| 3015 | // Draw voxels | 3002 | // Draw voxels |
| 3016 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { | 3003 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { |
| 3017 | PerformanceTimer perfTimer("voxels"); | 3004 | PerformanceTimer perfTimer("voxels"); |