diff --git a/src/libmncc/mncc_console.c b/src/libmncc/mncc_console.c index 912f339..cfe7979 100644 --- a/src/libmncc/mncc_console.c +++ b/src/libmncc/mncc_console.c @@ -445,7 +445,6 @@ void process_console(int c) /* handle audio, if sound device is used */ sample_t samples[console.latspl + 10], *samples_list[1]; uint8_t *power_list[1]; - double rf_level_db[1]; int count; int rc; @@ -469,7 +468,7 @@ void process_console(int c) } } samples_list[0] = samples; - count = sound_read(console.sound, samples_list, console.latspl, 1, rf_level_db); + count = sound_read(console.sound, samples_list, console.latspl, 1, NULL); if (count < 0) { PDEBUG(DSENDER, DEBUG_ERROR, "Failed to read from sound device (rc = %d)!\n", count); if (count == -EPIPE) diff --git a/src/libmobile/main_mobile.h b/src/libmobile/main_mobile.h index 4912057..e958f2c 100644 --- a/src/libmobile/main_mobile.h +++ b/src/libmobile/main_mobile.h @@ -42,5 +42,4 @@ void sighandler(int sigset); void main_mobile(int *quit, int latency, int interval, void (*myhandler)(void), const char *station_id, int station_id_digits); void dump_info(void); -void calibrate_bias(void); diff --git a/src/libsdr/sdr.h b/src/libsdr/sdr.h index 8d31475..aadc5d7 100644 --- a/src/libsdr/sdr.h +++ b/src/libsdr/sdr.h @@ -2,9 +2,10 @@ enum paging_signal; int sdr_start(void *inst); -void *sdr_open(const char *audiodev, double *tx_frequency, double *rx_frequency, int channels, double paging_frequency, int samplerate, int latspl, double bandwidth, double sample_deviation); +void *sdr_open(const char *audiodev, double *tx_frequency, double *rx_frequency, int channels, double paging_frequency, int samplerate, int latspl, double max_deviation, double max_modulation); void sdr_close(void *inst); int sdr_write(void *inst, sample_t **samples, uint8_t **power, int num, enum paging_signal *paging_signal, int *on, int channels); int sdr_read(void *inst, sample_t **samples, int num, int channels, double *rf_level_db); int sdr_get_tosend(void *inst, int latspl); +void calibrate_bias(void); diff --git a/src/libsound/sound.h b/src/libsound/sound.h index 71293c0..850832d 100644 --- a/src/libsound/sound.h +++ b/src/libsound/sound.h @@ -1,7 +1,7 @@ enum paging_signal; -void *sound_open(const char *audiodev, double *tx_frequency, double *rx_frequency, int channels, double paging_frequency, int samplerate, int latspl, double bandwidth, double sample_deviation); +void *sound_open(const char *audiodev, double *tx_frequency, double *rx_frequency, int channels, double paging_frequency, int samplerate, int latspl, double max_deviation, double max_modulation); int sound_start(void *inst); void sound_close(void *inst); int sound_write(void *inst, sample_t **samples, uint8_t **power, int num, enum paging_signal *paging_signal, int *on, int channels); diff --git a/src/libsound/sound_alsa.c b/src/libsound/sound_alsa.c index c62b7c9..f2f123e 100644 --- a/src/libsound/sound_alsa.c +++ b/src/libsound/sound_alsa.c @@ -431,7 +431,8 @@ int sound_read(void *inst, sample_t **samples, int num, int channels, double *rf if (!sender) continue; display_measurements_update(sound->dmp[i], log10((double)max[i] / 32768.0) * 20, 0.0); - rf_level_db[i] = 0.0; + if (rf_level_db) + rf_level_db[i] = 0.0; } return rc;