From dd1233863578fd4722d6b23fdabf51dc4cdbda13 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 11 Jan 2018 00:17:06 +0100
Subject: [PATCH] Airspy: cosmetic changes

---
 plugins/samplesource/airspy/airspygui.h      |  2 --
 plugins/samplesource/airspy/airspyinput.cpp  | 22 +++++++++-----------
 plugins/samplesource/airspy/airspyplugin.cpp |  4 +++-
 plugins/samplesource/airspy/airspyplugin.h   |  1 +
 plugins/samplesource/airspy/airspythread.cpp |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h
index 2c3b77528..aca2de1e0 100644
--- a/plugins/samplesource/airspy/airspygui.h
+++ b/plugins/samplesource/airspy/airspygui.h
@@ -24,8 +24,6 @@
 #include "util/messagequeue.h"
 #include "airspyinput.h"
 
-#define AIRSPY_MAX_DEVICE (32)
-
 class DeviceUISet;
 
 namespace Ui {
diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp
index ea1a92971..926309a5a 100644
--- a/plugins/samplesource/airspy/airspyinput.cpp
+++ b/plugins/samplesource/airspy/airspyinput.cpp
@@ -23,6 +23,7 @@
 
 #include "airspygui.h"
 #include "airspyinput.h"
+#include "airspyplugin.h"
 
 #include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
@@ -282,7 +283,7 @@ bool AirspyInput::handleMessage(const Message& message)
 
 		if (!success)
 		{
-			qDebug("Airspy config error");
+			qDebug("AirspyInput::handleMessage: Airspy config error");
 		}
 
 		return true;
@@ -340,7 +341,7 @@ void AirspyInput::setDeviceCenterFrequency(quint64 freq_hz)
 	}
 	else
 	{
-		qWarning("AirspyInput::setDeviceCenterFrequency: frequency set to %llu Hz", freq_hz);
+		qDebug("AirspyInput::setDeviceCenterFrequency: frequency set to %llu Hz", freq_hz);
 	}
 }
 
@@ -353,14 +354,10 @@ bool AirspyInput::applySettings(const AirspySettings& settings, bool force)
 
 	qDebug() << "AirspyInput::applySettings";
 
-	if (m_settings.m_dcBlock != settings.m_dcBlock)
-	{
+    if ((m_settings.m_dcBlock != settings.m_dcBlock) ||
+        (m_settings.m_iqCorrection != settings.m_iqCorrection) || force)
+    {
 		m_settings.m_dcBlock = settings.m_dcBlock;
-		m_deviceAPI->configureCorrections(m_settings.m_dcBlock, m_settings.m_iqCorrection);
-	}
-
-	if (m_settings.m_iqCorrection != settings.m_iqCorrection)
-	{
 		m_settings.m_iqCorrection = settings.m_iqCorrection;
 		m_deviceAPI->configureCorrections(m_settings.m_dcBlock, m_settings.m_iqCorrection);
 	}
@@ -596,15 +593,16 @@ struct airspy_device *AirspyInput::open_airspy_from_sequence(int sequence)
 	struct airspy_device *devinfo;
 	airspy_error rc = AIRSPY_ERROR_OTHER;
 
-	for (int i = 0; i < AIRSPY_MAX_DEVICE; i++)
+	for (int i = 0; i < AirspyPlugin::m_maxDevices; i++)
 	{
 		rc = (airspy_error) airspy_open(&devinfo);
 
 		if (rc == AIRSPY_SUCCESS)
 		{
-			if (i == sequence)
-			{
+			if (i == sequence) {
 				return devinfo;
+			} else {
+			    airspy_close(devinfo);
 			}
 		}
 		else
diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp
index 8ee697f14..f20e5176c 100644
--- a/plugins/samplesource/airspy/airspyplugin.cpp
+++ b/plugins/samplesource/airspy/airspyplugin.cpp
@@ -25,6 +25,8 @@
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 
+const int AirspyPlugin::m_maxDevices = 32;
+
 const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
 	QString("Airspy Input"),
 	QString("3.9.0"),
@@ -69,7 +71,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
 		qCritical("AirspyPlugin::enumSampleSources: failed to initiate Airspy library: %s", airspy_error_name(rc));
 	}
 
-	for (i=0; i < AIRSPY_MAX_DEVICE; i++)
+	for (i=0; i < m_maxDevices; i++)
 	{
 		rc = (airspy_error) airspy_open(&devinfo);
 
diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h
index 62953fa9a..c5553b7d6 100644
--- a/plugins/samplesource/airspy/airspyplugin.h
+++ b/plugins/samplesource/airspy/airspyplugin.h
@@ -44,6 +44,7 @@ public:
 
 	static const QString m_hardwareID;
     static const QString m_deviceTypeID;
+    static const int m_maxDevices;
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
diff --git a/plugins/samplesource/airspy/airspythread.cpp b/plugins/samplesource/airspy/airspythread.cpp
index 5576f4673..3b2424ba5 100644
--- a/plugins/samplesource/airspy/airspythread.cpp
+++ b/plugins/samplesource/airspy/airspythread.cpp
@@ -84,7 +84,7 @@ void AirspyThread::run()
 
 	if (rc != AIRSPY_SUCCESS)
 	{
-		qCritical("AirspyInput::run: failed to start Airspy Rx: %s", airspy_error_name(rc));
+		qCritical("AirspyThread::run: failed to start Airspy Rx: %s", airspy_error_name(rc));
 	}
 	else
 	{
@@ -98,11 +98,11 @@ void AirspyThread::run()
 
 	if (rc == AIRSPY_SUCCESS)
 	{
-		qDebug("AirspyInput::run: stopped Airspy Rx");
+		qDebug("AirspyThread::run: stopped Airspy Rx");
 	}
 	else
 	{
-		qDebug("AirspyInput::run: failed to stop Airspy Rx: %s", airspy_error_name(rc));
+		qDebug("AirspyThread::run: failed to stop Airspy Rx: %s", airspy_error_name(rc));
 	}
 
 	m_running = false;