From 2b1d7712751650f768a20a5c561788b989309532 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 30 Oct 2019 23:03:17 +0100
Subject: [PATCH] [AFV] Ref T731, Ref T739 display registered devices in UI

---
 .../audioadvanceddistributedcomponent.cpp     | 10 +++++
 .../audioadvanceddistributedcomponent.h       |  3 ++
 .../audioadvanceddistributedcomponent.ui      | 42 +++++++++++++++----
 .../audiodevicevolumesetupcomponent.cpp       |  2 +-
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.cpp b/src/blackgui/components/audioadvanceddistributedcomponent.cpp
index 81c8582f8..70a1be064 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.cpp
+++ b/src/blackgui/components/audioadvanceddistributedcomponent.cpp
@@ -31,6 +31,7 @@ namespace BlackGui
             connect(sGui->getCContextAudioBase(), &CContextAudioBase::stoppedAudio, this, &CAudioAdvancedDistributedComponent::onAudioStoppend, Qt::QueuedConnection);
             connect(ui->pb_EnableDisable,         &QPushButton::pressed,            this, &CAudioAdvancedDistributedComponent::toggleAudioEnableDisable, Qt::QueuedConnection);
             connect(ui->pb_StartStop,             &QPushButton::pressed,            this, &CAudioAdvancedDistributedComponent::toggleAudioStartStop,     Qt::QueuedConnection);
+            connect(ui->pb_ReloadRegistered,      &QPushButton::pressed,            this, &CAudioAdvancedDistributedComponent::reloadRegistered,         Qt::QueuedConnection);
 
             this->setButtons();
         }
@@ -74,6 +75,13 @@ namespace BlackGui
             this->setButtons(2000);
         }
 
+        void CAudioAdvancedDistributedComponent::reloadRegistered()
+        {
+            if (!hasContexts()) { return; }
+            const CAudioDeviceInfoList registeredDevices = sGui->getIContextAudio()->getRegisteredDevices();
+            ui->tvp_RegisteredDevices->updateContainerMaybeAsync(registeredDevices);
+        }
+
         void CAudioAdvancedDistributedComponent::setButtons()
         {
             if (!hasContexts()) { return; }
@@ -100,11 +108,13 @@ namespace BlackGui
             Q_UNUSED(inputDevice)
             Q_UNUSED(outputDevice)
             this->setButtons();
+            this->reloadRegistered();
         }
 
         void CAudioAdvancedDistributedComponent::onAudioStoppend()
         {
             this->setButtons();
+            this->reloadRegistered();
         }
 
         bool CAudioAdvancedDistributedComponent::hasContexts()
diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.h b/src/blackgui/components/audioadvanceddistributedcomponent.h
index 0c0d42658..d19913040 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.h
+++ b/src/blackgui/components/audioadvanceddistributedcomponent.h
@@ -42,6 +42,9 @@ namespace BlackGui
             //! Audio enable/disable
             void toggleAudioEnableDisable();
 
+            //! Reload registered devices
+            void reloadRegistered();
+
             //! Start/stop button @{
             void setButtons();
             void setButtons(int delayMs);
diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.ui b/src/blackgui/components/audioadvanceddistributedcomponent.ui
index 196eda6b1..4487ec2ae 100644
--- a/src/blackgui/components/audioadvanceddistributedcomponent.ui
+++ b/src/blackgui/components/audioadvanceddistributedcomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>166</width>
-    <height>55</height>
+    <width>270</width>
+    <height>275</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,13 +21,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="pb_StartStop">
-     <property name="text">
-      <string>stop</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="lbl_EnableDisable">
      <property name="text">
@@ -35,6 +28,16 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="BlackGui::Views::CAudioDeviceInfoView" name="tvp_RegisteredDevices">
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="verticalHeaderHighlightSections">
+      <bool>true</bool>
+     </attribute>
+    </widget>
+   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="lbl_StartStop">
      <property name="text">
@@ -42,8 +45,29 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="pb_StartStop">
+     <property name="text">
+      <string>stop</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="pb_ReloadRegistered">
+     <property name="text">
+      <string>reload registered</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BlackGui::Views::CAudioDeviceInfoView</class>
+   <extends>QTableView</extends>
+   <header>blackgui/views/audiodeviceinfoview.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>pb_StartStop</tabstop>
  </tabstops>
diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp
index 4ffde7dd5..1c04ec5d4 100644
--- a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp
+++ b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp
@@ -114,7 +114,7 @@ namespace BlackGui
                 Q_ASSERT(c);
 
                 // context
-                c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::changedAudioDevices, this, &CAudioDeviceVolumeSetupComponent::onAudioDevicesChanged, Qt::QueuedConnection);
+                c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::changedLocalAudioDevices, this, &CAudioDeviceVolumeSetupComponent::onAudioDevicesChanged, Qt::QueuedConnection);
                 Q_ASSERT(c);
                 c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::startedAudio, this, &CAudioDeviceVolumeSetupComponent::onAudioStarted, Qt::QueuedConnection);
                 Q_ASSERT(c);