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

refs #320 Remove deprecated code

Browse Source 
* Mic and squelch tests
* VoiceVatlib threading
* Exception handling
This commit is contained in:
Roland Winklmeier
2014-12-25 16:19:22 +01:00
parent cb7ad005b0
commit 111c539e89
10 changed files with 9 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
samples/voiceclient/client.cpp
View File

@@ -19,13 +19,9 @@ Client::Client(QObject *parent) :
QObject(parent),
m_voice(new BlackCore::CVoiceVatlib())
{
m_voice->moveToThread(&m_threadVoice);
m_threadVoice.start();
m_channelCom1 = m_voice->getVoiceChannel(0);
using namespace BlackCore;
connect(m_voice, &IVoice::squelchTestFinished, this, &Client::onSquelchTestFinished);
connect(m_voice, &IVoice::micTestFinished, this, &Client::onMicTestFinished);
connect(m_channelCom1.data(), &IVoiceChannel::connectionStatusChanged, this, &Client::connectionStatusChanged);
connect(m_channelCom1.data(), &IVoiceChannel::audioStarted, this, &Client::audioStartedStream);
connect(m_channelCom1.data(), &IVoiceChannel::audioStopped, this, &Client::audioStoppedStream);
@@ -36,8 +32,6 @@ Client::Client(QObject *parent) :
m_commands["help"] = std::bind(&Client::help, this, _1);
m_commands["echo"] = std::bind(&Client::echo, this, _1);
m_commands["exit"] = std::bind(&Client::exit, this, _1);
m_commands["squelchtest"] = std::bind(&Client::squelchTestCmd, this, _1);
m_commands["mictest"] = std::bind(&Client::micTestCmd, this, _1);
m_commands["setcallsign"] = std::bind(&Client::setCallsignCmd, this, _1);
m_commands["initconnect"] = std::bind(&Client::initiateConnectionCmd, this, _1);
m_commands["termconnect"] = std::bind(&Client::terminateConnectionCmd, this, _1);
@@ -97,25 +91,9 @@ void Client::echo(QTextStream &line)
void Client::exit(QTextStream &)
{
qDebug() << "Shutting down...";
m_threadVoice.quit();
m_threadVoice.wait(5000);
emit quit();
}
void Client::squelchTestCmd(QTextStream & /** args **/)
{
std::cout << "Running squelch test. Please be quiet for 5 seconds..." << std::endl;
printLinePrefix();
m_voice->runSquelchTest();
}
void Client::micTestCmd(QTextStream & /** args **/)
{
std::cout << "Running mic test. Speak normally for 5 seconds..." << std::endl;
printLinePrefix();
m_voice->runMicrophoneTest();
}
void Client::setCallsignCmd(QTextStream &args)
{
QString callsign;
@@ -187,17 +165,6 @@ void Client::disableLoopbackCmd(QTextStream &/*args*/)
std::cout << "Disabling audio loopback." << std::endl;
m_voice->enableAudioLoopback(false);
printLinePrefix();
}
void Client::onSquelchTestFinished()
{
std::cout << "Input squelch: " << m_voice->inputSquelch() << std::endl;
printLinePrefix();
}
void Client::onMicTestFinished()
{
std::cout << "Mic test result: " << (int)m_voice->micTestResult() << std::endl;
printLinePrefix();
}

6
samples/voiceclient/client.h
View File

@@ -33,8 +33,6 @@ private: //commands
void help(QTextStream &args);
void echo(QTextStream &args);
void exit(QTextStream &args);
void squelchTestCmd(QTextStream &args);
void micTestCmd(QTextStream &args);
void setCallsignCmd(QTextStream &args);
void initiateConnectionCmd(QTextStream &args);
void terminateConnectionCmd(QTextStream &args);
@@ -46,9 +44,6 @@ private: //commands
void printLinePrefix();
public slots:
void onSquelchTestFinished();
void onMicTestFinished();
private slots:
void connectionStatusChanged(BlackCore::IVoiceChannel::ConnectionStatus oldStatus,
@@ -61,7 +56,6 @@ private slots:
private:
QMap<QString, std::function<void(QTextStream &)>> m_commands;
BlackCore::IVoice *m_voice;
QThread m_threadVoice;
QPointer<BlackCore::IVoiceChannel> m_channelCom1;
};