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
1818 return &sharedInstance;
1919 }
2020
21+QStringList AudioDeviceScriptingInterface::inputAudioDevices() const
22+{
23+ return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioInput).toList();;
24+}
25+
26+QStringList AudioDeviceScriptingInterface::outputAudioDevices() const
27+{
28+ return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput).toList();;
29+}
30+
31+bool AudioDeviceScriptingInterface::muted()
32+{
33+ return getMuted();
34+}
35+
2136 AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {
2237 connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,
2338 this, &AudioDeviceScriptingInterface::muteToggled);
@@ -31,7 +46,6 @@ bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) { · 7 unmodified lines
3146 Qt::BlockingQueuedConnection,
3247 Q_RETURN_ARG(bool, result),
3348 Q_ARG(const QString&, deviceName));
34−
3549 return result;
3650 }
3751
@@ -41,7 +55,6 @@ bool AudioDeviceScriptingInterface::setOutputDevice(const QString& deviceName) { · 3 unmodified lines
4155 Qt::BlockingQueuedConnection,
4256 Q_RETURN_ARG(bool, result),
4357 Q_ARG(const QString&, deviceName));
44−
4558 return result;
4659 }
4760
@@ -69,7 +82,6 @@ QVector<QString> AudioDeviceScriptingInterface::getOutputDevices() { · 21 unmodified lines
6982 return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput);
7083 }
7184
72−
7385 float AudioDeviceScriptingInterface::getInputVolume() {
7486 return DependencyManager::get<AudioClient>()->getInputVolume();
7587 }
@@ -90,6 +102,17 @@ void AudioDeviceScriptingInterface::toggleMute() { · 14 unmodified lines
90102 DependencyManager::get<AudioClient>()->toggleMute();
91103 }
92104
105+void 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+
93116 bool AudioDeviceScriptingInterface::getMuted() {
94117 return DependencyManager::get<AudioClient>()->isMuted();
95118 }