SDRPLAY: balance API refcount via running, fix Open() bounds check and antenna validation

Author: jvde-github

Source/Device/SDRPLAY.cpp

@@ -31,24 +31,15 @@ namespace Device {
 	int SDRPLAY::API_count = 0;
 
 	SDRPLAY::SDRPLAY() : Device(Format::CF32, 2304000, Type::SDRPLAY, "SDRPLAY") {
-		float version = 0.0;
-
 		if (API_count == 0 && sdrplay_api_Open() != sdrplay_api_Success)
 			return;
 
 		API_count++;
-
-		if (sdrplay_api_ApiVersion(&version) != sdrplay_api_Success)
-			return;
-
-		if ((int)version != 3)
-			return;
-
 		running = true;
 	}
 
 	SDRPLAY::~SDRPLAY() {
-		if (--API_count == 0) sdrplay_api_Close();
+		if (running && --API_count == 0) sdrplay_api_Close();
 	}
 
 	void SDRPLAY::Open(uint64_t h) {
@@ -61,7 +52,7 @@ namespace Device {
 		sdrplay_api_DeviceT devices[SDRPLAY_MAX_DEVICES];
 		sdrplay_api_GetDevices(devices, &DeviceCount, SDRPLAY_MAX_DEVICES);
 
-		if (DeviceCount < h) throw std::runtime_error("SDRPLAY: cannot open device, handle not available.");
+		if (h >= DeviceCount) throw std::runtime_error("SDRPLAY: cannot open device, handle not available.");
 
 		device = devices[h];
 
@@ -190,7 +181,13 @@ namespace Device {
 	void SDRPLAY::getDeviceList(std::vector<Description>& DeviceList) {
 		unsigned int DeviceCount;
 		if (!running) {
-			Warning() << "SDRPLAY: API v3.x not running, skipping SDRplay device detection.";
+			Warning() << "SDRPLAY: API v3.x not running, no SDRplay devices available.";
+			return;
+		}
+
+		float version = 0.0;
+		if (sdrplay_api_ApiVersion(&version) != sdrplay_api_Success || (int)version != 3) {
+			Warning() << "SDRPLAY: API version is not 3.x, no SDRplay devices available.";
 			return;
 		}
 
@@ -230,13 +227,14 @@ namespace Device {
 		case AIS::KEY_SETTING_GRDB:
 			gRdB = Util::Parse::Integer(arg, 0, 59);
 			break;
-		case AIS::KEY_SETTING_ANTENNA:
-			if (antenna == 'A' || antenna == 'B') {
-				antenna = arg[0];
-			}
+		case AIS::KEY_SETTING_ANTENNA: {
+			char a = arg.empty() ? 0 : (arg[0] & ~0x20);
+			if (a == 'A' || a == 'B' || a == 'C')
+				antenna = a;
 			else
 				throw std::runtime_error("SDRPLAY: invalid antenna.");
 			break;
+		}
 		default:
 			Device::SetKey(key, arg);
 			break;