summaryrefslogtreecommitdiff
path: root/apps/radio/radio.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2011-06-26 14:42:24 +0000
committerNils Wallménius <nils@rockbox.org>2011-06-26 14:42:24 +0000
commitaf8122b1cb6ffd23b610c5e26ae40b125f67bfd6 (patch)
tree7d80287874b23efc6428e9ab9467a08290293332 /apps/radio/radio.c
parent737f3fed0d8be60960f23e9c6636b5dc2c5f7999 (diff)
downloadrockbox-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/radio.c')
-rw-r--r--apps/radio/radio.c14
1 files changed, 1 insertions, 13 deletions
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. */
368void 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
379void radio_screen(void) 367void 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)