From 90b893c62a5b23f96b10fbd9bd90be6b99cde5b3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 31 Dec 2018 10:55:38 +0100
Subject: [PATCH] Ref T494, moved audio settings Trait directly info BlackMisc
 settings file

---
 src/blackcore/audio/audiosettings.h           | 14 -------------
 src/blackcore/context/contextaudioimpl.h      |  6 +++---
 src/blackgui/components/audiosetupcomponent.h |  4 ++--
 .../copysettingsandcachescomponent.h          |  3 ++-
 src/blackmisc/audio/audiosettings.h           | 20 +++++++++++++++++++
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/blackcore/audio/audiosettings.h b/src/blackcore/audio/audiosettings.h
index 33d4685c0..cfc63aba9 100644
--- a/src/blackcore/audio/audiosettings.h
+++ b/src/blackcore/audio/audiosettings.h
@@ -13,26 +13,12 @@
 #define BLACKCORE_AUDIO_SETTINGS_H
 
 #include "blackmisc/settingscache.h"
-#include "blackmisc/audio/audiosettings.h"
 #include <QString>
 
 namespace BlackCore
 {
     namespace Audio
     {
-        //! Audio related settings
-        struct TSettings : public BlackMisc::TSettingTrait<BlackMisc::Audio::CSettings>
-        {
-            //! \copydoc BlackMisc::TSettingTrait::key
-            static const char *key() { return "audio/setup"; }
-
-            //! \copydoc BlackCore::TSettingTrait::humanReadable
-            static const QString &humanReadable() { static const QString name("Audio"); return name; }
-
-            //! \copydoc BlackMisc::TSettingTrait::isValid
-            static bool isValid(const BlackMisc::Audio::CSettings &value) { Q_UNUSED(value); return true; }
-        };
-
         //! Audio input device settings
         struct TInputDevice : public BlackMisc::TSettingTrait<QString>
         {
diff --git a/src/blackcore/context/contextaudioimpl.h b/src/blackcore/context/contextaudioimpl.h
index c380272a8..0c4ccaea8 100644
--- a/src/blackcore/context/contextaudioimpl.h
+++ b/src/blackcore/context/contextaudioimpl.h
@@ -19,9 +19,9 @@
 #include "blackcore/audio/audiosettings.h"
 #include "blackcore/voicechannel.h"
 #include "blackcore/audiomixer.h"
+#include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
 #include "blackmisc/audio/notificationsounds.h"
-#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/audio/voiceroomlist.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/comsystem.h"
@@ -161,8 +161,8 @@ namespace BlackCore
             BlackSound::CSelcalPlayer *m_selcalPlayer = nullptr;
 
             // settings
-            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this };
-            BlackMisc::CSetting<BlackCore::Audio::TInputDevice> m_inputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
+            BlackMisc::CSetting<BlackMisc::Audio::TSettings>     m_audioSettings { this };
+            BlackMisc::CSetting<BlackCore::Audio::TInputDevice>  m_inputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
             BlackMisc::CSetting<BlackCore::Audio::TOutputDevice> m_outputDeviceSetting { this, &CContextAudio::changeDeviceSettings };
         };
     } // namespace
diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h
index 8a2f54291..275b79299 100644
--- a/src/blackgui/components/audiosetupcomponent.h
+++ b/src/blackgui/components/audiosetupcomponent.h
@@ -13,7 +13,7 @@
 #define BLACKGUI_AUDIOSETUPCOMPONENT_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackcore/audio/audiosettings.h"
+#include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
 #include "blackmisc/settingscache.h"
 
@@ -72,7 +72,7 @@ namespace BlackGui
             BlackMisc::Audio::CNotificationSounds::NotificationFlag checkBoxToFlag(const QCheckBox *cb) const;
 
             QScopedPointer<Ui::CAudioSetupComponent> ui;
-            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
+            BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/blackgui/components/copysettingsandcachescomponent.h
index 6032606f3..ae27c5a24 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.h
+++ b/src/blackgui/components/copysettingsandcachescomponent.h
@@ -30,6 +30,7 @@
 #include "blackmisc/simulation/settings/modelsettings.h"
 #include "blackmisc/network/data/lastserver.h"
 #include "blackmisc/network/settings/serversettings.h"
+#include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/directories.h"
 #include "blackmisc/applicationinfo.h"
 
@@ -124,7 +125,7 @@ namespace BlackGui
             BlackMisc::CSetting<Settings::TextMessageSettings>  m_settingsTextMessage { this };
             BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_settingsEnabledSimulators { this };
             BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_settingsActionHotkeys { this };
-            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_settingsAudio { this };
+            BlackMisc::CSetting<BlackMisc::Audio::TSettings> m_settingsAudio { this };
             BlackMisc::CSetting<BlackMisc::Settings::TDirectorySettings> m_settingsDirectories { this };
             BlackMisc::CSetting<BlackMisc::Network::Settings::TTrafficServers> m_settingsNetworkServers { this };
             BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSimulatorFsx> m_settingsSimulatorFsx { this }; //!< FSX settings
diff --git a/src/blackmisc/audio/audiosettings.h b/src/blackmisc/audio/audiosettings.h
index a9e6b64ff..607131c2d 100644
--- a/src/blackmisc/audio/audiosettings.h
+++ b/src/blackmisc/audio/audiosettings.h
@@ -13,6 +13,7 @@
 #define BLACKMISC_AUDIO_SETTINGS_H
 
 #include "blackmisc/audio/notificationsounds.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/statusmessage.h"
@@ -45,6 +46,12 @@ namespace BlackMisc
             //! Set notification
             void setNotification(CNotificationSounds::Notification notification) { m_notification = static_cast<int>(notification); }
 
+            //! Simplified functions @{
+            bool textMessagePrivate() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessagePrivate); }
+            bool textCallsignMentioned() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned); }
+            bool pttClick() const { return this->isNotificationFlagSet(CNotificationSounds::PTTClick); }
+            //! @}
+
             //! Settings value
             CStatusMessage value(const QString &path, const QString &command, const CVariant &value, bool &changedFlag);
 
@@ -63,6 +70,19 @@ namespace BlackMisc
                 BLACK_METAMEMBER(notification)
             );
         };
+
+        //! Audio related settings
+        struct TSettings : public TSettingTrait<CSettings>
+        {
+            //! \copydoc BlackMisc::TSettingTrait::key
+            static const char *key() { return "audio/setup"; }
+
+            //! \copydoc BlackCore::TSettingTrait::humanReadable
+            static const QString &humanReadable() { static const QString name("Audio"); return name; }
+
+            //! \copydoc BlackMisc::TSettingTrait::isValid
+            static bool isValid(const BlackMisc::Audio::CSettings &value) { Q_UNUSED(value); return true; }
+        };
     } // namespace
 } // namespace