radio95/fm95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/fm95.git synced 2026-02-26 19:23:51 +01:00
Code Issues Activity

allow rds if when no stereo

Browse Source
This commit is contained in:
KubaPro010
2025-03-11 17:41:33 +01:00
parent b3303abded
commit 83131c1f30
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/.server-controller-port.log vendored
View File

@@ -1,5 +1,5 @@
{ {
"port": 13452, "port": 13452,
"time": 1741636077079, "time": 1741711059608,
"version": "0.0.3" "version": "0.0.3"
} }

31
src/fm95.c
View File

@@ -20,6 +20,10 @@
#include "../lib/fm_modulator.h" #include "../lib/fm_modulator.h"
#define SAMPLE_RATE 192000 #define SAMPLE_RATE 192000
#if SAMPLE_RATE*2 < 60000
#warning Sample rate too low for RDS
#define DISABLE_RDS
#endif
#define INPUT_DEVICE "FM_Audio.monitor" #define INPUT_DEVICE "FM_Audio.monitor"
#define OUTPUT_DEVICE "alsa_output.platform-soc_sound.stereo-fallback" #define OUTPUT_DEVICE "alsa_output.platform-soc_sound.stereo-fallback"
@@ -173,7 +177,7 @@ int main(int argc, char **argv) {
{"calibrate", no_argument, NULL, 'V'}, {"calibrate", no_argument, NULL, 'V'},
{"master_vol", required_argument, NULL, 'A'}, {"master_vol", required_argument, NULL, 'A'},
{"audio_vol", required_argument, NULL, 'v'}, {"audio_vol", required_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -415,7 +419,7 @@ int main(int argc, char **argv) {
signal(SIGINT, stop); signal(SIGINT, stop);
signal(SIGTERM, stop); signal(SIGTERM, stop);
int pulse_error; int pulse_error;
float audio_stereo_input[BUFFER_SIZE*2]; // Input from device, interleaved stereo float audio_stereo_input[BUFFER_SIZE*2]; // Input from device, interleaved stereo
@@ -467,13 +471,10 @@ int main(int argc, char **argv) {
float mono = (ready_l + ready_r) / 2.0f; // Stereo to Mono float mono = (ready_l + ready_r) / 2.0f; // Stereo to Mono
output[i] = mono*MONO_VOLUME; output[i] = mono*MONO_VOLUME;
if(stereo == 1) { if(stereo) {
float stereo = (ready_l - ready_r) / 2.0f; // Also Stereo to Mono but a bit diffrent float stereo = (ready_l - ready_r) / 2.0f; // Also Stereo to Mono but a bit diffrent
float stereo_carrier = get_oscillator_sin_multiplier_ni(&osc, polar_stereo ? 1 : 2); float stereo_carrier = get_oscillator_sin_multiplier_ni(&osc, polar_stereo ? 1 : 2);
if(rds_on && polar_stereo == 0) {
float rds_carrier = get_oscillator_cos_multiplier_ni(&osc, 3);
output[i] += (current_rds_in*rds_carrier)*RDS_VOLUME;
}
if(polar_stereo) { if(polar_stereo) {
output[i] += ((stereo+0.2)*stereo_carrier)*STEREO_VOLUME; output[i] += ((stereo+0.2)*stereo_carrier)*STEREO_VOLUME;
} else { } else {
@@ -481,8 +482,18 @@ int main(int argc, char **argv) {
output[i] += pilot*PILOT_VOLUME + output[i] += pilot*PILOT_VOLUME +
(stereo*stereo_carrier)*STEREO_VOLUME; (stereo*stereo_carrier)*STEREO_VOLUME;
} }
advance_oscillator(&osc);
} }
#ifndef DISABLE_RDS
if(rds_on && polar_stereo == 0) {
float rds_carrier = get_oscillator_cos_multiplier_ni(&osc, 3);
output[i] += (current_rds_in*rds_carrier)*RDS_VOLUME;
}
#endif
#ifndef DISABLE_RDS
if(rds_on || stereo) advance_oscillator(&osc);
#else
if(stereo) advance_oscillator(&osc);
#endif
if(mpx_on) output[i] += hard_clip(current_mpx_in, MPX_CLIPPER_THRESHOLD)*MPX_VOLUME; if(mpx_on) output[i] += hard_clip(current_mpx_in, MPX_CLIPPER_THRESHOLD)*MPX_VOLUME;
if(sca_on) output[i] += modulate_fm(&sca_mod, hard_clip(current_sca_in, sca_clipper_threshold))*SCA_VOLUME; if(sca_on) output[i] += modulate_fm(&sca_mod, hard_clip(current_sca_in, sca_clipper_threshold))*SCA_VOLUME;
output[i] *= master_volume; output[i] *= master_volume;