Pre UI refactoring

src/config/buildconfig.cpp

@@ -67,14 +67,14 @@ namespace swift::config
         return devBuild;
     }
 
-    static QString boolToYesNo(bool v) { return v ? QStringLiteral("yes") : QStringLiteral("no"); }
-
-    const QString &CBuildConfig::compiledWithInfoShort()
+    const QString &CBuildConfig::compiledWithInfo()
     {
         static QString infoShort;
         QStringList sl;
         if constexpr (CBuildConfig::isCompiledWithFs9Support()) { sl << "FS9"; }
         if constexpr (CBuildConfig::isCompiledWithFsxSupport()) { sl << "FSX"; }
+        if constexpr (CBuildConfig::isCompiledWithMSFSSupport()) { sl << "MSFS2020"; }
+        if constexpr (CBuildConfig::isCompiledWithMSFS2024Support()) { sl << "MSFS2024"; }
         if constexpr (CBuildConfig::isCompiledWithXPlaneSupport()) { sl << "XPlane"; }
         if constexpr (CBuildConfig::isCompiledWithP3DSupport()) { sl << "P3D"; }
         if constexpr (CBuildConfig::isCompiledWithFGSupport()) { sl << "FG"; }
@@ -83,17 +83,6 @@ namespace swift::config
         return infoShort;
     }
 
-    const QString &CBuildConfig::compiledWithInfoLong()
-    {
-        static QString infoLong;
-        infoLong = infoLong.append(" FS9: ").append(boolToYesNo(isCompiledWithFs9Support()));
-        infoLong = infoLong.append(" FSX: ").append(boolToYesNo(isCompiledWithFsxSupport()));
-        infoLong = infoLong.append(" P3D: ").append(boolToYesNo(isCompiledWithP3DSupport()));
-        infoLong = infoLong.append(" XPlane: ").append(boolToYesNo(isCompiledWithXPlaneSupport()));
-        infoLong = infoLong.append(" FG: ").append(boolToYesNo(isCompiledWithFGSupport()));
-        return infoLong;
-    }
-
     const QString &CBuildConfig::gitHubRepoUrl()
     {
         static const QString url = "https://github.com/swift-project/pilotclient/";

src/config/buildconfig.h

@@ -42,9 +42,6 @@ namespace swift::config
         //! with XPlane support?
         static constexpr bool isCompiledWithXPlaneSupport(); // defined in buildconfig_gen.inc.in
 
-        //! with any simulator libraries
-        static constexpr bool isCompiledWithFlightSimulatorSupport();
-
         //! Debug build?
         static constexpr bool isDebugBuild();
 
@@ -66,14 +63,11 @@ namespace swift::config
         //! Running on Unix (Linux or Mac OS X) platform
         static constexpr bool isRunningOnUnixPlatform();
 
-        //! Info such as Win32, Win64, MacOs, Linux
+        //! Info such as Win32, Win64, macOS, Linux
         static const QString &getPlatformString();
 
-        //! Info string about compilation (short version)
-        static const QString &compiledWithInfoShort();
-
-        //! Info string about compilation (long version)
-        static const QString &compiledWithInfoLong();
+        //! Info string about compilation
+        static const QString &compiledWithInfo();
 
         //! Executable name for swift GUI, no(!) appendix
         static const QString &swiftGuiExecutableName();

src/config/buildconfig.inc

@@ -17,11 +17,6 @@ namespace swift::config
         return CBuildConfig::isCompiledWithFs9Support() || CBuildConfig::isCompiledWithFsxSupport() || CBuildConfig::isCompiledWithP3DSupport() || isCompiledWithMSFSSupport() || isCompiledWithMSFS2024Support();
     }
 
