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

use synchronized setup; start dsp later

Browse Source
This commit is contained in:
Jakob Ketterl 2020-04-27 22:49:24 +02:00
parent 25a7bbd86a
commit f1dc9af651
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/openwebrx.js
View File

@ -1445,10 +1445,6 @@ function on_ws_opened() {
"type": "connectionproperties", "type": "connectionproperties",
"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;
@ -1530,7 +1526,7 @@ function onAudioStart(success, apiType){
divlog('Web Audio API succesfully initialized, using ' + apiType + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz"); divlog('Web Audio API succesfully initialized, using ' + apiType + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
// canvas_container is set after waterfall_init() has been called. we cannot initialize before. // canvas_container is set after waterfall_init() has been called. we cannot initialize before.
if (canvas_container) initialize_demodulator(); if (canvas_container) synchronize_demodulator_init();
//hide log panel in a second (if user has not hidden it yet) //hide log panel in a second (if user has not hidden it yet)
window.setTimeout(function () { window.setTimeout(function () {
@ -1544,7 +1540,7 @@ function onAudioStart(success, apiType){
var sync_params = {} var sync_params = {}
function synchronize_demodulator_init(params) { function synchronize_demodulator_init(params) {
sync_params = $.extend(sync_params, params); sync_params = $.extend(sync_params, params || {});
if (sync_params.initialParams && sync_params.modes && sync_params.features) { if (sync_params.initialParams && sync_params.modes && sync_params.features) {
initialize_demodulator(sync_params.initialParams); initialize_demodulator(sync_params.initialParams);
} }
@ -1561,6 +1557,10 @@ function initialize_demodulator(initialParams) {
if (params.offset_frequency) { if (params.offset_frequency) {
demodulators[0].set_offset_frequency(params.offset_frequency); demodulators[0].set_offset_frequency(params.offset_frequency);
} }
ws.send(JSON.stringify({
"type": "dspcontrol",
"action": "start"
}));
} }
var reconnect_timeout = false; var reconnect_timeout = false;
@ -1804,7 +1804,7 @@ function openwebrx_init() {
bookmarks = new BookmarkBar(); bookmarks = new BookmarkBar();
initSliders(); initSliders();
window.addEventListener('hashchange', function() { window.addEventListener('hashchange', function() {
initialize_demodulator(); synchronize_demodulator_init();
}); });
} }