flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 18:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Ref T739, verify devices

Browse Source
This commit is contained in:
Klaus Basan
2019-10-18 04:19:35 +02:00
parent 11f74a05e6
commit b88bdee405
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/afv/audio/input.cpp
View File

@@ -90,6 +90,7 @@ namespace BlackCore
{ {
if (m_started) { return; } if (m_started) { return; }
BLACK_VERIFY_X(inputDevice.isValid() && inputDevice.isInputDevice(), Q_FUNC_INFO, "Wrong input device");
m_device = inputDevice; m_device = inputDevice;
QAudioFormat inputFormat; QAudioFormat inputFormat;

6
src/blackcore/afv/audio/output.cpp
View File

@@ -9,8 +9,9 @@
//! \file //! \file
#include "output.h" #include "output.h"
#include "blackmisc/logmessage.h"
#include "blacksound/audioutilities.h" #include "blacksound/audioutilities.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"
#include <QDebug> #include <QDebug>
#include <QStringBuilder> #include <QStringBuilder>
@@ -90,6 +91,9 @@ namespace BlackCore
{ {
if (m_started) { return; } if (m_started) { return; }
BLACK_VERIFY_X(outputDevice.isValid() && outputDevice.isOutputDevice(), Q_FUNC_INFO, "Wrong output device");
if (m_audioOutputBuffer) { m_audioOutputBuffer->deleteLater(); }
m_audioOutputBuffer = new CAudioOutputBuffer(sampleProvider, this); m_audioOutputBuffer = new CAudioOutputBuffer(sampleProvider, this);
connect(m_audioOutputBuffer, &CAudioOutputBuffer::outputVolumeStream, this, &COutput::outputVolumeStream); connect(m_audioOutputBuffer, &CAudioOutputBuffer::outputVolumeStream, this, &COutput::outputVolumeStream);

11
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -14,6 +14,7 @@
#include "blacksound/audioutilities.h" #include "blacksound/audioutilities.h"
#include "blackmisc/audio/audiodeviceinfolist.h" #include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackmisc/verify.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "comdef.h" #include "comdef.h"
@@ -243,6 +244,9 @@ namespace BlackCore
return; return;
} }
BLACK_VERIFY_X(inputDevice.isValid() && inputDevice.isInputDevice(), Q_FUNC_INFO, "Wrong input device");
BLACK_VERIFY_X(outputDevice.isValid() && outputDevice.isOutputDevice(), Q_FUNC_INFO, "Wrong output device");
if (m_isStarted) if (m_isStarted)
{ {
if (this->usesSameDevices(inputDevice, outputDevice)) if (this->usesSameDevices(inputDevice, outputDevice))
@@ -829,8 +833,11 @@ namespace BlackCore
void CAfvClient::onSettingsChanged() void CAfvClient::onSettingsChanged()
{ {
const CSettings audioSettings = m_audioSettings.get(); const CSettings audioSettings = m_audioSettings.get();
this->setNormalizedInputVolume(audioSettings.getInVolume()); const int iv = audioSettings.getInVolume();
this->setNormalizedOutputVolume(audioSettings.getOutVolume()); const int ov = audioSettings.getOutVolume();
this->setNormalizedInputVolume(iv);
this->setNormalizedOutputVolume(ov);
this->setBypassEffects(!audioSettings.isAudioEffectsEnabled()); this->setBypassEffects(!audioSettings.isAudioEffectsEnabled());
} }