Ref T730, context shutdown

* virtual function for "about to shutdown"
* graceful shutdown

src/blackcore/context/context.cpp

@@ -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();

src/blackcore/context/context.h

@@ -145,9 +145,7 @@ namespace BlackCore
             bool   m_debugEnabled = false;         //!< debug messages enabled
 
             //! Constructor
-            IContext(CCoreFacadeConfig::ContextMode mode, QObject *parent) :
+            IContext(CCoreFacadeConfig::ContextMode mode, QObject *parent);
-                QObject(parent), m_mode(mode), m_contextId(QDateTime::currentMSecsSinceEpoch())
-            {}
 
             //! 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();
         };

src/blackcore/context/contextaudio.cpp

@@ -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");

src/blackcore/context/contextaudio.h

@@ -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

src/blackcore/corefacade.cpp

@@ -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;
         }

src/blackmisc/threadutils.cpp

@@ -51,15 +51,19 @@ namespace BlackMisc
         static const QString normal("normal");
         static const QString high("high");
         static const QString highest("highest");
+        static const QString time("time critical");
+        static const QString inherit("inherit");
 
         switch (priority)
         {
-        case QThread::IdlePriority: return idle;
+        case QThread::IdlePriority:    return idle;
-        case QThread::LowestPriority: return lowest;
+        case QThread::LowestPriority:  return lowest;
-        case QThread::LowPriority: return low;
+        case QThread::LowPriority:     return low;
-        case QThread::NormalPriority: return normal;
+        case QThread::NormalPriority:  return normal;
-        case QThread::HighPriority: return high;
+        case QThread::HighPriority:    return high;
         case QThread::HighestPriority: return highest;
+        case QThread::InheritPriority: return inherit;
+        case QThread::TimeCriticalPriority: return time;
         default: break;
         }