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

Ref T558, play notification sound after SELCAL tone

Browse Source 
* return SELCAL tone duration
* play follow up tone
This commit is contained in:
Klaus Basan
2019-03-05 23:34:39 +01:00
committed by Mat Sutcliffe
parent 94513951e1
commit 0e03e7baf0
3 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blacksound/selcalplayer.cpp
View File

@@ -27,19 +27,22 @@ namespace BlackSound
m_threadedPlayer.quitAndWait();
}
void CSelcalPlayer::play(int volume, const BlackMisc::Aviation::CSelcal &selcal)
CTime CSelcalPlayer::play(int volume, const CSelcal &selcal)
{
CTime duration = CTime::null();
if (selcal.isValid())
{
QList<CFrequency> frequencies = selcal.getFrequencies();
const QList<CFrequency> frequencies = selcal.getFrequencies();
Q_ASSERT(frequencies.size() == 4);
const BlackMisc::PhysicalQuantities::CTime oneSec(1000.0, BlackMisc::PhysicalQuantities::CTimeUnit::ms());
CTonePair t1(frequencies.at(0), frequencies.at(1), oneSec);
CTonePair t2({}, {}, oneSec / 5.0);
CTonePair t3(frequencies.at(2), frequencies.at(3), oneSec);
const CTime oneSec(1000.0, CTimeUnit::ms());
const CTonePair t1(frequencies.at(0), frequencies.at(1), oneSec);
const CTonePair t2({}, {}, oneSec / 5.0);
const CTonePair t3(frequencies.at(2), frequencies.at(3), oneSec);
QList<CTonePair> tonePairs;
tonePairs << t1 << t2 << t3;
m_threadedPlayer.play(volume, tonePairs);
duration = oneSec * 2.5;
}
return duration;
}
}

7
src/blacksound/selcalplayer.h
View File

@@ -11,16 +11,14 @@
#ifndef BLACKSOUND_SELCALPLAYER_H
#define BLACKSOUND_SELCALPLAYER_H
#include "blacksoundexport.h"
#include "blacksound/threadedtonepairplayer.h"
#include "blacksound/tonepair.h"
#include "blacksoundexport.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/worker.h"
#include <QAudioDeviceInfo>
class QTimer;
namespace BlackSound
{
//! SELCAL player
@@ -36,7 +34,8 @@ namespace BlackSound
~CSelcalPlayer();
//! Play selcal
void play(int volume, const BlackMisc::Aviation::CSelcal &selcal);
//! \return Time of the played tone
BlackMisc::PhysicalQuantities::CTime play(int volume, const BlackMisc::Aviation::CSelcal &selcal);
private:
CThreadedTonePairPlayer m_threadedPlayer;