From aa959cdc932c9dd8957363896c57b628816a8491 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 15 Nov 2016 19:20:18 +0000 Subject: [PATCH] strip newlines from metadata --- openwebrx.py | 2 +- plugins/dsp/csdr/plugin.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openwebrx.py b/openwebrx.py index 066849e..48eff4b 100755 --- a/openwebrx.py +++ b/openwebrx.py @@ -507,7 +507,7 @@ class WebRXHandler(BaseHTTPRequestHandler): myclient.loopstat=35 metadata = dsp.get_metadata(); if metadata == None: break - rxws.send(self, "MET {0}".format(metadata)) + rxws.send(self, "MET {0}".format(metadata.rstrip("\n"))) except: break diff --git a/plugins/dsp/csdr/plugin.py b/plugins/dsp/csdr/plugin.py index bb1fbfb..470bb4c 100644 --- a/plugins/dsp/csdr/plugin.py +++ b/plugins/dsp/csdr/plugin.py @@ -73,16 +73,21 @@ class dsp_plugin: if self.audio_compression=="adpcm": chain_end = " | csdr encode_ima_adpcm_i16_u8" if which == "nfm": return chain_begin + "csdr fmdemod_quadri_cf | csdr limit_ff | csdr fractional_decimator_ff {last_decimation} | csdr deemphasis_nfm_ff 11025 | csdr convert_f_s16"+chain_end - if which in [ "dmr", "dstar", "nxdn" ]: + if which in [ "dstar", "nxdn" ]: c = chain_begin c += "csdr fmdemod_quadri_cf | csdr convert_f_s16" - if which == "dmr": - c += " | dsd -mg -fr" - elif which == "dstar": + if which == "dstar": c += " | dsd -fd" elif which == "nxdn": c += " | dsd -fi" c += " -i - -o - -u 2 -g 10" + c += " | sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --input-buffer 160 - -t raw -r 11025 -e signed-integer -b 16 -c 1 - | csdr setbuf 220" + c += chain_end + return c + elif which == "dmr": + c = chain_begin + c += "csdr fmdemod_quadri_cf | csdr fastdcblock_ff | csdr convert_f_s16" + c += " | rrc_filter | gfsk_demodulator | dmr_decoder --fifo {meta_pipe} | mbe_synthesizer" c += " | sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r 11025 -e signed-integer -b 16 -c 1 - | csdr setbuf 256" c += chain_end return c