Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 14:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated audio wording and removed audio defaul spamming.

Browse source
This commit is contained in:
amer cerkic 2019-10-01 16:55:37 -07:00
parent 9b956a2f9b
commit c0a852d68c
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/AudioDevices.cpp
View file

@ -282,9 +282,9 @@ void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices
if (deviceInfo.isDefault()) { if (deviceInfo.isDefault()) {
if (deviceInfo.getMode() == QAudio::AudioInput) { if (deviceInfo.getMode() == QAudio::AudioInput) {
device.display = "Default microphone (recommended)"; device.display = "Computer's default microphone (recommended)";
} else { } else {
device.display = "Default audio (recommended)"; device.display = "Computer's default audio (recommended)";
} }
} else { } else {
device.display = device.info.deviceName() device.display = device.info.deviceName()

8
libraries/audio-client/src/AudioClient.cpp
View file

@ -494,7 +494,9 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
waveInGetDevCaps(WAVE_MAPPER, &wic, sizeof(wic)); waveInGetDevCaps(WAVE_MAPPER, &wic, sizeof(wic));
//Use the received manufacturer id to get the device's real name //Use the received manufacturer id to get the device's real name
waveInGetDevCaps(wic.wMid, &wic, sizeof(wic)); waveInGetDevCaps(wic.wMid, &wic, sizeof(wic));
#if !defined(NDEBUG)
qCDebug(audioclient) << "input device:" << wic.szPname; qCDebug(audioclient) << "input device:" << wic.szPname;
#endif
deviceName = wic.szPname; deviceName = wic.szPname;
} else { } else {
WAVEOUTCAPS woc; WAVEOUTCAPS woc;
@ -502,7 +504,9 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
waveOutGetDevCaps(WAVE_MAPPER, &woc, sizeof(woc)); waveOutGetDevCaps(WAVE_MAPPER, &woc, sizeof(woc));
//Use the received manufacturer id to get the device's real name //Use the received manufacturer id to get the device's real name
waveOutGetDevCaps(woc.wMid, &woc, sizeof(woc)); waveOutGetDevCaps(woc.wMid, &woc, sizeof(woc));
#if !defined(NDEBUG)
qCDebug(audioclient) << "output device:" << woc.szPname; qCDebug(audioclient) << "output device:" << woc.szPname;
#endif
deviceName = woc.szPname; deviceName = woc.szPname;
} }
} else { } else {
@ -532,10 +536,10 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
break; break;
} }
} }
#if !defined(NDEBUG)
qCDebug(audioclient) << "defaultAudioDeviceForMode mode: " << (mode == QAudio::AudioOutput ? "Output" : "Input") qCDebug(audioclient) << "defaultAudioDeviceForMode mode: " << (mode == QAudio::AudioOutput ? "Output" : "Input")
<< " [" << deviceName << "] [" << foundDevice.deviceName() << "]"; << " [" << deviceName << "] [" << foundDevice.deviceName() << "]";
#endif
return foundDevice; return foundDevice;
#endif #endif