History

Merge branch 'master' of https://github.com/highfidelity/hifi into android

Atlante45 committed 11 years ago

Commit 4ef87b92 parents df96e02 347c74e113 files · +3501 −2168Browse files

Showing the changes to interface/src/scripting/AudioDeviceScriptingInterface.cpp (1 of 113 files). Show all

Unified · Split

interface/src/scripting/AudioDeviceScriptingInterface.cpp+3−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
1010 //
1111
12−#include "Application.h"
12+#include "AudioClient.h"
1313 #include "AudioDeviceScriptingInterface.h"
1414
1515
@@ -21,6 +21,8 @@ AudioDeviceScriptingInterface* AudioDeviceScriptingInterface::getInstance() { · 5 unmodified lines
2121 AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {
2222 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,
2323 this, &AudioDeviceScriptingInterface::muteToggled);
24+ connect(DependencyManager::get<AudioClient>().data(), &AudioClient::deviceChanged,
25+ this, &AudioDeviceScriptingInterface::deviceChanged);
2426 }
2527
2628 bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) {