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

strip newlines from metadata

Browse Source
This commit is contained in:
Jakob Ketterl 2016-11-15 19:20:18 +00:00
parent 6d5a7ffefc
commit aa959cdc93
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openwebrx.py
View File

@ -507,7 +507,7 @@ class WebRXHandler(BaseHTTPRequestHandler):
myclient.loopstat=35 myclient.loopstat=35
metadata = dsp.get_metadata(); metadata = dsp.get_metadata();
if metadata == None: break if metadata == None: break
rxws.send(self, "MET {0}".format(metadata)) rxws.send(self, "MET {0}".format(metadata.rstrip("\n")))
except: except:
break break

13
plugins/dsp/csdr/plugin.py
View File

@ -73,16 +73,21 @@ class dsp_plugin:
if self.audio_compression=="adpcm": if self.audio_compression=="adpcm":
chain_end = " | csdr encode_ima_adpcm_i16_u8" 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 == "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 = chain_begin
c += "csdr fmdemod_quadri_cf | csdr convert_f_s16" c += "csdr fmdemod_quadri_cf | csdr convert_f_s16"
if which == "dmr": if which == "dstar":
c += " | dsd -mg -fr"
elif which == "dstar":
c += " | dsd -fd" c += " | dsd -fd"
elif which == "nxdn": elif which == "nxdn":
c += " | dsd -fi" c += " | dsd -fi"
c += " -i - -o - -u 2 -g 10" 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 += " | 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 c += chain_end
return c return c