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

space cleanup

Browse source
This commit is contained in:
amerhifi 2019-10-29 11:58:04 -07:00
parent 12cbc6ae62
commit 7d5dcbfc77
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,6 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
return deviceName; return deviceName;
} }
static QString getHmdAudioDeviceName(QAudio::Mode mode) { static QString getHmdAudioDeviceName(QAudio::Mode mode) {
foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getAllDisplayPlugins()) { foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getAllDisplayPlugins()) {
if (displayPlugin && displayPlugin->isHmd()) { if (displayPlugin && displayPlugin->isHmd()) {

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

@ -116,6 +116,7 @@ QList<HifiAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode, const QString&
defaultDesktopDevice = HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop); defaultDesktopDevice = HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop);
} }
newDevices.push_front(defaultDesktopDevice); newDevices.push_front(defaultDesktopDevice);
if (!hmdName.isNull()) { if (!hmdName.isNull()) {
HifiAudioDeviceInfo hmdDevice; HifiAudioDeviceInfo hmdDevice;
foreach(auto device, newDevices) { foreach(auto device, newDevices) {
@ -143,7 +144,6 @@ void AudioClient::checkDevices() {
QString hmdInputName; QString hmdInputName;
QString hmdOutputName; QString hmdOutputName;
{ {
QReadLocker readLock(&_hmdNameLock); QReadLocker readLock(&_hmdNameLock);
hmdInputName = _hmdInputName; hmdInputName = _hmdInputName;

3
libraries/audio-client/src/AudioClient.h
View file

@ -244,7 +244,6 @@ public slots:
bool switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo& deviceInfo = HifiAudioDeviceInfo()); bool switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo& deviceInfo = HifiAudioDeviceInfo());
bool switchAudioDevice(QAudio::Mode mode, const QString& deviceName, bool isHmd); bool switchAudioDevice(QAudio::Mode mode, const QString& deviceName, bool isHmd);
void setHmdAudioName(QAudio::Mode mode, const QString& name); void setHmdAudioName(QAudio::Mode mode, const QString& name);
// Qt opensles plugin is not able to detect when the headset is plugged in // Qt opensles plugin is not able to detect when the headset is plugged in
void setHeadsetPluggedIn(bool pluggedIn); void setHeadsetPluggedIn(bool pluggedIn);
@ -315,6 +314,7 @@ private:
// background tasks // background tasks
void checkDevices(); void checkDevices();
void checkPeakValues(); void checkPeakValues();
void outputFormatChanged(); void outputFormatChanged();
void handleAudioInput(QByteArray& audioBuffer); void handleAudioInput(QByteArray& audioBuffer);
void prepareLocalAudioInjectors(std::unique_ptr<Lock> localAudioLock = nullptr); void prepareLocalAudioInjectors(std::unique_ptr<Lock> localAudioLock = nullptr);
@ -508,6 +508,7 @@ private:
#endif #endif
AudioSolo _solo; AudioSolo _solo;
QReadWriteLock _hmdNameLock; QReadWriteLock _hmdNameLock;
Mutex _checkDevicesMutex; Mutex _checkDevicesMutex;
QTimer* _checkDevicesTimer { nullptr }; QTimer* _checkDevicesTimer { nullptr };