audio: Fix the selectionModel for all audio settings

Refs #72500

src/audio/alsapluginmodel.cpp

@@ -17,6 +17,9 @@
  ***************************************************************************/
 #include "alsapluginmodel.h"
 
+//Qt
+#include <QtCore/QItemSelectionModel>
+
 //Ring
 #include "dbus/configurationmanager.h"
 
@@ -26,12 +29,18 @@ class AlsaPluginModelPrivate : public QObject
 public:
    AlsaPluginModelPrivate(Audio::AlsaPluginModel* parent);
    QStringList m_lDeviceList;
+   mutable QItemSelectionModel* m_pSelectionModel;
 
 private:
    Audio::AlsaPluginModel* q_ptr;
+
+public Q_SLOTS:
+   void setCurrentPlugin(const QModelIndex& idx);
+   void setCurrentPlugin(int idx);
 };
 
-AlsaPluginModelPrivate::AlsaPluginModelPrivate(Audio::AlsaPluginModel* parent) : q_ptr(parent)
+AlsaPluginModelPrivate::AlsaPluginModelPrivate(Audio::AlsaPluginModel* parent) : q_ptr(parent),
+m_pSelectionModel(nullptr)
 {
 
 }
@@ -97,6 +106,19 @@ bool Audio::AlsaPluginModel::setData( const QModelIndex& index, const QVariant &
    return false;
 }
 
+QItemSelectionModel* Audio::AlsaPluginModel::selectionModel() const
+{
+   if (!d_ptr->m_pSelectionModel) {
+      d_ptr->m_pSelectionModel = new QItemSelectionModel(const_cast<Audio::AlsaPluginModel*>(this));
+
+      d_ptr->m_pSelectionModel->setCurrentIndex(currentPlugin(), QItemSelectionModel::ClearAndSelect);
+
+      connect(d_ptr->m_pSelectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex)), d_ptr.data(), SLOT(setCurrentPlugin(QModelIndex)));
+   }
+
+   return d_ptr->m_pSelectionModel;
+}
+
 ///Return the current index
 QModelIndex Audio::AlsaPluginModel::currentPlugin() const
 {
@@ -110,18 +132,19 @@ QModelIndex Audio::AlsaPluginModel::currentPlugin() const
 }
 
 ///Set the current index
-void Audio::AlsaPluginModel::setCurrentPlugin(const QModelIndex& idx)
+void AlsaPluginModelPrivate::setCurrentPlugin(const QModelIndex& idx)
 {
    if (!idx.isValid())
       return;
+
    ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
-   configurationManager.setAudioPlugin(d_ptr->m_lDeviceList[idx.row()]);
+   configurationManager.setAudioPlugin(m_lDeviceList[idx.row()]);
 }
 
 ///Set the current index (qcombobox compatibility shim)
-void Audio::AlsaPluginModel::setCurrentPlugin(int idx)
+void AlsaPluginModelPrivate::setCurrentPlugin(int idx)
 {
-   setCurrentPlugin(index(idx,0));
+   setCurrentPlugin(q_ptr->index(idx,0));
 }
 
 ///Reload to current daemon state

src/audio/alsapluginmodel.h

@@ -27,6 +27,7 @@
 #include <typedefs.h>
 
 class AlsaPluginModelPrivate;
+class QItemSelectionModel;
 
 namespace Audio {
 
@@ -45,10 +46,7 @@ public:
 
    //Getters
    QModelIndex currentPlugin() const;
-
-   //Setters
-   void setCurrentPlugin(const QModelIndex& idx);
-   void setCurrentPlugin(int idx);
+   QItemSelectionModel* selectionModel() const;
 
    //Mutator
    void reload();

src/audio/inputdevicemodel.cpp

@@ -34,6 +34,10 @@ public:
 
 private:
    Audio::InputDeviceModel* q_ptr;
+
+public Q_SLOTS:
+   void setCurrentDevice(const QModelIndex& index);
+   void setCurrentDevice(int idx);
 };
 
 InputDeviceModelPrivate::InputDeviceModelPrivate(Audio::InputDeviceModel* parent) : q_ptr(parent),
