diff options
| author | Nils Wallménius <nils@rockbox.org> | 2011-06-26 14:42:24 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2011-06-26 14:42:24 +0000 |
| commit | af8122b1cb6ffd23b610c5e26ae40b125f67bfd6 (patch) | |
| tree | 7d80287874b23efc6428e9ab9467a08290293332 /apps/radio | |
| parent | 737f3fed0d8be60960f23e9c6636b5dc2c5f7999 (diff) | |
| download | rockbox-af8122b1cb6ffd23b610c5e26ae40b125f67bfd6.tar.gz rockbox-af8122b1cb6ffd23b610c5e26ae40b125f67bfd6.zip | |
Reuse a general voice function instead of reinventing the wheel.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30080 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/radio')
| -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 */ extern int radio_mode; int snap_freq_to_grid(int freq); void remember_frequency(void); -void talk_freq(int freq, bool enqueue); #define MAX_PRESETS 64 static bool presets_loaded = false; @@ -178,11 +177,10 @@ void preset_talk(int preset, bool fallback, bool enqueue) if(presets[preset].name[0]) talk_spell(presets[preset].name, enqueue); else if(fallback) - talk_freq(presets[preset].frequency, enqueue); + talk_value_decimal(presets[preset].frequency, UNIT_INT, 6, enqueue); } } - void radio_save_presets(void) { 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) search_dir = 0; } -/* Speak a frequency. */ -void talk_freq(int freq, bool enqueue) -{ - freq /= 10000; - talk_number(freq / 100, enqueue); - talk_id(LANG_POINT, true); - talk_number(freq % 100 / 10, true); - if (freq % 10) - talk_number(freq % 10, true); -} - - void radio_screen(void) { bool done = false; @@ -798,7 +786,7 @@ void radio_screen(void) bool enqueue = false; if (radio_mode == RADIO_SCAN_MODE) { - talk_freq(curr_freq, enqueue); + talk_value_decimal(curr_freq, UNIT_INT, 6, enqueue); enqueue = true; } if (radio_current_preset() >= 0) |