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

keep the output_rate on sdr change

Browse Source
This commit is contained in:
Jakob Ketterl 2019-11-26 20:10:26 +01:00
parent b774e75f2c
commit fe39c2712d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/openwebrx.js
View File

@ -1419,10 +1419,13 @@ function on_ws_opened() {
} }
reconnect_timeout = false; reconnect_timeout = false;
ws.send(JSON.stringify({ ws.send(JSON.stringify({
"type": "dspcontrol", "type": "connectionproperties",
"action": "start",
"params": {"output_rate": audioEngine.getOutputRate()} "params": {"output_rate": audioEngine.getOutputRate()}
})); }));
ws.send(JSON.stringify({
"type": "dspcontrol",
"action": "start"
}));
} }
var was_error = 0; var was_error = 0;

15
owrx/connection.py
View File

@ -79,6 +79,7 @@ class OpenWebRxReceiverClient(Client):
self.dsp = None self.dsp = None
self.sdr = None self.sdr = None
self.configSub = None self.configSub = None
self.connectionProperties = {}
ClientRegistry.getSharedInstance().addClient(self) ClientRegistry.getSharedInstance().addClient(self)
@ -123,17 +124,23 @@ class OpenWebRxReceiverClient(Client):
params = message["params"] params = message["params"]
self.setDspProperties(params) self.setDspProperties(params)
if message["type"] == "config": elif message["type"] == "config":
if "params" in message: if "params" in message:
self.setParams(message["params"]) self.setParams(message["params"])
if message["type"] == "setsdr": elif message["type"] == "setsdr":
if "params" in message: if "params" in message:
self.setSdr(message["params"]["sdr"]) self.setSdr(message["params"]["sdr"])
if message["type"] == "selectprofile": elif message["type"] == "selectprofile":
if "params" in message and "profile" in message["params"]: if "params" in message and "profile" in message["params"]:
profile = message["params"]["profile"].split("|") profile = message["params"]["profile"].split("|")
self.setSdr(profile[0]) self.setSdr(profile[0])
self.sdr.activateProfile(profile[1]) self.sdr.activateProfile(profile[1])
elif message["type"] == "connectionproperties":
if "params" in message:
self.connectionProperties = message["params"]
if self.dsp:
self.setDspProperties(self.connectionProperties)
else: else:
logger.warning("received message without type: {0}".format(message)) logger.warning("received message without type: {0}".format(message))
@ -161,6 +168,8 @@ class OpenWebRxReceiverClient(Client):
self.startDsp() self.startDsp()
# send initial config # send initial config
self.setDspProperties(self.connectionProperties)
configProps = ( configProps = (
self.sdr.getProps() self.sdr.getProps()
.collect(*OpenWebRxReceiverClient.config_keys) .collect(*OpenWebRxReceiverClient.config_keys)