joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activate "service_decoder" setting

Browse Source
This commit is contained in:
Jakob Ketterl 2021-02-26 23:50:58 +01:00
parent 3164683e74
commit 0a76801a03
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
owrx/service/__init__.py
View File

@ -70,6 +70,7 @@ class ServiceHandler(SdrSourceEventClient):
self.running = False self.running = False
props = self.source.getProps() props = self.source.getProps()
self.enabledSub = props.wireProperty("services", self._receiveEvent) self.enabledSub = props.wireProperty("services", self._receiveEvent)
self.decodersSub = None
# need to call _start() manually if property is not set since the default is True, but the initial call is only # need to call _start() manually if property is not set since the default is True, but the initial call is only
# made if the property is present # made if the property is present
if "services" not in props: if "services" not in props:
@ -91,13 +92,17 @@ class ServiceHandler(SdrSourceEventClient):
self.source.addClient(self) self.source.addClient(self)
props = self.source.getProps() props = self.source.getProps()
self.activitySub = props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange) self.activitySub = props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
self.decodersSub = Config.get().wireProperty("services_decoders", self.onFrequencyChange)
if self.source.isAvailable(): if self.source.isAvailable():
self.scheduleServiceStartup() self._scheduleServiceStartup()
def _stop(self): def _stop(self):
if self.activitySub is not None: if self.activitySub is not None:
self.activitySub.cancel() self.activitySub.cancel()
self.activitySub = None self.activitySub = None
if self.decodersSub is not None:
self.decodersSub.cancel()
self.decodersSub = None
self._cancelStartupTimer() self._cancelStartupTimer()
self.source.removeClient(self) self.source.removeClient(self)
self.stopServices() self.stopServices()
@ -108,7 +113,7 @@ class ServiceHandler(SdrSourceEventClient):
def onStateChange(self, state: SdrSourceState): def onStateChange(self, state: SdrSourceState):
if state is SdrSourceState.RUNNING: if state is SdrSourceState.RUNNING:
self.scheduleServiceStartup() self._scheduleServiceStartup()
elif state is SdrSourceState.STOPPING: elif state is SdrSourceState.STOPPING:
logger.debug("sdr source becoming unavailable; stopping services.") logger.debug("sdr source becoming unavailable; stopping services.")
self.stopServices() self.stopServices()
@ -142,14 +147,14 @@ class ServiceHandler(SdrSourceEventClient):
self.stopServices() self.stopServices()
if not self.source.isAvailable(): if not self.source.isAvailable():
return return
self.scheduleServiceStartup() self._scheduleServiceStartup()
def _cancelStartupTimer(self): def _cancelStartupTimer(self):
if self.startupTimer: if self.startupTimer:
self.startupTimer.cancel() self.startupTimer.cancel()
self.startupTimer = None self.startupTimer = None
def scheduleServiceStartup(self): def _scheduleServiceStartup(self):
self._cancelStartupTimer() self._cancelStartupTimer()
self.startupTimer = threading.Timer(10, self.updateServices) self.startupTimer = threading.Timer(10, self.updateServices)
self.startupTimer.start() self.startupTimer.start()