Merge pull request #2357 from srcejon/fix_2336

Fix audio modulators when channel sample rate is greater than audio sample rate
f4exb · Dec 10, 2024 · f4e2d10 · f4e2d10
2 parents d696dd6 + 6812659
commit f4e2d10
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 7 deletions.
diff --git a/plugins/channelrx/demodadsb/flags.qrc b/plugins/channelrx/demodadsb/flags.qrc
@@ -205,7 +205,7 @@
     <file>flags/kazakhstan_mil.bmp</file>
     <file>flags/kenya.bmp</file>
     <file>flags/kenya_mil.bmp</file>
-    <file>flags/khazakstan.bmp</file>
+    <file>flags/kazakhstan.bmp</file>
     <file>flags/kiribati.bmp</file>
     <file>flags/korea_north.bmp</file>
     <file>flags/korea_north_mil.bmp</file>

diff --git a/.../channelrx/demodadsb/flags/khazakstan.bmp → .../channelrx/demodadsb/flags/kazakhstan.bmp b/.../channelrx/demodadsb/flags/khazakstan.bmp → .../channelrx/demodadsb/flags/kazakhstan.bmp
diff --git a/plugins/channelrx/demodadsb/flags/regprefixmap.csv b/plugins/channelrx/demodadsb/flags/regprefixmap.csv
@@ -105,7 +105,7 @@ JA,japan
 ZJ,jersey
 JY,jordan
 5Y,kenya
-UP,khazakstan
+UP,kazakhstan
 T3,kiribati
 P,korea_north
 HL,korea-south

diff --git a/plugins/channelrx/demoddsc/coaststations.cpp b/plugins/channelrx/demoddsc/coaststations.cpp
diff --git a/plugins/channelrx/demoddsc/dscdemodgui.cpp b/plugins/channelrx/demoddsc/dscdemodgui.cpp
@@ -329,6 +329,9 @@ void DSCDemodGUI::messageReceived(const DSCMessage& message, int errors, float r
     if (CoastStations.contains(message.m_address)) {
         addressNameItem->setText(CoastStations.value(message.m_address));
     }
+    if (CoastStations.contains(message.m_selfId)) {
+        selfIdNameItem->setText(CoastStations.value(message.m_selfId));
+    }
 
     // Get latest APRS.fi data to calculate distance
     if (m_aprsFi && message.m_valid)

diff --git a/plugins/channeltx/modam/ammodsource.cpp b/plugins/channeltx/modam/ammodsource.cpp
@@ -128,7 +128,7 @@ void AMModSource::pullOne(Sample& sample)
 
 void AMModSource::prefetch(unsigned int nbSamples)
 {
-    auto nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
+    unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
     pullAudio(nbSamplesAudio);
 }
 

diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp
@@ -119,7 +119,7 @@ void NFMModSource::pullOne(Sample& sample)
 
 void NFMModSource::prefetch(unsigned int nbSamples)
 {
-    unsigned int nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
+    unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
     pullAudio(nbSamplesAudio);
 }
 

diff --git a/plugins/channeltx/modssb/ssbmodsource.cpp b/plugins/channeltx/modssb/ssbmodsource.cpp
@@ -131,7 +131,7 @@ void SSBModSource::pullOne(Sample& sample)
 
 void SSBModSource::prefetch(unsigned int nbSamples)
 {
-    unsigned int nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
+    unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
     pullAudio(nbSamplesAudio);
 }
 

diff --git a/plugins/channeltx/modwfm/wfmmodsource.cpp b/plugins/channeltx/modwfm/wfmmodsource.cpp
@@ -191,7 +191,7 @@ void WFMModSource::modulateAudio()
 
 void WFMModSource::prefetch(unsigned int nbSamples)
 {
-    unsigned int nbSamplesAudio = nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate);
+    unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate));
     pullAudio(nbSamplesAudio);
 }