diff options
Diffstat (limited to 'apps/gui/splash.c')
-rw-r--r-- | apps/gui/splash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index c690777cc6..df0446e62d 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "lang.h" | 25 | #include "lang.h" |
26 | #include "settings.h" | 26 | #include "settings.h" |
27 | #include "talk.h" | 27 | #include "talk.h" |
28 | #include "splash.h" | ||
28 | 29 | ||
29 | #ifndef MAX | 30 | #ifndef MAX |
30 | #define MAX(a, b) (((a)>(b))?(a):(b)) | 31 | #define MAX(a, b) (((a)>(b))?(a):(b)) |
@@ -185,7 +186,7 @@ static void splash(struct screen * screen, const char *fmt, va_list ap) | |||
185 | } | 186 | } |
186 | 187 | ||
187 | void gui_splash(struct screen * screen, int ticks, | 188 | void gui_splash(struct screen * screen, int ticks, |
188 | const unsigned char *fmt, ...) | 189 | const char *fmt, ...) |
189 | { | 190 | { |
190 | va_list ap; | 191 | va_list ap; |
191 | va_start( ap, fmt ); | 192 | va_start( ap, fmt ); |
@@ -196,21 +197,21 @@ void gui_splash(struct screen * screen, int ticks, | |||
196 | sleep(ticks); | 197 | sleep(ticks); |
197 | } | 198 | } |
198 | 199 | ||
199 | void gui_syncsplash(int ticks, const unsigned char *fmt, ...) | 200 | void gui_syncsplash(int ticks, const char *fmt, ...) |
200 | { | 201 | { |
201 | va_list ap; | 202 | va_list ap; |
202 | int i; | 203 | int i; |
203 | #if !defined(SIMULATOR) || CONFIG_CODEC == SWCODEC | 204 | #if !defined(SIMULATOR) || CONFIG_CODEC == SWCODEC |
204 | long id; | 205 | long id; |
205 | /* fmt may be a so called virtual pointer. See settings.h. */ | 206 | /* fmt may be a so called virtual pointer. See settings.h. */ |
206 | if((id = P2ID(fmt)) >= 0) | 207 | if((id = P2ID((unsigned char *)fmt)) >= 0) |
207 | /* If fmt specifies a voicefont ID, and voice menus are | 208 | /* If fmt specifies a voicefont ID, and voice menus are |
208 | enabled, then speak it. */ | 209 | enabled, then speak it. */ |
209 | cond_talk_ids_fq(id); | 210 | cond_talk_ids_fq(id); |
210 | #endif | 211 | #endif |
211 | /* If fmt is a lang ID then get the corresponding string (which | 212 | /* If fmt is a lang ID then get the corresponding string (which |
212 | still might contain % place holders). */ | 213 | still might contain % place holders). */ |
213 | fmt = P2STR(fmt); | 214 | fmt = P2STR((unsigned char *)fmt); |
214 | va_start( ap, fmt ); | 215 | va_start( ap, fmt ); |
215 | FOR_NB_SCREENS(i) | 216 | FOR_NB_SCREENS(i) |
216 | splash(&(screens[i]), fmt, ap); | 217 | splash(&(screens[i]), fmt, ap); |