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

Refactor SECLAL player into new threaded player class

Browse Source 
The reason for moving the implementation out from CSoundGenerator into
its own class is, because CSoundGenerator was a very complex and
obscure class. It mixed many tasks in one place. CSelcalPlayer
is designed to play SELCALs only.

The following design changes have been made, compared to CSoundGenerator:
* Use pull mode instead of push mode. QBuffer is used as the QIODevice and
  is a wrapper around QByteArray. Therefore it is not necessary to
  implement our own QIODevice.
* Internally it uses a CThreadedSelcalPlayer to relieve the load of the
  main thread. CThreadedSelcalPlayer inherits CContinuousWorker, no
  low level QThread implementation was necessary.
* Push mode was not implemented.
* It is important that the QAudioOutput is allocated in the worker thread.
  QAudioOutput allocates internal objects, which cannot be moved to
  the worker thread.
* Data caching. The generated seclal audio data is cached.

refs #736
This commit is contained in:
Roland Winklmeier
2016-08-15 13:16:34 +02:00
committed by Mathew Sutcliffe
parent 1ff06a1174
commit 5486596335
8 changed files with 423 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/context/contextaudioimpl.cpp
View File

@@ -86,6 +86,8 @@ namespace BlackCore
m_unusedVoiceChannels.push_back(m_channel1);
m_unusedVoiceChannels.push_back(m_channel2);
m_selcalPlayer = new CSelcalPlayer(QAudioDeviceInfo::defaultOutputDevice(), this);
}
CContextAudio *CContextAudio::registerWithDBus(CDBusServer *server)
@@ -413,8 +415,7 @@ namespace BlackCore
{
Q_ASSERT(this->m_voice);
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << selcal; }
CAudioDeviceInfo outputDevice = m_voiceOutputDevice->getCurrentOutputDevice();
CSoundGenerator::playSelcal(90, selcal, outputDevice);
m_selcalPlayer->play(90, selcal);
}
void CContextAudio::playNotification(CNotificationSounds::Notification notification, bool considerSettings) const