From 10de50d251eceb80bc219223b164fd6074ee197d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Dec 2019 19:24:14 +0100
Subject: [PATCH] remove old sources, make the connector-based ones default

---
 owrx/feature.py | 16 ++++++++--------
 owrx/source.py  | 48 ++++--------------------------------------------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index 89e39b5..0070342 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -18,20 +18,20 @@ class UnknownFeatureException(Exception):
 
 class FeatureDetector(object):
     features = {
+        # core features; we won't start without these
         "core": ["csdr", "nmux", "nc"],
-        "rtl_sdr": ["rtl_sdr"],
-        "rtl_sdr_connector": ["rtl_connector"],
-        "sdrplay": ["rx_tools"],
-        "sdrplay_connector": ["soapy_connector"],
+        # different types of sdrs and their requirements
+        "rtl_sdr": ["rtl_connector"],
+        "sdrplay": ["soapy_connector"],
         "hackrf": ["hackrf_transfer"],
-        "airspy": ["airspy_rx"],
-        "airspy_connector": ["soapy_connector"],
-        "airspyhf_connector": ["soapy_connector"],
+        "airspy": ["soapy_connector"],
+        "airspyhf": ["soapy_connector"],
+        "fifi_sdr": ["alsa"],
+        # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
         "wsjt-x": ["wsjtx", "sox"],
         "packet": ["direwolf", "sox"],
-        "fifi_sdr": ["alsa"],
     }
 
     def feature_availability(self):
diff --git a/owrx/source.py b/owrx/source.py
index c02ed18..5593895 100644
--- a/owrx/source.py
+++ b/owrx/source.py
@@ -524,7 +524,7 @@ class ConnectorSource(SdrSource):
         return False
 
 
-class RtlSdrConnectorSource(ConnectorSource):
+class RtlSdrSource(ConnectorSource):
     def getCommand(self):
         cmd = (
             "rtl_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort)
@@ -584,7 +584,7 @@ class SoapyConnectorSource(ConnectorSource):
         return values
 
 
-class SdrplayConnectorSource(SoapyConnectorSource):
+class SdrplaySource(SoapyConnectorSource):
     def getDriver(self):
         return "sdrplay"
 
@@ -604,7 +604,7 @@ class SdrplayConnectorSource(SoapyConnectorSource):
         return cmd
 
 
-class AirspyConnectorSource(SoapyConnectorSource):
+class AirspySource(SoapyConnectorSource):
     def getDriver(self):
         return "airspy"
 
@@ -626,19 +626,11 @@ class AirspyConnectorSource(SoapyConnectorSource):
         return cmd
 
 
-class AirspyhfConnectorSource(AirspyConnectorSource):
+class AirspyhfSource(AirspySource):
     def getDriver(self):
         return "airspyhf"
 
 
-class RtlSdrSource(SdrSource):
-    def getCommand(self):
-        return "rtl_sdr -s {samp_rate} -f {tuner_freq} -p {ppm} -g {rf_gain} -"
-
-    def getFormatConversion(self):
-        return "csdr convert_u8_f"
-
-
 class HackrfSource(SdrSource):
     def getCommand(self):
         return "hackrf_transfer -s {samp_rate} -f {tuner_freq} -g {rf_gain} -l{lna_gain} -a{rf_amp} -r-"
@@ -647,38 +639,6 @@ class HackrfSource(SdrSource):
         return "csdr convert_s8_f"
 
 
-class SdrplaySource(SdrSource):
-    def getCommand(self):
-        command = "rx_sdr -F CF32 -s {samp_rate} -f {tuner_freq} -p {ppm}"
-        gainMap = {"rf_gain": "RFGR", "if_gain": "IFGR"}
-        gains = [
-            "{0}={{{1}}}".format(gainMap[name], name)
-            for (name, value) in self.rtlProps.collect("rf_gain", "if_gain").__dict__().items()
-            if value is not None
-        ]
-        if gains:
-            command += " -g {gains}".format(gains=",".join(gains))
-        if self.rtlProps["antenna"] is not None:
-            command += ' -a "{antenna}"'
-        command += " -"
-        return command
-
-    def sleepOnRestart(self):
-        time.sleep(1)
-
-
-class AirspySource(SdrSource):
-    def getCommand(self):
-        frequency = self.props["tuner_freq"] / 1e6
-        command = "airspy_rx"
-        command += " -f{0}".format(frequency)
-        command += " -r /dev/stdout -a{samp_rate} -g {rf_gain}"
-        return command
-
-    def getFormatConversion(self):
-        return "csdr convert_s16_f"
-
-
 class SpectrumThread(csdr.output):
     def __init__(self, sdrSource):
         self.sdrSource = sdrSource