Show signal quality widgets if deck is configured, not just if it's enabled.

4 files changed, 8 insertions, 3 deletions

diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp
index 0375d8a1e1..bec4b46f73 100644
--- a/src/vinylcontrol/vinylcontrolmanager.cpp
+++ b/src/vinylcontrol/vinylcontrolmanager.cpp
@@ -88,7 +88,7 @@ void VinylControlManager::requestReloadConfig() {
     m_pProcessor->requestReloadConfig();
 }
 
-bool VinylControlManager::vinylInputEnabled(int deck) {
+bool VinylControlManager::vinylInputConnected(int deck) {
     if (deck < 0 || deck >= m_iNumConfiguredDecks) {
         return false;
     }
@@ -96,7 +96,7 @@ bool VinylControlManager::vinylInputEnabled(int deck) {
         qDebug() << "WARNING, tried to get vinyl enabled status for non-existant deck " << deck;
         return false;
     }
-    return m_pVcEnabled.at(deck)->get() != 0;
+    return m_pProcessor->deckConfigured(deck);
 }
 
 int VinylControlManager::vinylInputFromGroup(const QString& group) {
diff --git a/src/vinylcontrol/vinylcontrolmanager.h b/src/vinylcontrol/vinylcontrolmanager.h
index 7321efedb6..d7c4e1a4fa 100644
--- a/src/vinylcontrol/vinylcontrolmanager.h
+++ b/src/vinylcontrol/vinylcontrolmanager.h
@@ -45,7 +45,7 @@ class VinylControlManager : public QObject {
     // Some initialization must wait until the decks have been created
     void init();
 
-    bool vinylInputEnabled(int deck);
+    bool vinylInputConnected(int deck);
     int vinylInputFromGroup(const QString& group);
 
     void addSignalQualityListener(VinylSignalQualityListener* pListener);
diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp
index 3bca0935dc..59129454af 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.cpp
+++ b/src/vinylcontrol/vinylcontrolprocessor.cpp
@@ -199,6 +199,9 @@ void VinylControlProcessor::onInputUnconfigured(AudioInput input) {
     delete pVC;
 }
 
+bool VinylControlProcessor::deckConfigured(int index) const {
+    return m_processors[index] != NULL;
+}
 
 void VinylControlProcessor::receiveBuffer(AudioInput input,
                                           const CSAMPLE* pBuffer,
diff --git a/src/vinylcontrol/vinylcontrolprocessor.h b/src/vinylcontrol/vinylcontrolprocessor.h
index 83a1b7e3ac..3608cd5462 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.h
+++ b/src/vinylcontrol/vinylcontrolprocessor.h
@@ -34,6 +34,8 @@ class VinylControlProcessor : public QThread, public AudioDestination {
     // Called from the main thread. Must only touch m_bReload;
     void requestReloadConfig();
 
+    bool deckConfigured(int index) const;
+
     FIFO<VinylSignalQualityReport>* getSignalQualityFifo() {
         return &m_signalQualityFifo;
     }