From b997f6ca39127e35ac44e88ab5b2f007be73500b Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 17 Nov 2016 03:19:05 +0100
Subject: [PATCH] SDRPlay plugin: removed usless auto gain mode

---
 plugins/samplesource/sdrplay/sdrplaygui.cpp   |  7 ----
 plugins/samplesource/sdrplay/sdrplaygui.h     |  1 -
 plugins/samplesource/sdrplay/sdrplaygui.ui    |  9 +-----
 plugins/samplesource/sdrplay/sdrplayinput.cpp | 32 +++----------------
 .../samplesource/sdrplay/sdrplaysettings.cpp  |  3 --
 .../samplesource/sdrplay/sdrplaysettings.h    |  1 -
 6 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp
index 85291c1c2..baf644718 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp
@@ -375,13 +375,6 @@ void SDRPlayGui::on_gain_valueChanged(int value)
     sendSettings();
 }
 
-void SDRPlayGui::on_gainAuto_toggled(bool checked)
-{
-    qDebug("SDRPlayGui::on_gainAuto_toggled: %s", checked ? "on" : "off");
-    m_settings.m_autoGain = checked;
-    sendSettings();
-}
-
 void SDRPlayGui::on_startStop_toggled(bool checked)
 {
     if (checked)
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h
index fa008a018..5bd684b77 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.h
+++ b/plugins/samplesource/sdrplay/sdrplaygui.h
@@ -84,7 +84,6 @@ private slots:
     void on_decim_currentIndexChanged(int index);
     void on_fcPos_currentIndexChanged(int index);
     void on_gain_valueChanged(int value);
-    void on_gainAuto_toggled(bool checked);
     void on_startStop_toggled(bool checked);
     void on_record_toggled(bool checked);
 };
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.ui b/plugins/samplesource/sdrplay/sdrplaygui.ui
index 8ab9d8b3e..92889f06b 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.ui
+++ b/plugins/samplesource/sdrplay/sdrplaygui.ui
@@ -552,7 +552,7 @@
         </size>
        </property>
        <property name="toolTip">
-        <string>  </string>
+        <string/>
        </property>
        <property name="text">
         <string>000</string>
@@ -569,13 +569,6 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="3">
-      <widget class="ButtonSwitch" name="gainAuto">
-       <property name="text">
-        <string>A</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp
index b19b2e55a..cb74d9073 100644
--- a/plugins/samplesource/sdrplay/sdrplayinput.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp
@@ -253,7 +253,6 @@ bool SDRPlayInput::handleMessage(const Message& message)
 bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool force)
 {
     bool forwardChange = false;
-    bool forceManualGain = false;
     QMutexLocker mutexLocker(&m_mutex);
 
     if ((m_settings.m_dcBlock != settings.m_dcBlock) || force)
@@ -268,40 +267,17 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool force)
         m_deviceAPI->configureCorrections(m_settings.m_dcBlock, m_settings.m_iqCorrection);
     }
 
-    if ((m_settings.m_autoGain != settings.m_autoGain) || force)
+    if ((m_settings.m_gain != settings.m_gain) || force)
     {
-        m_settings.m_autoGain = settings.m_autoGain;
+        m_settings.m_gain = settings.m_gain;
 
         if(m_dev != 0)
         {
-            int r = mirisdr_set_tuner_gain_mode(m_dev, m_settings.m_autoGain ? 0 : 1);
+            int r = mirisdr_set_tuner_gain(m_dev, m_settings.m_gain);
 
             if (r < 0)
             {
-                qDebug("SDRPlayInput::applySettings: could not set auto gain %s: rc: %d", m_settings.m_autoGain ? "on" : "off", r);
-            }
-            else
-            {
-                qDebug("SDRPlayInput::applySettings: auto gain set to %s", m_settings.m_autoGain ? "on" : "off");
-                forceManualGain = !m_settings.m_autoGain;
-            }
-        }
-    }
-
-    if (!m_settings.m_autoGain)
-    {
-        if ((m_settings.m_gain != settings.m_gain) || force || forceManualGain)
-        {
-            m_settings.m_gain = settings.m_gain;
-
-            if(m_dev != 0)
-            {
-                int r = mirisdr_set_tuner_gain(m_dev, m_settings.m_gain);
-
-                if (r < 0)
-                {
-                    qDebug("SDRPlayInput::applySettings: could not set tuner gain()");
-                }
+                qDebug("SDRPlayInput::applySettings: could not set tuner gain()");
             }
         }
     }
diff --git a/plugins/samplesource/sdrplay/sdrplaysettings.cpp b/plugins/samplesource/sdrplay/sdrplaysettings.cpp
index b04e5cfad..a8a441baf 100644
--- a/plugins/samplesource/sdrplay/sdrplaysettings.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaysettings.cpp
@@ -37,7 +37,6 @@ void SDRPlaySettings::resetToDefaults()
     m_fcPos = FC_POS_CENTER;
     m_dcBlock = false;
     m_iqCorrection = false;
-    m_autoGain = false;
 }
 
 QByteArray SDRPlaySettings::serialize() const
@@ -54,7 +53,6 @@ QByteArray SDRPlaySettings::serialize() const
 	s.writeS32(8, (int) m_fcPos);
 	s.writeBool(9, m_dcBlock);
 	s.writeBool(10, m_iqCorrection);
-    s.writeBool(11, m_autoGain);
 
 	return s.final();
 }
@@ -84,7 +82,6 @@ bool SDRPlaySettings::deserialize(const QByteArray& data)
 		m_fcPos = (fcPos_t) intval;
 		d.readBool(9, &m_dcBlock, false);
 		d.readBool(10, &m_iqCorrection, false);
-        d.readBool(11, &m_autoGain, false);
 
 		return true;
 	}
diff --git a/plugins/samplesource/sdrplay/sdrplaysettings.h b/plugins/samplesource/sdrplay/sdrplaysettings.h
index 93f00b9c8..46bc95506 100644
--- a/plugins/samplesource/sdrplay/sdrplaysettings.h
+++ b/plugins/samplesource/sdrplay/sdrplaysettings.h
@@ -38,7 +38,6 @@ struct SDRPlaySettings {
 	fcPos_t m_fcPos;
 	bool m_dcBlock;
 	bool m_iqCorrection;
-	bool m_autoGain;
 
 	SDRPlaySettings();
 	void resetToDefaults();