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

don't resample when there's only one service

Browse Source
This commit is contained in:
Jakob Ketterl 2021-05-08 00:37:30 +02:00
parent 1b31c5fc90
commit fd26acca68
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
owrx/service/__init__.py
View File

@ -193,21 +193,25 @@ class ServiceHandler(SdrSourceEventClient):
self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source)) self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
else: else:
for group in groups: for group in groups:
cf = self.get_center_frequency(group) if len(group) > 1:
bw = self.get_bandwidth(group) cf = self.get_center_frequency(group)
logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw)) bw = self.get_bandwidth(group)
resampler_props = PropertyLayer() logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw))
resampler_props["center_freq"] = cf resampler_props = PropertyLayer()
resampler_props["samp_rate"] = bw resampler_props["center_freq"] = cf
resampler = Resampler(resampler_props, self.source) resampler_props["samp_rate"] = bw
resampler.start() resampler = Resampler(resampler_props, self.source)
resampler.start()
for dial in group: for dial in group:
self.services.append(self.setupService(dial["mode"], dial["frequency"], resampler)) self.services.append(self.setupService(dial["mode"], dial["frequency"], resampler))
# resampler goes in after the services since it must not be shutdown as long as the services are # resampler goes in after the services since it must not be shutdown as long as the services are
# still running # still running
self.services.append(resampler) self.services.append(resampler)
else:
dial = group[0]
self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
def get_min_max(self, group): def get_min_max(self, group):
frequencies = sorted(group, key=lambda f: f["frequency"]) frequencies = sorted(group, key=lambda f: f["frequency"])