len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reuse a general voice function instead of reinventing the wheel.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30080 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2011-06-26 14:42:24 +00:00
parent 737f3fed0d
commit af8122b1cb
2 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/radio/presets.c
View file

@ -49,7 +49,6 @@ extern int curr_freq; /* from radio.c.. naughty but meh */
extern int radio_mode; extern int radio_mode;
int snap_freq_to_grid(int freq); int snap_freq_to_grid(int freq);
void remember_frequency(void); void remember_frequency(void);
void talk_freq(int freq, bool enqueue);
#define MAX_PRESETS 64 #define MAX_PRESETS 64
static bool presets_loaded = false; static bool presets_loaded = false;
@ -178,11 +177,10 @@ void preset_talk(int preset, bool fallback, bool enqueue)
if(presets[preset].name[0]) if(presets[preset].name[0])
talk_spell(presets[preset].name, enqueue); talk_spell(presets[preset].name, enqueue);
else if(fallback) else if(fallback)
talk_freq(presets[preset].frequency, enqueue); talk_value_decimal(presets[preset].frequency, UNIT_INT, 6, enqueue);
} }
} }
void radio_save_presets(void) void radio_save_presets(void)
{ {
int fd; int fd;

14
apps/radio/radio.c
View file

@ -364,18 +364,6 @@ static void end_search(void)
search_dir = 0; 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) void radio_screen(void)
{ {
bool done = false; bool done = false;
@ -798,7 +786,7 @@ void radio_screen(void)
bool enqueue = false; bool enqueue = false;
if (radio_mode == RADIO_SCAN_MODE) if (radio_mode == RADIO_SCAN_MODE)
{ {
talk_freq(curr_freq, enqueue); talk_value_decimal(curr_freq, UNIT_INT, 6, enqueue);
enqueue = true; enqueue = true;
} }
if (radio_current_preset() >= 0) if (radio_current_preset() >= 0)