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
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include "Application.h"12#include "AudioClient.h"
13#include "AudioDeviceScriptingInterface.h"13#include "AudioDeviceScriptingInterface.h"
14 14
15 15
@@ -21,6 +21,8 @@ AudioDeviceScriptingInterface* AudioDeviceScriptingInterface::getInstance() { · 5 unmodified lines
21AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {21AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {
22 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,22 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,
23 this, &AudioDeviceScriptingInterface::muteToggled);23 this, &AudioDeviceScriptingInterface::muteToggled);
24 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::deviceChanged,
25 this, &AudioDeviceScriptingInterface::deviceChanged);
24}26}
25 27
26bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) {28bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) {