refactor: Remove option to disable AFV aliasing

ltoenning · ltoenning · commit 74d87fab82d2 · 2024-12-30T10:08:50.000+01:00
diff --git a/src/core/afv/clients/afvclient.cpp b/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);
diff --git a/src/core/afv/clients/afvclient.h b/src/core/afv/clients/afvclient.h
@@ -179,13 +179,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
@@ -411,7 +404,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?
 
diff --git a/src/core/context/contextaudio.cpp b/src/core/context/contextaudio.cpp
@@ -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;
     }
 
diff --git a/src/core/context/contextaudio.h b/src/core/context/contextaudio.h
@@ -233,7 +233,6 @@ namespace swift::core
                 swift::misc::CSimpleCommandParser::registerCommand({ ".mute", "mute audio" });
                 swift::misc::CSimpleCommandParser::registerCommand({ ".unmute", "unmute audio" });
                 swift::misc::CSimpleCommandParser::registerCommand({ ".vol volume", "volume 0..100" });
-                swift::misc::CSimpleCommandParser::registerCommand({ ".aliased on|off", "aliased HF frequencies" });
             }
 
             // -------- parts which can run in core and GUI, referring to local voice client ------------
@@ -248,7 +247,6 @@ namespace swift::core
             //! .mute                          mute             swift::core::context::CContextAudioBase
             //! .unmute                        unmute           swift::core::context::CContextAudioBase
             //! .vol .volume   volume 0..100   set volume       swift::core::context::CContextAudioBase
-            //! .aliased on|off                aliased stations swift::core::context::CContextAudioBase
             //! </pre>
             virtual bool parseCommandLine(const QString &commandLine,
                                           const swift::misc::CIdentifier &originator) override;

Original file line number	Diff line number	Diff line change
`@@ -1329,9 +1329,6 @@ namespace swift::core::afv::clients`
`1329`	`1329`	`// void rounding issues from float/double`
`1330`	`1330`	`quint32 roundedFrequencyHz = static_cast<quint32>(qRound(frequencyHz / 1000.0)) * 1000;`
`1331`	`1331`
`1332`		`- // disabled?`
`1333`		`- if (!m_enableAliased) { return roundedFrequencyHz; }`
`1334`		`-`
`1335`	`1332`	`// change to aliased frequency if needed`
`1336`	`1333`	`{`
`1337`	`1334`	`QMutexLocker lock(&m_mutex);`