Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -745,23 +745,24 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 744 unmodified lines | ||
| 745 | 745 | } |
| 746 | 746 | }); |
| 747 | 747 | |
| 748 | − auto& audioScriptingInterface = AudioScriptingInterface::getInstance(); | |
| 748 | + auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface>(); | |
| 749 | 749 | connect(audioThread, &QThread::started, audioIO.data(), &AudioClient::start); |
| 750 | 750 | connect(audioIO.data(), &AudioClient::destroyed, audioThread, &QThread::quit); |
| 751 | 751 | connect(audioThread, &QThread::finished, audioThread, &QThread::deleteLater); |
| 752 | 752 | connect(audioIO.data(), &AudioClient::muteToggled, this, &Application::audioMuteToggled); |
| 753 | − connect(audioIO.data(), &AudioClient::mutedByMixer, &audioScriptingInterface, &AudioScriptingInterface::mutedByMixer); | |
| 754 | − connect(audioIO.data(), &AudioClient::receivedFirstPacket, &audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket); | |
| 755 | − connect(audioIO.data(), &AudioClient::disconnected, &audioScriptingInterface, &AudioScriptingInterface::disconnected); | |
| 753 | + connect(audioIO.data(), &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer); | |
| 754 | + connect(audioIO.data(), &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket); | |
| 755 | + connect(audioIO.data(), &AudioClient::disconnected, audioScriptingInterface.data(), &AudioScriptingInterface::disconnected); | |
| 756 | 756 | connect(audioIO.data(), &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) { |
| 757 | 757 | auto audioClient = DependencyManager::get<AudioClient>(); |
| 758 | + auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>(); | |
| 758 | 759 | auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getPosition(); |
| 759 | 760 | float distance = glm::distance(myAvatarPosition, position); |
| 760 | 761 | bool shouldMute = !audioClient->isMuted() && (distance < radius); |
| 761 | 762 | |
| 762 | 763 | if (shouldMute) { |
| 763 | 764 | audioClient->toggleMute(); |
| 764 | − AudioScriptingInterface::getInstance().environmentMuted(); | |
| 765 | + audioScriptingInterface->environmentMuted(); | |
| 765 | 766 | } |
| 766 | 767 | }); |
| 767 | 768 | |
| @@ -1189,10 +1190,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 421 unmodified lines | ||
| 1189 | 1190 | |
| 1190 | 1191 | // set the local loopback interface for local sounds |
| 1191 | 1192 | AudioInjector::setLocalAudioInterface(audioIO.data()); |
| 1192 | − AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); | |
| 1193 | − connect(audioIO.data(), &AudioClient::noiseGateOpened, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateOpened); | |
| 1194 | − connect(audioIO.data(), &AudioClient::noiseGateClosed, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateClosed); | |
| 1195 | − connect(audioIO.data(), &AudioClient::inputReceived, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::inputReceived); | |
| 1193 | + audioScriptingInterface->setLocalAudioInterface(audioIO.data()); | |
| 1194 | + connect(audioIO.data(), &AudioClient::noiseGateOpened, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateOpened); | |
| 1195 | + connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed); | |
| 1196 | + connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived); | |
| 1196 | 1197 | |
| 1197 | 1198 | |
| 1198 | 1199 | this->installEventFilter(this); |
| @@ -1956,7 +1957,7 @@ void Application::initializeUi() { · 757 unmodified lines | ||
| 1956 | 1957 | // For some reason there is already an "Application" object in the QML context, |
| 1957 | 1958 | // though I can't find it. Hence, "ApplicationInterface" |
| 1958 | 1959 | rootContext->setContextProperty("ApplicationInterface", this); |
| 1959 | − rootContext->setContextProperty("Audio", &AudioScriptingInterface::getInstance()); | |
| 1960 | + rootContext->setContextProperty("Audio", DependencyManager::get<AudioScriptingInterface>().data()); | |
| 1960 | 1961 | rootContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); |
| 1961 | 1962 | rootContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data()); |
| 1962 | 1963 | |