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

Merge branch 'develop' into rf103

Browse Source
This commit is contained in:
Jakob Ketterl 2020-11-04 22:45:46 +01:00
commit 3b229b95b6
4 changed files with 5 additions and 1001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/lib/AudioEngine.js
View File

@ -193,6 +193,7 @@ AudioEngine.prototype.resetStats = function() {
}; };
AudioEngine.prototype.setupResampling = function() { //both at the server and the client AudioEngine.prototype.setupResampling = function() { //both at the server and the client
var targetRate = this.audioContext.sampleRate;
var audio_params = this.findRate(8000, 12000); var audio_params = this.findRate(8000, 12000);
if (!audio_params) { if (!audio_params) {
this.resamplingFactor = 0; this.resamplingFactor = 0;

1000
htdocs/lib/jquery.nanoscroller.js
View File

File diff suppressed because it is too large Load Diff

3
htdocs/lib/jquery.nanoscroller.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
owrx/controllers/assets.py
View File

@ -116,7 +116,7 @@ class CompiledAssetsController(GzipMixin, ModificationAwareController):
"lib/chroma.min.js", "lib/chroma.min.js",
"openwebrx.js", "openwebrx.js",
"lib/jquery-3.2.1.min.js", "lib/jquery-3.2.1.min.js",
"lib/jquery.nanoscroller.js", "lib/jquery.nanoscroller.min.js",
"lib/Header.js", "lib/Header.js",
"lib/Demodulator.js", "lib/Demodulator.js",
"lib/DemodulatorPanel.js", "lib/DemodulatorPanel.js",