summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2007-11-20 19:50:52 +0000
committerNils Wallménius <nils@rockbox.org>2007-11-20 19:50:52 +0000
commitacbd78023965cce0b0499ff150caf8078cb33b58 (patch)
tree5da45c3ae17f0ec27b5057910feec68ff35ec377 /apps/gui
parentade8ae9acbcaaf2a61fed00160f6c46aba052c16 (diff)
downloadrockbox-acbd78023965cce0b0499ff150caf8078cb33b58.zip
rockbox-acbd78023965cce0b0499ff150caf8078cb33b58.tar.gz
rockbox-acbd78023965cce0b0499ff150caf8078cb33b58.tar.bz2
rockbox-acbd78023965cce0b0499ff150caf8078cb33b58.tar.xz
Make id's created with the TALK_ID macro work in 64 bit sims
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15723 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/option_select.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index d36ed40..ec86de7 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -152,9 +152,9 @@ static int option_talk(int selected_item, void * data)
{
struct int_setting *info = setting->int_setting;
if (info->get_talk_id)
- talk_id(info->get_talk_id((int)temp_var), false);
+ talk_id(info->get_talk_id(temp_var), false);
else
- talk_value((int)temp_var, info->unit, false);
+ talk_value(temp_var, info->unit, false);
}
else if ((setting->flags & F_T_SOUND) == F_T_SOUND)
{
@@ -477,7 +477,7 @@ void set_option_formatter(char* buf, size_t size, int item, const char* unit)
const unsigned char *text = set_option_options[item].string;
snprintf(buf, size, "%s", P2STR(text));
}
-long set_option_get_talk_id(int value)
+int32_t set_option_get_talk_id(int value)
{
return set_option_options[value].voice_id;
}
@@ -518,7 +518,7 @@ bool set_int_ex(const unsigned char* string,
int min,
int max,
void (*formatter)(char*, size_t, int, const char*),
- long (*get_talk_id)(int))
+ int32_t (*get_talk_id)(int))
{
(void)unit;
struct settings_list item;