@@ -113,12 +117,15 @@ QItemSelectionModel* Audio::InputDeviceModel::selectionModel() const
       const int idx = currentDevices[static_cast<int>(Settings::DeviceIndex::INPUT)].toInt();
       if (!(idx >= d_ptr->m_lDeviceList.size()))
          d_ptr->m_pSelectionModel->setCurrentIndex(index(idx,0), QItemSelectionModel::ClearAndSelect);
+
+      connect(d_ptr->m_pSelectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex)), d_ptr.data(), SLOT(setCurrentDevice(QModelIndex)));
    }
+
    return d_ptr->m_pSelectionModel;
 }
 
 ///Set the current input device
-void Audio::InputDeviceModel::setCurrentDevice(const QModelIndex& index)
+void InputDeviceModelPrivate::setCurrentDevice(const QModelIndex& index)
 {
    if (index.isValid()) {
       ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
@@ -127,9 +134,9 @@ void Audio::InputDeviceModel::setCurrentDevice(const QModelIndex& index)
 }
 
 ///QCombobox signals -> QModelIndex shim
-void Audio::InputDeviceModel::setCurrentDevice(int idx)
+void InputDeviceModelPrivate::setCurrentDevice(int idx)
 {
-   setCurrentDevice(index(idx,0));
+   setCurrentDevice(q_ptr->index(idx,0));
 }
 
 ///Reload input device list

src/audio/inputdevicemodel.h

@@ -47,10 +47,6 @@ public:
    //Getters
    QItemSelectionModel* selectionModel() const;
 
-   //Setters
-   void setCurrentDevice(const QModelIndex& index);
-   void setCurrentDevice(int idx);
-
    //Mutator
    void reload();
 

src/audio/outputdevicemodel.cpp

@@ -35,6 +35,10 @@ public:
 
 private:
    Audio::OutputDeviceModel* q_ptr;
+
+public Q_SLOTS:
+   void setCurrentDevice(const QModelIndex& index);
+   void setCurrentDevice(int idx);
 };
 
 
@@ -112,14 +116,18 @@ QItemSelectionModel* Audio::OutputDeviceModel::selectionModel() const
       ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
       const QStringList currentDevices = configurationManager.getCurrentAudioDevicesIndex();
       const int idx = currentDevices[static_cast<int>(Audio::Settings::DeviceIndex::OUTPUT)].toInt();
+
       if (!(idx >= d_ptr->m_lDeviceList.size()))
          d_ptr->m_pSelectionModel->setCurrentIndex(index(idx,0), QItemSelectionModel::ClearAndSelect);
+
+      connect(d_ptr->m_pSelectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex)), d_ptr.data(), SLOT(setCurrentDevice(QModelIndex)));
    }
+
    return d_ptr->m_pSelectionModel;
 }
 
 ///Set the current output device
-void Audio::OutputDeviceModel::setCurrentDevice(const QModelIndex& index)
+void OutputDeviceModelPrivate::setCurrentDevice(const QModelIndex& index)
 {
    if (index.isValid()) {
       ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
@@ -128,9 +136,9 @@ void Audio::OutputDeviceModel::setCurrentDevice(const QModelIndex& index)
 }
 
 ///QCombobox index -> QModelIndex shim
-void Audio::OutputDeviceModel::setCurrentDevice(int idx)
+void OutputDeviceModelPrivate::setCurrentDevice(int idx)
 {
-   setCurrentDevice(index(idx,0));
+   setCurrentDevice(q_ptr->index(idx,0));
 }
 
 ///reload output devices list

src/audio/outputdevicemodel.h

@@ -47,10 +47,6 @@ public:
    //Getters
    QItemSelectionModel* selectionModel() const;
 
-   //Setters
-   void setCurrentDevice(const QModelIndex& index);
-   void setCurrentDevice(int idx);
-
    //Mutator
    void reload();
 

src/audio/ringtonedevicemodel.cpp

@@ -17,6 +17,9 @@
  ***************************************************************************/
 #include "ringtonedevicemodel.h"
 
+//Qt
+#include <QtCore/QItemSelectionModel>
+
 //Ring
 #include "dbus/configurationmanager.h"
 #include "settings.h"
@@ -27,12 +30,18 @@ class RingtoneDeviceModelPrivate : public QObject
 public:
    RingtoneDeviceModelPrivate(Audio::RingtoneDeviceModel* parent);
    QStringList m_lDeviceList;
+   mutable QItemSelectionModel* m_pSelectionModel;
 
 private:
    Audio::RingtoneDeviceModel* q_ptr;
+
+public Q_SLOTS:
+   void setCurrentDevice(const QModelIndex& index);
+   void setCurrentDevice(int idx);
 };
 