-    constexpr bool CBuildConfig::isCompiledWithFlightSimulatorSupport()
-    {
-        return CBuildConfig::isCompiledWithMsFlightSimulatorSupport() || CBuildConfig::isCompiledWithXPlaneSupport() || CBuildConfig::isCompiledWithFGSupport();
-    }
-
     constexpr bool CBuildConfig::isRunningOnWindowsNtPlatform()
     {
 #ifdef Q_OS_WIN

src/core/afv/audio/input.cpp

@@ -106,10 +106,8 @@ namespace swift::core::afv::audio
         CMacOSMicrophoneAccess::AuthorizationStatus status = m_micAccess.getAuthorizationStatus();
         if (status == CMacOSMicrophoneAccess::Authorized)
         {
-            m_audioInput->start(m_audioInputBuffer);
-            connect(m_audioInputBuffer, &CAudioInputBuffer::frameAvailable, this, &CInput::audioInDataAvailable);
-            m_started = true;
-            return;
+            // void
+            // Audio start will be handled below
         }
         else if (status == CMacOSMicrophoneAccess::NotDetermined)
         {
@@ -123,11 +121,10 @@ namespace swift::core::afv::audio
             CLogMessage(this).error(u"Microphone access not granted. Voice input will not work.");
             return;
         }
-#else
+#endif
         m_audioInput->start(m_audioInputBuffer);
         connect(m_audioInputBuffer, &CAudioInputBuffer::frameAvailable, this, &CInput::audioInDataAvailable);
         m_started = true;
-#endif
         const QString format = toQString(m_inputFormat);
         CLogMessage(this).info(u"Starting: '%1' with: %2") << selectedDevice.description() << format;
     }

src/core/afv/clients/afvclient.cpp

@@ -1329,9 +1329,6 @@ namespace swift::core::afv::clients
         // void rounding issues from float/double
         quint32 roundedFrequencyHz = static_cast<quint32>(qRound(frequencyHz / 1000.0)) * 1000;
 
-        // disabled?
-        if (!m_enableAliased) { return roundedFrequencyHz; }
-
         // change to aliased frequency if needed
         {
             QMutexLocker lock(&m_mutex);

src/core/afv/clients/afvclient.h

@@ -23,7 +23,6 @@
 #include "misc/audio/audiosettings.h"
 #include "misc/aviation/comsystem.h"
 #include "misc/identifiable.h"
-#include "misc/logcategories.h"
 #include "misc/settingscache.h"
 #include "misc/worker.h"
 #include "sound/sampleprovider/volumesampleprovider.h"
@@ -61,7 +60,19 @@ namespace swift::core::afv::clients
         CAfvClient(const QString &apiServer, QObject *owner);
 
         //! Dtor
-        virtual ~CAfvClient() override { this->stopAudio(); }
+        ~CAfvClient() override { this->stopAudio(); }
+
+        //! @{
+        //! Copy operations
+        CAfvClient(const CAfvClient &) = delete;
+        CAfvClient &operator=(const CAfvClient &) = delete;
+        //! }@
+
+        //! @{
+        //! Move operations
+        CAfvClient(const CAfvClient &&) = delete;
+        CAfvClient &operator=(const CAfvClient &&) = delete;
+        //! }@
 
         //! @{
         //! Corresponding callsign
@@ -179,13 +190,6 @@ namespace swift::core::afv::clients
         QSet<quint16> getEnabledTransceivers() const;
         //! @}
 
-        //! @{
-        //! Aliased stations enabled?
-        //! \threadsafe
-        bool isAliasedStationsEnabled() const { return m_enableAliased; }
-        void enableAliasedStations(bool enabled) { m_enableAliased = enabled; }
-        //! @}
-
         //! @{
         //! Update frequency
         //! \threadsafe
@@ -318,10 +322,10 @@ namespace swift::core::afv::clients
 
     protected:
         //! \copydoc swift::misc::CContinuousWorker::initialize
-        virtual void initialize() override;
+        void initialize() override;
 
         //! \copydoc swift::misc::CContinuousWorker::cleanup
-        virtual void cleanup() override;
+        void cleanup() override;
 
     private:
         void opusDataAvailable(const audio::OpusDataAvailableArgs &args); // threadsafe
@@ -411,7 +415,6 @@ namespace swift::core::afv::clients
         std::atomic_int m_heartBeatFailures { 0 }; //!< voice server heartbeat failures
         std::atomic_bool m_isStarted { false };
         std::atomic_bool m_loopbackOn { false };
-        std::atomic_bool m_enableAliased { true };
         std::atomic_bool m_winCoInitialized { false }; //!< Windows only CoInitializeEx
         std::atomic_bool m_integratedComUnit { false }; //!< is COM unit sychronized, integrated?
 

src/core/application.cpp

@@ -257,47 +257,6 @@ namespace swift::core
         return s;
     }
 
