History

Implemented Audio settings screen for Tablet UI

Vladyslav Stelmakhovskyi committed 9 years ago

Commit fc23c341 parent 93341558 files · +357 −7Browse files

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

Unified · Split

interface/src/scripting/AudioDeviceScriptingInterface.cpp+26−3
@@ -18,6 +18,21 @@ AudioDeviceScriptingInterface* AudioDeviceScriptingInterface::getInstance() { · 17 unmodified lines
18 return &sharedInstance;18 return &sharedInstance;
19}19}
20 20
21QStringList AudioDeviceScriptingInterface::inputAudioDevices() const
22{
23 return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioInput).toList();;
24}
25
26QStringList AudioDeviceScriptingInterface::outputAudioDevices() const
27{
28 return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput).toList();;
29}
30
31bool AudioDeviceScriptingInterface::muted()
32{
33 return getMuted();
34}
35
21AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {36AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {
22 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,37 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,
23 this, &AudioDeviceScriptingInterface::muteToggled);38 this, &AudioDeviceScriptingInterface::muteToggled);
@@ -31,7 +46,6 @@ bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) { · 7 unmodified lines
31 Qt::BlockingQueuedConnection,46 Qt::BlockingQueuedConnection,
32 Q_RETURN_ARG(bool, result),47 Q_RETURN_ARG(bool, result),
33 Q_ARG(const QString&, deviceName));48 Q_ARG(const QString&, deviceName));
34
35 return result;49 return result;
36}50}
37 51
@@ -41,7 +55,6 @@ bool AudioDeviceScriptingInterface::setOutputDevice(const QString& deviceName) { · 3 unmodified lines
41 Qt::BlockingQueuedConnection,55 Qt::BlockingQueuedConnection,
42 Q_RETURN_ARG(bool, result),56 Q_RETURN_ARG(bool, result),
43 Q_ARG(const QString&, deviceName));57 Q_ARG(const QString&, deviceName));
44
45 return result;58 return result;
46}59}
47 60
@@ -69,7 +82,6 @@ QVector<QString> AudioDeviceScriptingInterface::getOutputDevices() { · 21 unmodified lines
69 return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput);82 return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput);
70}83}
71 84
72
73float AudioDeviceScriptingInterface::getInputVolume() {85float AudioDeviceScriptingInterface::getInputVolume() {
74 return DependencyManager::get<AudioClient>()->getInputVolume();86 return DependencyManager::get<AudioClient>()->getInputVolume();
75}87}
@@ -90,6 +102,17 @@ void AudioDeviceScriptingInterface::toggleMute() { · 14 unmodified lines
90 DependencyManager::get<AudioClient>()->toggleMute();102 DependencyManager::get<AudioClient>()->toggleMute();
91}103}
92 104
105void AudioDeviceScriptingInterface::setMuted(bool muted)
106{
107 bool lMuted = getMuted();
108 if (lMuted == muted)
109 return;
110
111 toggleMute();
112 lMuted = getMuted();
113 emit mutedChanged(lMuted);
114}
115
93bool AudioDeviceScriptingInterface::getMuted() {116bool AudioDeviceScriptingInterface::getMuted() {
94 return DependencyManager::get<AudioClient>()->isMuted();117 return DependencyManager::get<AudioClient>()->isMuted();
95}118}