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

Ref T730, improved threaded tone player

Browse Source 
* allow to re-init and get device info
* mutable mutex
This commit is contained in:
Klaus Basan
2019-10-02 19:53:02 +02:00
committed by Mat Sutcliffe
parent 90e87835fc
commit 5d9ea83b93
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/blacksound/threadedtonepairplayer.cpp
View File

@@ -36,18 +36,39 @@ namespace BlackSound
QTimer::singleShot(0, this, &CThreadedTonePairPlayer::playBuffer);
}
bool CThreadedTonePairPlayer::reinitializeAudio(const CAudioDeviceInfo &device)
{
if (this->getAudioDevice() == device) { return false; }
{
QMutexLocker ml(&m_mutex);
m_deviceInfo = device;
}
this->initialize();
return true;
}
CAudioDeviceInfo CThreadedTonePairPlayer::getAudioDevice() const
{
QMutexLocker ml(&m_mutex);
return m_deviceInfo;
}
void CThreadedTonePairPlayer::initialize()
{
QMutexLocker ml(&m_mutex);
CLogMessage(this).info(u"CThreadedTonePairPlayer for device '%1'") << m_deviceInfo.getName();
m_audioFormat.setSampleRate(44100);
m_audioFormat.setChannelCount(1);
m_audioFormat.setSampleSize(16); // 8 or 16 works
m_audioFormat.setCodec("audio/pcm");
m_audioFormat.setByteOrder(QAudioFormat::LittleEndian);
m_audioFormat.setSampleType(QAudioFormat::SignedInt);
QAudioFormat format;
format.setSampleRate(44100);
format.setChannelCount(1);
format.setSampleSize(16); // 8 or 16 works
format.setCodec("audio/pcm");
format.setByteOrder(QAudioFormat::LittleEndian);
format.setSampleType(QAudioFormat::SignedInt);
QAudioDeviceInfo selectedDevice = getHighestCompatibleOutputDevice(m_deviceInfo, m_audioFormat);
// find best device
const QAudioDeviceInfo selectedDevice = getHighestCompatibleOutputDevice(m_deviceInfo, format);
m_audioFormat = format;
m_audioOutput = new QAudioOutput(selectedDevice, m_audioFormat, this);
connect(m_audioOutput, &QAudioOutput::stateChanged, this, &CThreadedTonePairPlayer::handleStateChanged);
}