Showing the changes to interface/src/Application.cpp (1 of 28 files). Show all
Unified · Split
| @@ -162,7 +162,7 @@ bool setupEssentials(int& argc, char** argv) { · 161 unmodified lines | |||
| 162 | auto geometryCache = DependencyManager::set<GeometryCache>(); | 162 | auto geometryCache = DependencyManager::set<GeometryCache>(); |
| 163 | auto glowEffect = DependencyManager::set<GlowEffect>(); | 163 | auto glowEffect = DependencyManager::set<GlowEffect>(); |
| 164 | auto faceshift = DependencyManager::set<Faceshift>(); | 164 | auto faceshift = DependencyManager::set<Faceshift>(); |
| 165 | auto audio = DependencyManager::set<Audio>(); | 165 | auto audio = DependencyManager::set<AudioClient>(); |
| 166 | auto audioScope = DependencyManager::set<AudioScope>(); | 166 | auto audioScope = DependencyManager::set<AudioScope>(); |
| 167 | auto audioIOStatsRenderer = DependencyManager::set<AudioIOStatsRenderer>(); | 167 | auto audioIOStatsRenderer = DependencyManager::set<AudioIOStatsRenderer>(); |
| 168 | auto deferredLightingEffect = DependencyManager::set<DeferredLightingEffect>(); | 168 | auto deferredLightingEffect = DependencyManager::set<DeferredLightingEffect>(); |
| @@ -278,9 +278,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 109 unmodified lines | |||
| 278 | // put the audio processing on a separate thread | 278 | // put the audio processing on a separate thread |
| 279 | QThread* audioThread = new QThread(this); | 279 | QThread* audioThread = new QThread(this); |
| 280 | 280 | ||
| 281 | auto audioIO = DependencyManager::get<Audio>(); | 281 | auto audioIO = DependencyManager::get<AudioClient>(); |
| 282 | audioIO->moveToThread(audioThread); | 282 | audioIO->moveToThread(audioThread); |
| 283 | connect(audioThread, &QThread::started, audioIO.data(), &Audio::start); | 283 | connect(audioThread, &QThread::started, audioIO.data(), &AudioClient::start); |
| 284 | 284 | ||
| 285 | audioThread->start(); | 285 | audioThread->start(); |
| 286 | 286 | ||
| @@ -476,7 +476,7 @@ Application::~Application() { · 189 unmodified lines | |||
| 476 | // kill any audio injectors that are still around | 476 | // kill any audio injectors that are still around |
| 477 | AudioScriptingInterface::getInstance().stopAllInjectors(); | 477 | AudioScriptingInterface::getInstance().stopAllInjectors(); |
| 478 | 478 | ||
| 479 | auto audioIO = DependencyManager::get<Audio>(); | 479 | auto audioIO = DependencyManager::get<AudioClient>(); |
| 480 | 480 | ||
| 481 | // stop the audio process | 481 | // stop the audio process |
| 482 | QMetaObject::invokeMethod(audioIO.data(), "stop", Qt::BlockingQueuedConnection); | 482 | QMetaObject::invokeMethod(audioIO.data(), "stop", Qt::BlockingQueuedConnection); |
| @@ -2117,7 +2117,7 @@ void Application::update(float deltaTime) { · 1634 unmodified lines | |||
| 2117 | if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS) { | 2117 | if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS) { |
| 2118 | _lastSendDownstreamAudioStats = now; | 2118 | _lastSendDownstreamAudioStats = now; |
| 2119 | 2119 | ||
| 2120 | QMetaObject::invokeMethod(DependencyManager::get<Audio>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection); | 2120 | QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection); |
| 2121 | } | 2121 | } |
| 2122 | } | 2122 | } |
| 2123 | } | 2123 | } |
| @@ -3113,7 +3113,7 @@ void Application::resetSensors() { · 989 unmodified lines | |||
| 3113 | 3113 | ||
| 3114 | _myAvatar->reset(); | 3114 | _myAvatar->reset(); |
| 3115 | 3115 | ||
| 3116 | QMetaObject::invokeMethod(DependencyManager::get<Audio>().data(), "reset", Qt::QueuedConnection); | 3116 | QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection); |
| 3117 | } | 3117 | } |
| 3118 | 3118 | ||
| 3119 | static void setShortcutsEnabled(QWidget* widget, bool enabled) { | 3119 | static void setShortcutsEnabled(QWidget* widget, bool enabled) { |
| @@ -3253,7 +3253,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 133 unmodified lines | |||
| 3253 | _entityEditSender.nodeKilled(node); | 3253 | _entityEditSender.nodeKilled(node); |
| 3254 | 3254 | ||
| 3255 | if (node->getType() == NodeType::AudioMixer) { | 3255 | if (node->getType() == NodeType::AudioMixer) { |
| 3256 | QMetaObject::invokeMethod(DependencyManager::get<Audio>().data(), "audioMixerKilled"); | 3256 | QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "audioMixerKilled"); |
| 3257 | } | 3257 | } |
| 3258 | 3258 | ||
| 3259 | if (node->getType() == NodeType::EntityServer) { | 3259 | if (node->getType() == NodeType::EntityServer) { |