From 31237b758e9a03717acc7e56e958c71d2ccabc35 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 16 Nov 2017 01:58:09 +0100
Subject: [PATCH] Ref T195, audio utility function

---
 src/blackcore/context/contextaudio.cpp          |  9 +++++++++
 src/blackcore/context/contextaudio.h            |  3 +++
 src/blackgui/components/audiosetupcomponent.cpp | 17 +----------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp
index 88eada105..3cbac047f 100644
--- a/src/blackcore/context/contextaudio.cpp
+++ b/src/blackcore/context/contextaudio.cpp
@@ -58,5 +58,14 @@ namespace BlackCore
                 return new CContextAudioEmpty(runtime); // audio not mandatory
             }
         }
+
+        QString IContextAudio::audioRunsWhereInfo() const
+        {
+            if (this->isEmptyObject()) { return "no audio"; }
+            const CIdentifier i = this->audioRunsWhere();
+            return this->isUsingImplementingObject() ?
+                   QString("Local audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName()) :
+                   QString("Remote audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName());
+        }
     } // ns
 } // ns
diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h
index b0c277b61..3c16d5b10 100644
--- a/src/blackcore/context/contextaudio.h
+++ b/src/blackcore/context/contextaudio.h
@@ -137,6 +137,9 @@ namespace BlackCore
             //! Audio runs where
             virtual BlackMisc::CIdentifier audioRunsWhere() const = 0;
 
+            //! Info string about audio
+            QString audioRunsWhereInfo() const;
+
             //! Get current audio device
             //! \return input and output devices
             virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const = 0;
diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp
index 0967a8c34..246a12536 100644
--- a/src/blackgui/components/audiosetupcomponent.cpp
+++ b/src/blackgui/components/audiosetupcomponent.cpp
@@ -45,22 +45,7 @@ namespace BlackGui
             // audio is optional
             const bool audio = this->hasAudio();
             this->setEnabled(audio);
-            if (!audio)
-            {
-                ui->lbl_ExtraInfo->setText("No audio, cannot change.");
-            }
-            else if (sGui->getIContextAudio()->isUsingImplementingObject())
-            {
-                const CIdentifier i = sGui->getIContextAudio()->audioRunsWhere();
-                const QString info = QString("Local audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName());
-                ui->lbl_ExtraInfo->setText(info);
-            }
-            else
-            {
-                const CIdentifier i = sGui->getIContextAudio()->audioRunsWhere();
-                const QString info = QString("Remote audio on '%1', '%2'.").arg(i.getMachineName(), i.getProcessName());
-                ui->lbl_ExtraInfo->setText(info);
-            }
+            ui->lbl_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");
 
             bool c = connect(ui->tb_ExpandNotificationSounds, &QToolButton::toggled, this, &CAudioSetupComponent::ps_onToggleNotificationSoundsVisibility);
             Q_ASSERT(c);