Merge branch 'develop' into pycsdr

owrx/source/__init__.py

@@ -96,7 +96,7 @@ class SdrSource(ABC):
         return self.commandMapper
 
     @abstractmethod
-    def onPropertyChange(self, name, value):
+    def onPropertyChange(self, changes):
         pass
 
     def wireEvents(self):

owrx/source/connector.py

@@ -29,22 +29,22 @@ class ConnectorSource(SdrSource):
             }
         )
 
-    def sendControlMessage(self, prop, value):
-        logger.debug("sending property change over control socket: {0} changed to {1}".format(prop, value))
-        self.controlSocket.sendall("{prop}:{value}\n".format(prop=prop, value=value).encode())
+    def sendControlMessage(self, changes):
+        for prop, value in changes.items():
+            logger.debug("sending property change over control socket: {0} changed to {1}".format(prop, value))
+            self.controlSocket.sendall("{prop}:{value}\n".format(prop=prop, value=value).encode())
 
-    def onPropertyChange(self, prop, value):
+    def onPropertyChange(self, changes):
         if self.monitor is None:
             return
         if (
-            (prop == "center_freq" or prop == "lfo_offset")
+            ("center_freq" in changes or "lfo_offset" in changes)
             and "lfo_offset" in self.sdrProps
             and self.sdrProps["lfo_offset"] is not None
         ):
-            freq = self.sdrProps["center_freq"] + self.sdrProps["lfo_offset"]
-            self.sendControlMessage("center_freq", freq)
-        else:
-            self.sendControlMessage(prop, value)
+            changes["center_freq"] = self.sdrProps["center_freq"] + self.sdrProps["lfo_offset"]
+            changes.pop("lfo_offset", None)
+        self.sendControlMessage(changes)
 
     def postStart(self):
         logger.debug("opening control socket...")

owrx/source/direct.py

@@ -7,12 +7,8 @@ logger = logging.getLogger(__name__)
 
 
 class DirectSource(SdrSource, metaclass=ABCMeta):
-    def onPropertyChange(self, name, value):
-        logger.debug(
-            "restarting sdr source due to property change: {0} changed to {1}".format(
-                name, value
-            )
-        )
+    def onPropertyChange(self, changes):
+        logger.debug("restarting sdr source due to property changes: {0}".format(changes))
         self.stop()
         self.sleepOnRestart()
         self.start()

owrx/source/fifi_sdr.py

@@ -30,7 +30,6 @@ class FifiSdrSource(DirectSource):
         values = self.getCommandValues()
         self.sendRockProgFrequency(values["tuner_freq"])
 
-    def onPropertyChange(self, name, value):
-        if name != "center_freq":
-            return
-        self.sendRockProgFrequency(value)
+    def onPropertyChange(self, changes):
+        if "center_freq" in changes:
+            self.sendRockProgFrequency(changes["center_freq"])

owrx/source/resampler.py

@@ -6,8 +6,8 @@ logger = logging.getLogger(__name__)
 
 
 class Resampler(DirectSource):
-    def onPropertyChange(self, name, value):
-        logger.warning("Resampler is unable to handle property change ({0} changed to {1})".format(name, value))
+    def onPropertyChange(self, changes):
+        logger.warning("Resampler is unable to handle property changes: {0}".format(changes))
 
     def __init__(self, props, sdr):
         sdrProps = sdr.getProps()

owrx/source/soapy.py

@@ -80,9 +80,12 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
             values["soapy_settings"] = settings
         return values
 
-    def onPropertyChange(self, prop, value):
+    def onPropertyChange(self, changes):
         mappings = self.getSoapySettingsMappings()
-        if prop in mappings.keys():
-            value = "{0}={1}".format(mappings[prop], self.convertSoapySettingsValue(value))
-            prop = "settings"
-        super().onPropertyChange(prop, value)
+        settings = {}
+        for prop, value in changes.items():
+            if prop in mappings.keys():
+                settings[mappings[prop]] = self.convertSoapySettingsValue(value)
+        if settings:
+            changes["settings"] = ",".join("{0}={1}".format(k, v) for k, v in settings.items())
+        super().onPropertyChange(changes)