flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-05 17:05:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove option to disable AFV aliasing

Browse Source
This commit is contained in:
Lars Toenning
2024-12-30 09:32:43 +01:00
parent edbabe34be
commit 74d87fab82
4 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/afv/clients/afvclient.cpp
View File

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

8
src/core/afv/clients/afvclient.h
View File

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

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

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

2
src/core/context/contextaudio.h
View File

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