-    QString CApplication::getExecutableForApplication(CApplicationInfo::Application application) const
-    {
-        QString searchFor;
-        switch (application)
-        {
-        case CApplicationInfo::PilotClientCore: searchFor = "core"; break;
-        case CApplicationInfo::Launcher: searchFor = "launcher"; break;
-        case CApplicationInfo::MappingTool: searchFor = "data"; break;
-        case CApplicationInfo::PilotClientGui: searchFor = "gui"; break;
-        default: break;
-        }
-        if (searchFor.isEmpty()) { return {}; }
-
-        for (const QString &executable : CFileUtils::getSwiftExecutables())
-        {
-            if (!executable.contains("swift", Qt::CaseInsensitive)) { continue; }
-            if (executable.contains(searchFor, Qt::CaseInsensitive)) { return executable; }
-        }
-        return {};
-    }
-
-    bool CApplication::startLauncher()
-    {
-        static const QString launcher =
-            CApplication::getExecutableForApplication(CApplicationInfo::Application::Launcher);
-        if (launcher.isEmpty() || CApplication::isApplicationRunning(CApplicationInfo::Launcher)) { return false; }
-
-        // const QStringList args = this->argumentsJoined({}, { "--dbus", "--core", "--coreaudio" });
-        const QStringList args = this->argumentsJoined({}, { "--dbus", "--core" });
-        return QProcess::startDetached(launcher, args);
-    }
-
-    bool CApplication::startLauncherAndQuit()
-    {
-        const bool started = CApplication::startLauncher();
-        if (!started) { return false; }
-        this->gracefulShutdown();
-        CApplication::exit();
-        return true;
-    }
-
     CGlobalSetup CApplication::getGlobalSetup() const
     {
         if (m_shutdown) { return CGlobalSetup(); }
@@ -507,7 +466,7 @@ namespace swift::core
                       boolToYesNo(CBuildConfig::isRunningOnUnixPlatform()) % separator % u"MacOS: " %
                       boolToYesNo(CBuildConfig::isRunningOnMacOSPlatform()) % separator % "Build Abi: " %
                       QSysInfo::buildAbi() % separator % u"Build CPU: " % QSysInfo::buildCpuArchitecture() % separator %
-                      CBuildConfig::compiledWithInfoLong();
+                      CBuildConfig::compiledWithInfo();
 
         if (this->supportsContexts()) { str += (separator % u"Supporting contexts"); }
 

src/core/application.h

@@ -146,15 +146,6 @@
         //! Version, name beta and dev info
         const QString &getApplicationNameVersionDetailed() const;
 
-        //! Executable names for the given applications
-        QString getExecutableForApplication(swift::misc::CApplicationInfo::Application application) const;
-
-        //! Start the launcher
-        bool startLauncher();
-
-        //! Start the launcher and quit
-        bool startLauncherAndQuit();
-
         //! Global setup
         //! \threadsafe
         data::CGlobalSetup getGlobalSetup() const;
@@ -240,10 +231,10 @@
         //! \name cmd line args and parsing of command line options
         //! @{
 
         //! \copydoc QCommandLineParser::addOption
         bool addParserOption(const QCommandLineOption &option);
 
         //! \copydoc QCommandLineParser::addOptions
         bool addParserOptions(const QList<QCommandLineOption> &options);
 
         //! CMD line argument for DBus address

src/core/context/context.cpp

@@ -4,6 +4,7 @@
 #include "core/context/context.h"
 
 #include "core/application.h"
+#include "misc/dbusserver.h"
 #include "misc/logcategories.h"
 
 using namespace swift::misc;
@@ -70,6 +71,14 @@ namespace swift::core::context
         return this->getRuntime()->getIContextSimulator();
     }
 
