diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index b034e2438..25e956b5d 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -584,16 +584,6 @@ namespace BlackCore m_voiceClient->setPttForCom(enable, com); } - void CContextAudioBase::setVoiceTransmissionCom1(bool enabled) - { - this->setVoiceTransmission(enabled, COM1); - } - - void CContextAudioBase::setVoiceTransmissionCom2(bool enabled) - { - this->setVoiceTransmission(enabled, COM2); - } - void CContextAudioBase::setVoiceTransmissionComActive(bool enabled) { this->setVoiceTransmission(enabled, COMActive); diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h index 1c1371ce1..9fdd02d63 100644 --- a/src/blackcore/context/contextaudio.h +++ b/src/blackcore/context/contextaudio.h @@ -321,8 +321,6 @@ namespace BlackCore //! Enable/disable voice transmission, nornally used with hotkey //! @{ void setVoiceTransmission(bool enable, BlackMisc::Audio::PTTCOM com); - void setVoiceTransmissionCom1(bool enabled); - void setVoiceTransmissionCom2(bool enabled); void setVoiceTransmissionComActive(bool enabled); //! @} @@ -355,8 +353,6 @@ namespace BlackCore void onAfvConnectionFailure(const BlackMisc::CStatusMessage &msg); CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionComActive }; - CActionBind m_actionPttCom1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionCom1 }; - CActionBind m_actionPttCom2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CContextAudioBase::setVoiceTransmissionCom2 }; CActionBind m_actionAudioVolumeIncrease { BlackMisc::Input::audioVolumeIncreaseHotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolume }; CActionBind m_actionAudioVolumeDecrease { BlackMisc::Input::audioVolumeDecreaseHotkeyAction(), BlackMisc::Input::audioVolumeDecreaseHotkeyIcon(), this, &CContextAudioBase::audioDecreaseVolume }; CActionBind m_actionAudioVolumeIncreaseCom1 { BlackMisc::Input::audioVolumeIncreaseCom1HotkeyAction(), BlackMisc::Input::audioVolumeIncreaseHotkeyIcon(), this, &CContextAudioBase::audioIncreaseVolumeCom1 }; diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h index 4e3122a89..1c826a50c 100644 --- a/src/blackgui/components/infobarstatuscomponent.h +++ b/src/blackgui/components/infobarstatuscomponent.h @@ -63,8 +63,6 @@ namespace BlackGui private: QScopedPointer ui; BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; - BlackCore::CActionBind m_actionPtt1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; - BlackCore::CActionBind m_actionPtt2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::Input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; BlackMisc::CDigestSignal m_dsResize { this, &CInfoBarStatusComponent::adjustTextSize, 1000, 50 }; diff --git a/src/blackmisc/input/actionhotkeydefs.cpp b/src/blackmisc/input/actionhotkeydefs.cpp index cb84c748a..e02552157 100644 --- a/src/blackmisc/input/actionhotkeydefs.cpp +++ b/src/blackmisc/input/actionhotkeydefs.cpp @@ -23,18 +23,6 @@ namespace BlackMisc return CIcons::StandardIconRadio16; } - const QString &pttCom1HotkeyAction() - { - static const QString s("/Voice/Activate push-to-talk COM1"); - return s; - } - - const QString &pttCom2HotkeyAction() - { - static const QString s("/Voice/Activate push-to-talk COM2"); - return s; - } - CIcons::IconIndex audioVolumeDecreaseHotkeyIcon() { return CIcons::StandardIconVolumeLow16; diff --git a/src/blackmisc/input/actionhotkeydefs.h b/src/blackmisc/input/actionhotkeydefs.h index 716a37890..a3fd5be98 100644 --- a/src/blackmisc/input/actionhotkeydefs.h +++ b/src/blackmisc/input/actionhotkeydefs.h @@ -23,12 +23,6 @@ namespace BlackMisc //! PTT key BLACKMISC_EXPORT const QString &pttHotkeyAction(); - //! PTT key COM1 only - BLACKMISC_EXPORT const QString &pttCom1HotkeyAction(); - - //! PTT key COM2 only - BLACKMISC_EXPORT const QString &pttCom2HotkeyAction(); - //! PTT key BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex pttHotkeyIcon(); diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 7cb6274d9..6e0b2e51b 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -125,8 +125,6 @@ private: QScopedPointer m_validationDialog; //!< aircraft model validation dialog BlackMisc::CData m_lastAutoPublish { this }; BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; - BlackCore::CActionBind m_actionPtt1 { BlackMisc::Input::pttCom1HotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; - BlackCore::CActionBind m_actionPtt2 { BlackMisc::Input::pttCom2HotkeyAction(), BlackMisc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; BlackCore::CActionBindings m_menuHotkeyHandlers; BlackGui::CManagedStatusBar m_statusBar; BlackMisc::CLogHistoryReplica m_logHistoryForStatus { this };