Removed settings context

* removed old settings related classes
* moved notifications to BlackMisc::Audio
* added audio settings where needed

refs #464
refs #337

src/blackmisc/audio/audio.h

@@ -21,5 +21,6 @@
 #include "blackmisc/audio/audiodeviceinfolist.h"
 #include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/audio/voiceroomlist.h"
+#include "blackmisc/audio/settings/settingsaudio.h"
 
 #endif // guard

src/blackmisc/audio/notificationsounds.h

@@ -0,0 +1,54 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKMISC_NOTIFICATIONSOUNDS_H
+#define BLACKMISC_NOTIFICATIONSOUNDS_H
+
+#include <QMetaType>
+
+namespace BlackMisc
+{
+    namespace Audio
+    {
+        /*!
+         * Simplified enums to play sounds.
+         * \remarks Currently located in project BlackMisc (i.e. outside project BlackSound)
+         *          as this allows to trigger sounds without using Multimedia libraries.
+         */
+        struct CNotificationSounds
+        {
+            //! How to play?
+            enum PlayMode
+            {
+                Single,
+                SingleWithAutomaticDeletion,
+                EndlessLoop
+            };
+
+            //! Play notification
+            enum Notification
+            {
+                NotificationError = 0,
+                NotificationLogin,
+                NotificationLogoff,
+                NotificationTextMessagePrivate,
+                NotificationVoiceRoomJoined,
+                NotificationVoiceRoomLeft,
+                NotificationsLoadSounds //!< end marker and force loading of sounds, keep as last element
+            };
+        };
+    } // ns
+} // ns
+
+Q_DECLARE_METATYPE(BlackMisc::Audio::CNotificationSounds::PlayMode)
+Q_DECLARE_METATYPE(BlackMisc::Audio::CNotificationSounds::Notification)
+
+#endif // guard

src/blackmisc/audio/settings/settingsaudio.cpp

@@ -0,0 +1,60 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "settingsaudio.h"
+#include "logmessage.h"
+
+using namespace BlackMisc::Audio;
+
+namespace BlackMisc
+{
+    namespace Audio
+    {
+        namespace Settings
+        {
+            CSettingsAudio::CSettingsAudio()
+            {
+                this->initDefaultValues();
+            }
+
+            bool CSettingsAudio::getNotificationFlag(CNotificationSounds::Notification notification) const
+            {
+                const int i = static_cast<int>(notification);
+                if (i >= m_notificationFlags.length()) return true; // default
+                QChar f = m_notificationFlags.at(i);
+                return '1' == f;
+            }
+
+            QString CSettingsAudio::convertToQString(bool i18n) const
+            {
+                Q_UNUSED(i18n);
+                QString s("Notification flags:");
+                s.append(" ").append(m_notificationFlags);
+                return s;
+            }
+
+            void CSettingsAudio::initDefaultValues()
+            {
+                this->initNotificationFlags();
+            }
+
+            void CSettingsAudio::initNotificationFlags()
+            {
+                // if we add flags in the future, we automatically extend ...
+                static const int l = 1 + static_cast<int>(CNotificationSounds::Notification::NotificationsLoadSounds);
+                if (this->m_notificationFlags.length() < l)
+                {
+                    int cl = m_notificationFlags.length();
+                    this->m_notificationFlags.append(QString(l - cl, '1'));
+                }
+            }
+
+        } // namespace
+    } // namespace
+} // namespace

src/blackmisc/audio/settings/settingsaudio.h

@@ -0,0 +1,62 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKMISC_AUDIO_SETTINGS_AUDIO_H
+#define BLACKMISC_AUDIO_SETTINGS_AUDIO_H
+
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/statusmessagelist.h"
+#include "blackmisc/audio/notificationsounds.h"
+#include <QJsonObject>
+
+namespace BlackMisc
+{
+    namespace Audio
+    {
+        namespace Settings
+        {
+            //! Value object encapsulating information of audio related settings.
+            class BLACKMISC_EXPORT CSettingsAudio : public CValueObject<CSettingsAudio>
+            {
+            public:
+                //! Default constructor.
+                CSettingsAudio();
+
+                //! Notification flag (play notification?)
+                bool getNotificationFlag(BlackMisc::Audio::CNotificationSounds::Notification notification) const;
+
+                //! Notification flag (play notification?)
+                void setNotificationFlag(BlackMisc::Audio::CNotificationSounds::Notification notification, bool value);
+
+                //! \copydoc BlackCore::IContextSettings::value
+                BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag);
+
+                //! Init with meaningful default values
+                void initDefaultValues();
+
+                //! \copydoc CValueObject::convertToQString
+                QString convertToQString(bool i18n = false) const;
+
+            private:
+                BLACK_ENABLE_TUPLE_CONVERSION(CSettingsAudio)
+                QString m_notificationFlags;  //!< play notification for notification x, a little trick to use a string here (streamable, hashable, ..)
+                void initNotificationFlags(); //!< init flags
+            };
+
+        } // namespace
+    } // namespace
+} // namespace
+
+Q_DECLARE_METATYPE(BlackMisc::Audio::Settings::CSettingsAudio)
+BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Audio::Settings::CSettingsAudio, (o.m_notificationFlags))
+
+#endif // guard