-RingtoneDeviceModelPrivate::RingtoneDeviceModelPrivate(Audio::RingtoneDeviceModel* parent) : q_ptr(parent)
+RingtoneDeviceModelPrivate::RingtoneDeviceModelPrivate(Audio::RingtoneDeviceModel* parent) : q_ptr(parent),
+m_pSelectionModel(nullptr)
 {
 
 }
@@ -98,6 +107,23 @@ bool Audio::RingtoneDeviceModel::setData( const QModelIndex& index, const QVaria
    return false;
 }
 
+QItemSelectionModel* Audio::RingtoneDeviceModel::selectionModel() const
+{
+   if (!d_ptr->m_pSelectionModel) {
+      d_ptr->m_pSelectionModel = new QItemSelectionModel(const_cast<Audio::RingtoneDeviceModel*>(this));
+
+      ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
+      const QStringList currentDevices = configurationManager.getCurrentAudioDevicesIndex();
+      const int idx = currentDevices[static_cast<int>(Settings::DeviceIndex::RINGTONE)].toInt();
+      if (!(idx >= d_ptr->m_lDeviceList.size()))
+         d_ptr->m_pSelectionModel->setCurrentIndex(index(idx,0), QItemSelectionModel::ClearAndSelect);
+
+      connect(d_ptr->m_pSelectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex)), d_ptr.data(), SLOT(setCurrentDevice(QModelIndex)));
+   }
+
+   return d_ptr->m_pSelectionModel;
+}
+
 ///Return the current ringtone device
 QModelIndex Audio::RingtoneDeviceModel::currentDevice() const
 {
@@ -110,7 +136,7 @@ QModelIndex Audio::RingtoneDeviceModel::currentDevice() const
 }
 
 ///Set the current ringtone device
-void Audio::RingtoneDeviceModel::setCurrentDevice(const QModelIndex& index)
+void RingtoneDeviceModelPrivate::setCurrentDevice(const QModelIndex& index)
 {
    if (index.isValid()) {
       ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
@@ -119,9 +145,9 @@ void Audio::RingtoneDeviceModel::setCurrentDevice(const QModelIndex& index)
 }
 
 ///QCombobox -> QModelIndex shim
-void Audio::RingtoneDeviceModel::setCurrentDevice(int idx)
+void RingtoneDeviceModelPrivate::setCurrentDevice(int idx)
 {
-   setCurrentDevice(index(idx,0));
+   setCurrentDevice(q_ptr->index(idx,0));
 }
 
 ///Reload ringtone device list

src/audio/ringtonedevicemodel.h

@@ -27,6 +27,7 @@
 #include <typedefs.h>
 
 class RingtoneDeviceModelPrivate;
+class QItemSelectionModel;
 
 namespace Audio {
 
@@ -45,10 +46,7 @@ public:
 
    //Getters
    QModelIndex currentDevice() const;
-
-   //Setters
-   void setCurrentDevice(const QModelIndex& index);
-   void setCurrentDevice(int idx);
+   QItemSelectionModel* selectionModel() const;
 
    //Mutator
    void reload();

src/audio/settings.cpp

@@ -139,11 +139,10 @@ bool Audio::Settings::isRoomToneEnabled()
 ///Reload everything
 void Audio::Settings::reload()
 {
-   d_ptr->m_pAlsaPluginModel->reload();
-   d_ptr->m_pInputDeviceModel->reload();
-   d_ptr->m_pOutputDeviceModel->reload();
-//    m_pAudioManagerModel->reload();
-   d_ptr->m_pRingtoneDeviceModel->reload();
+   alsaPluginModel    ()->reload();
+   inputDeviceModel   ()->reload();
+   outputDeviceModel  ()->reload();
+   ringtoneDeviceModel()->reload();
 }
 
 ///Play room tone