diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/radio/presets.c | 4 | ||||
-rw-r--r-- | apps/radio/radio.c | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/apps/radio/presets.c b/apps/radio/presets.c index 9c6fedecc7..77b13f2ed7 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c | |||
@@ -49,7 +49,6 @@ extern int curr_freq; /* from radio.c.. naughty but meh */ | |||
49 | extern int radio_mode; | 49 | extern int radio_mode; |
50 | int snap_freq_to_grid(int freq); | 50 | int snap_freq_to_grid(int freq); |
51 | void remember_frequency(void); | 51 | void remember_frequency(void); |
52 | void talk_freq(int freq, bool enqueue); | ||
53 | 52 | ||
54 | #define MAX_PRESETS 64 | 53 | #define MAX_PRESETS 64 |
55 | static bool presets_loaded = false; | 54 | static bool presets_loaded = false; |
@@ -178,11 +177,10 @@ void preset_talk(int preset, bool fallback, bool enqueue) | |||
178 | if(presets[preset].name[0]) | 177 | if(presets[preset].name[0]) |
179 | talk_spell(presets[preset].name, enqueue); | 178 | talk_spell(presets[preset].name, enqueue); |
180 | else if(fallback) | 179 | else if(fallback) |
181 | talk_freq(presets[preset].frequency, enqueue); | 180 | talk_value_decimal(presets[preset].frequency, UNIT_INT, 6, enqueue); |
182 | } | 181 | } |
183 | } | 182 | } |
184 | 183 | ||
185 | |||
186 | void radio_save_presets(void) | 184 | void radio_save_presets(void) |
187 | { | 185 | { |
188 | int fd; | 186 | int fd; |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index 4da37b2ca5..e4b14c843e 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -364,18 +364,6 @@ static void end_search(void) | |||
364 | search_dir = 0; | 364 | search_dir = 0; |
365 | } | 365 | } |
366 | 366 | ||
367 | /* Speak a frequency. */ | ||
368 | void talk_freq(int freq, bool enqueue) | ||
369 | { | ||
370 | freq /= 10000; | ||
371 | talk_number(freq / 100, enqueue); | ||
372 | talk_id(LANG_POINT, true); | ||
373 | talk_number(freq % 100 / 10, true); | ||
374 | if (freq % 10) | ||
375 | talk_number(freq % 10, true); | ||
376 | } | ||
377 | |||
378 | |||
379 | void radio_screen(void) | 367 | void radio_screen(void) |
380 | { | 368 | { |
381 | bool done = false; | 369 | bool done = false; |
@@ -798,7 +786,7 @@ void radio_screen(void) | |||
798 | bool enqueue = false; | 786 | bool enqueue = false; |
799 | if (radio_mode == RADIO_SCAN_MODE) | 787 | if (radio_mode == RADIO_SCAN_MODE) |
800 | { | 788 | { |
801 | talk_freq(curr_freq, enqueue); | 789 | talk_value_decimal(curr_freq, UNIT_INT, 6, enqueue); |
802 | enqueue = true; | 790 | enqueue = true; |
803 | } | 791 | } |
804 | if (radio_current_preset() >= 0) | 792 | if (radio_current_preset() >= 0) |