History

intial removal of Audio to audio-client

Stephen Birarda committed 11 years ago

Commit 0eced091 parent 57743f128 files · +1048 −143Browse files

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

Unified · Split

interface/src/scripting/AudioDeviceScriptingInterface.cpp+15−15
@@ -19,13 +19,13 @@ AudioDeviceScriptingInterface* AudioDeviceScriptingInterface::getInstance() { · 18 unmodified lines
1919 }
2020
2121 AudioDeviceScriptingInterface::AudioDeviceScriptingInterface() {
22− connect(DependencyManager::get<Audio>().data(), &Audio::muteToggled,
22+ connect(DependencyManager::get<AudioClient>().data(), &AudioClient::muteToggled,
2323 this, &AudioDeviceScriptingInterface::muteToggled);
2424 }
2525
2626 bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) {
2727 bool result;
28− QMetaObject::invokeMethod(DependencyManager::get<Audio>().data(), "switchInputToAudioDevice",
28+ QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "switchInputToAudioDevice",
2929 Qt::BlockingQueuedConnection,
3030 Q_RETURN_ARG(bool, result),
3131 Q_ARG(const QString&, deviceName));
@@ -35,7 +35,7 @@ bool AudioDeviceScriptingInterface::setInputDevice(const QString& deviceName) { · 3 unmodified lines
3535
3636 bool AudioDeviceScriptingInterface::setOutputDevice(const QString& deviceName) {
3737 bool result;
38− QMetaObject::invokeMethod(DependencyManager::get<Audio>().data(), "switchOutputToAudioDevice",
38+ QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "switchOutputToAudioDevice",
3939 Qt::BlockingQueuedConnection,
4040 Q_RETURN_ARG(bool, result),
4141 Q_ARG(const QString&, deviceName));
@@ -44,50 +44,50 @@ bool AudioDeviceScriptingInterface::setOutputDevice(const QString& deviceName) { · 2 unmodified lines
4444 }
4545
4646 QString AudioDeviceScriptingInterface::getInputDevice() {
47− return DependencyManager::get<Audio>()->getDeviceName(QAudio::AudioInput);
47+ return DependencyManager::get<AudioClient>()->getDeviceName(QAudio::AudioInput);
4848 }
4949
5050 QString AudioDeviceScriptingInterface::getOutputDevice() {
51− return DependencyManager::get<Audio>()->getDeviceName(QAudio::AudioOutput);
51+ return DependencyManager::get<AudioClient>()->getDeviceName(QAudio::AudioOutput);
5252 }
5353
5454 QString AudioDeviceScriptingInterface::getDefaultInputDevice() {
55− return DependencyManager::get<Audio>()->getDefaultDeviceName(QAudio::AudioInput);
55+ return DependencyManager::get<AudioClient>()->getDefaultDeviceName(QAudio::AudioInput);
5656 }
5757
5858 QString AudioDeviceScriptingInterface::getDefaultOutputDevice() {
59− return DependencyManager::get<Audio>()->getDefaultDeviceName(QAudio::AudioOutput);
59+ return DependencyManager::get<AudioClient>()->getDefaultDeviceName(QAudio::AudioOutput);
6060 }
6161
6262 QVector<QString> AudioDeviceScriptingInterface::getInputDevices() {
63− return DependencyManager::get<Audio>()->getDeviceNames(QAudio::AudioInput);
63+ return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioInput);
6464 }
6565
6666 QVector<QString> AudioDeviceScriptingInterface::getOutputDevices() {
67− return DependencyManager::get<Audio>()->getDeviceNames(QAudio::AudioOutput);
67+ return DependencyManager::get<AudioClient>()->getDeviceNames(QAudio::AudioOutput);
6868 }
6969
7070
7171 float AudioDeviceScriptingInterface::getInputVolume() {
72− return DependencyManager::get<Audio>()->getInputVolume();
72+ return DependencyManager::get<AudioClient>()->getInputVolume();
7373 }
7474
7575 void AudioDeviceScriptingInterface::setInputVolume(float volume) {
76− DependencyManager::get<Audio>()->setInputVolume(volume);
76+ DependencyManager::get<AudioClient>()->setInputVolume(volume);
7777 }
7878
7979 void AudioDeviceScriptingInterface::setReverb(bool reverb) {
80− DependencyManager::get<Audio>()->setReverb(reverb);
80+ DependencyManager::get<AudioClient>()->setReverb(reverb);
8181 }
8282
8383 void AudioDeviceScriptingInterface::setReverbOptions(const AudioEffectOptions* options) {
84− DependencyManager::get<Audio>()->setReverbOptions(options);
84+ DependencyManager::get<AudioClient>()->setReverbOptions(options);
8585 }
8686
8787 void AudioDeviceScriptingInterface::toggleMute() {
88− DependencyManager::get<Audio>()->toggleMute();
88+ DependencyManager::get<AudioClient>()->toggleMute();
8989 }
9090
9191 bool AudioDeviceScriptingInterface::getMuted() {
92− return DependencyManager::get<Audio>()->isMuted();
92+ return DependencyManager::get<AudioClient>()->isMuted();
9393 }