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

Ref T730, context shutdown

Browse Source 
* virtual function for "about to shutdown"
* graceful shutdown
This commit is contained in:
Klaus Basan
2019-10-07 17:46:55 +02:00
committed by Mat Sutcliffe
parent 857e3581b0
commit f69edff5c0
6 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context/context.cpp
View File

@@ -7,6 +7,7 @@
*/
#include "blackcore/context/context.h"
#include "blackcore/application.h"
#include "blackmisc/logcategorylist.h"
using namespace BlackMisc;
@@ -21,6 +22,15 @@ namespace BlackCore
return cats;
}
IContext::IContext(CCoreFacadeConfig::ContextMode mode, QObject *parent) :
QObject(parent), m_mode(mode), m_contextId(QDateTime::currentMSecsSinceEpoch())
{
if (sApp && !sApp->isShuttingDown())
{
QObject::connect(sApp, &CApplication::aboutToShutdown, this, &IContext::onAboutToShutdown);
}
}
IContextNetwork *IContext::getIContextNetwork()
{
return this->getRuntime()->getIContextNetwork();

7
src/blackcore/context/context.h
View File

@@ -145,9 +145,7 @@ namespace BlackCore
bool m_debugEnabled = false; //!< debug messages enabled
//! Constructor
IContext(CCoreFacadeConfig::ContextMode mode, QObject *parent) :
QObject(parent), m_mode(mode), m_contextId(QDateTime::currentMSecsSinceEpoch())
{}
IContext(CCoreFacadeConfig::ContextMode mode, QObject *parent);
//! Path and context id
QString buildPathAndContextId(const QString &path) const
@@ -164,6 +162,9 @@ namespace BlackCore
BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).warning(u"Empty context called, details: %1") << functionName;
}
//! Called when shutdown is about to be called
virtual void onAboutToShutdown() {}
//! Standard message when status message is returned in empty context
static const BlackMisc::CStatusMessage &statusMessageEmptyContext();
};

17
src/blackcore/context/contextaudio.cpp
View File

@@ -33,13 +33,18 @@ namespace BlackCore
namespace Context
{
IContextAudio::IContextAudio(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) :
IContext(mode, runtime), m_voiceClient("https://voice1.vatsim.uk")
IContext(mode, runtime), m_voiceClient("https://voice1.vatsim.uk", this)
{
Q_ASSERT_X(CThreadUtils::isApplicationThread(m_voiceClient.thread()), Q_FUNC_INFO, "Should be in main thread");
m_voiceClient.start();
Q_ASSERT_X(m_voiceClient.owner() == this, Q_FUNC_INFO, "Wrong owner");
Q_ASSERT_X(!CThreadUtils::isApplicationThread(m_voiceClient.thread()), Q_FUNC_INFO, "Must NOT be in main thread");
const CSettings as = m_audioSettings.getThreadLocal();
this->setVoiceOutputVolume(as.getOutVolume());
m_selcalPlayer = new CSelcalPlayer(CAudioDeviceInfo::getDefaultOutputDevice(), this);
connect(&m_voiceClient, &CAfvClient::ptt, this, &IContextAudio::ptt);
connect(&m_voiceClient, &CAfvClient::ptt, this, &IContextAudio::ptt, Qt::QueuedConnection);
this->changeDeviceSettings();
QPointer<IContextAudio> myself(this);
@@ -97,6 +102,14 @@ namespace BlackCore
m_voiceClient.stopAudio();
}
void IContextAudio::gracefulShutdown()
{
m_voiceClient.stopAudio();
m_voiceClient.quitAndWait();
Q_ASSERT_X(CThreadUtils::isCurrentThreadObjectThread(&m_voiceClient), Q_FUNC_INFO, "Needs to be back in current thread");
QObject::disconnect(this);
}
const CIdentifier &IContextAudio::audioRunsWhere() const
{
static const CIdentifier i("IContextAudio");

3
src/blackcore/context/contextaudio.h
View File

@@ -86,6 +86,9 @@ namespace BlackCore
//! Destructor
virtual ~IContextAudio() override;
//! Graceful shutdown
void gracefulShutdown();
// -------- parts which can run in core and GUI, referring to local voice client ------------
//! Reference to voice client

1
src/blackcore/corefacade.cpp
View File

@@ -354,6 +354,7 @@ namespace BlackCore
{
// there is no empty audio context since AFV
disconnect(this->getIContextAudio());
this->getIContextAudio()->gracefulShutdown();
this->getIContextAudio()->deleteLater();
m_contextAudio = nullptr;
}