+    void IContext::registerWithDBus(const QString &objectPath, CDBusServer *server)
+    {
+        if (!server || getMode() != CCoreFacadeConfig::LocalInDBusServer) { return; }
+
+        // remark that registers all SIGNALS, not only the interface ons
+        server->addObject(objectPath, this);
+    }
+
     const CStatusMessage &IContext::statusMessageEmptyContext()
     {
         static const CStatusMessage m(static_cast<IContext *>(nullptr), CStatusMessage::SeverityWarning,

src/core/context/context.h

@@ -152,6 +152,9 @@ namespace swift::core::context
         //! Called when shutdown is about to be called
         virtual void onAboutToShutdown() {}
 
+        //! Register myself in DBus
+        void registerWithDBus(const QString &objectPath, misc::CDBusServer *server);
+
         //! Standard message when status message is returned in empty context
         static const misc::CStatusMessage &statusMessageEmptyContext();
 

src/core/context/contextapplication.cpp

@@ -35,7 +35,7 @@ namespace swift::core::context
         case CCoreFacadeConfig::LocalInDBusServer:
         {
             auto *context = new CContextApplication(mode, parent);
-            context->registerWithDBus(server);
+            context->registerWithDBus(ObjectPath(), server);
             return context;
         }
         case CCoreFacadeConfig::Remote:

src/core/context/contextapplicationimpl.cpp

@@ -25,12 +25,6 @@ namespace swift::core::context
         : IContextApplication(mode, runtime), CIdentifiable(this)
     {}
 
-    void CContextApplication::registerWithDBus(swift::misc::CDBusServer *server)
-    {
-        if (!server || getMode() != CCoreFacadeConfig::LocalInDBusServer) { return; }
-        server->addObject(IContextApplication::ObjectPath(), this);
-    }
-
     void CContextApplication::changeSettings(const CValueCachePacket &settings, const CIdentifier &origin)
     {
         // Intentionally don't check for round trip here

src/core/context/contextapplicationimpl.h

@@ -88,9 +88,6 @@ namespace swift::core
             //! Constructor
             CContextApplication(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime);
 
-            //! Register myself in DBus, fail safe
-            void registerWithDBus(swift::misc::CDBusServer *server);
-
         private:
             swift::misc::CIdentifierList m_registeredApplications;
 

src/core/context/contextaudio.cpp

@@ -64,7 +64,7 @@ namespace swift::core::context
         case CCoreFacadeConfig::LocalInDBusServer:
         {
             auto *context = new CContextAudio(mode, runtime);
-            context->registerWithDBus(server);
+            context->registerWithDBus(ObjectPath(), server);
             return context;
         }
         case CCoreFacadeConfig::Remote:
@@ -80,10 +80,11 @@ namespace swift::core::context
     {
         Q_UNUSED(originator)
         if (commandLine.isEmpty()) { return false; }
-        CSimpleCommandParser parser({ ".vol", ".volume", // output volume
-                                      ".mute", // mute
-                                      ".unmute", // unmute
-                                      ".aliased" });
+        CSimpleCommandParser parser({
+            ".vol", ".volume", // output volume
+            ".mute", // mute
+            ".unmute", // unmute
+        });
         parser.parse(commandLine);
         if (!parser.isKnownCommand()) { return false; }
 
@@ -103,14 +104,6 @@ namespace swift::core::context
             this->setMasterOutputVolume(v);
             return true;
         }
-        else if (afvClient() && parser.matchesCommand(".aliased") && parser.countParts() > 1)
-        {
-            const bool enable = parser.toBool(1, true);
-            afvClient()->enableAliasedStations(enable);
-
-            CLogMessage(this).info(u"Aliased stations are: %1") << boolToOnOff(enable);
-            return true;
-        }
         return false;
     }