Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -740,23 +740,24 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 739 unmodified lines | |||
| 740 | } | 740 | } |
| 741 | }); | 741 | }); |
| 742 | 742 | ||
| 743 | auto& audioScriptingInterface = AudioScriptingInterface::getInstance(); | 743 | auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface>(); |
| 744 | connect(audioThread, &QThread::started, audioIO.data(), &AudioClient::start); | 744 | connect(audioThread, &QThread::started, audioIO.data(), &AudioClient::start); |
| 745 | connect(audioIO.data(), &AudioClient::destroyed, audioThread, &QThread::quit); | 745 | connect(audioIO.data(), &AudioClient::destroyed, audioThread, &QThread::quit); |
| 746 | connect(audioThread, &QThread::finished, audioThread, &QThread::deleteLater); | 746 | connect(audioThread, &QThread::finished, audioThread, &QThread::deleteLater); |
| 747 | connect(audioIO.data(), &AudioClient::muteToggled, this, &Application::audioMuteToggled); | 747 | connect(audioIO.data(), &AudioClient::muteToggled, this, &Application::audioMuteToggled); |
| 748 | connect(audioIO.data(), &AudioClient::mutedByMixer, &audioScriptingInterface, &AudioScriptingInterface::mutedByMixer); | 748 | connect(audioIO.data(), &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer); |
| 749 | connect(audioIO.data(), &AudioClient::receivedFirstPacket, &audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket); | 749 | connect(audioIO.data(), &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket); |
| 750 | connect(audioIO.data(), &AudioClient::disconnected, &audioScriptingInterface, &AudioScriptingInterface::disconnected); | 750 | connect(audioIO.data(), &AudioClient::disconnected, audioScriptingInterface.data(), &AudioScriptingInterface::disconnected); |
| 751 | connect(audioIO.data(), &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) { | 751 | connect(audioIO.data(), &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) { |
| 752 | auto audioClient = DependencyManager::get<AudioClient>(); | 752 | auto audioClient = DependencyManager::get<AudioClient>(); |
| 753 | auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>(); | ||
| 753 | auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getPosition(); | 754 | auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getPosition(); |
| 754 | float distance = glm::distance(myAvatarPosition, position); | 755 | float distance = glm::distance(myAvatarPosition, position); |
| 755 | bool shouldMute = !audioClient->isMuted() && (distance < radius); | 756 | bool shouldMute = !audioClient->isMuted() && (distance < radius); |
| 756 | 757 | ||
| 757 | if (shouldMute) { | 758 | if (shouldMute) { |
| 758 | audioClient->toggleMute(); | 759 | audioClient->toggleMute(); |
| 759 | AudioScriptingInterface::getInstance().environmentMuted(); | 760 | audioScriptingInterface->environmentMuted(); |
| 760 | } | 761 | } |
| 761 | }); | 762 | }); |
| 762 | 763 | ||
| @@ -1181,10 +1182,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 418 unmodified lines | |||
| 1181 | 1182 | ||
| 1182 | // set the local loopback interface for local sounds | 1183 | // set the local loopback interface for local sounds |
| 1183 | AudioInjector::setLocalAudioInterface(audioIO.data()); | 1184 | AudioInjector::setLocalAudioInterface(audioIO.data()); |
| 1184 | AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); | 1185 | audioScriptingInterface->setLocalAudioInterface(audioIO.data()); |
| 1185 | connect(audioIO.data(), &AudioClient::noiseGateOpened, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateOpened); | 1186 | connect(audioIO.data(), &AudioClient::noiseGateOpened, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateOpened); |
| 1186 | connect(audioIO.data(), &AudioClient::noiseGateClosed, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateClosed); | 1187 | connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed); |
| 1187 | connect(audioIO.data(), &AudioClient::inputReceived, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::inputReceived); | 1188 | connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived); |
| 1188 | 1189 | ||
| 1189 | 1190 | ||
| 1190 | this->installEventFilter(this); | 1191 | this->installEventFilter(this); |
| @@ -1949,7 +1950,7 @@ void Application::initializeUi() { · 758 unmodified lines | |||
| 1949 | // For some reason there is already an "Application" object in the QML context, | 1950 | // For some reason there is already an "Application" object in the QML context, |
| 1950 | // though I can't find it. Hence, "ApplicationInterface" | 1951 | // though I can't find it. Hence, "ApplicationInterface" |
| 1951 | rootContext->setContextProperty("ApplicationInterface", this); | 1952 | rootContext->setContextProperty("ApplicationInterface", this); |
| 1952 | rootContext->setContextProperty("Audio", &AudioScriptingInterface::getInstance()); | 1953 | rootContext->setContextProperty("Audio", DependencyManager::get<AudioScriptingInterface>().data()); |
| 1953 | rootContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); | 1954 | rootContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); |
| 1954 | rootContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data()); | 1955 | rootContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data()); |
| 1955 | 1956 | ||