diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-12-02 08:08:54 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-12-02 08:08:54 +0000 |
commit | 72f423570f4c57b77b858fe035af08ae18238028 (patch) | |
tree | ffee6968e9e4113be718b6f67b930d05840f4baf /apps/plugins | |
parent | 1e4d1f8de7a523d34c064f7f4a6e7f001d55bb7f (diff) | |
download | rockbox-72f423570f4c57b77b858fe035af08ae18238028.tar.gz rockbox-72f423570f4c57b77b858fe035af08ae18238028.zip |
numerous gcc4 (un)signed warnings killed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8121 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bounce.c | 14 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 35 | ||||
-rw-r--r-- | apps/plugins/credits.c | 7 | ||||
-rw-r--r-- | apps/plugins/pong.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/main.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 2 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 14 | ||||
-rw-r--r-- | apps/plugins/wav2wv.c | 12 |
8 files changed, 47 insertions, 45 deletions
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 1bf8b3b34d..3a44a4cc46 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -325,7 +325,7 @@ static int scrollit(void) | |||
325 | #if LCD_DEPTH > 1 | 325 | #if LCD_DEPTH > 1 |
326 | rb->lcd_set_foreground(face_colors[ letter % 3] ); | 326 | rb->lcd_set_foreground(face_colors[ letter % 3] ); |
327 | #endif | 327 | #endif |
328 | rb->lcd_mono_bitmap((char *)char_gen_12x16[letter-0x20], | 328 | rb->lcd_mono_bitmap(char_gen_12x16[letter-0x20], |
329 | xx, table[yy&(TABLE_SIZE-1)], 11, 16); | 329 | xx, table[yy&(TABLE_SIZE-1)], 11, 16); |
330 | yy += YADD; | 330 | yy += YADD; |
331 | xx+= DRAW_WIDTH/LETTERS_ON_SCREEN; | 331 | xx+= DRAW_WIDTH/LETTERS_ON_SCREEN; |
@@ -407,13 +407,13 @@ static int loopit(void) | |||
407 | } | 407 | } |
408 | rb->snprintf(buffer, 30, "%s: %d", | 408 | rb->snprintf(buffer, 30, "%s: %d", |
409 | values[show].what, values[show].num); | 409 | values[show].what, values[show].num); |
410 | rb->lcd_putsxy(0, LCD_HEIGHT - 8, buffer); | 410 | rb->lcd_putsxy(0, LCD_HEIGHT - 8, (unsigned char *)buffer); |
411 | timeout--; | 411 | timeout--; |
412 | } | 412 | } |
413 | for(i=0, yy=y, xx=x; | 413 | for(i=0, yy=y, xx=x; |
414 | i<rocklen; | 414 | i<rocklen; |
415 | i++, yy+=values[NUM_YDIST].num, xx+=values[NUM_XDIST].num) | 415 | i++, yy+=values[NUM_YDIST].num, xx+=values[NUM_XDIST].num) |
416 | rb->lcd_mono_bitmap((char *)char_gen_12x16[rock[i]-0x20], | 416 | rb->lcd_mono_bitmap(char_gen_12x16[rock[i]-0x20], |
417 | xtable[xx&(TABLE_SIZE-1)], | 417 | xtable[xx&(TABLE_SIZE-1)], |
418 | table[yy&(TABLE_SIZE-1)], 11, 16); | 418 | table[yy&(TABLE_SIZE-1)], 11, 16); |
419 | rb->lcd_update(); | 419 | rb->lcd_update(); |
@@ -436,7 +436,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
436 | 436 | ||
437 | len = rb->strlen(SS_TITLE); | 437 | len = rb->strlen(SS_TITLE); |
438 | rb->lcd_setfont(FONT_SYSFIXED); | 438 | rb->lcd_setfont(FONT_SYSFIXED); |
439 | rb->lcd_getstringsize(SS_TITLE,&w, &h); | 439 | rb->lcd_getstringsize((unsigned char *)SS_TITLE, &w, &h); |
440 | 440 | ||
441 | /* Get horizontel centering for text */ | 441 | /* Get horizontel centering for text */ |
442 | len *= w; | 442 | len *= w; |
@@ -451,10 +451,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
451 | h /= 2; | 451 | h /= 2; |
452 | 452 | ||
453 | rb->lcd_clear_display(); | 453 | rb->lcd_clear_display(); |
454 | rb->lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE); | 454 | rb->lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, (unsigned char *)SS_TITLE); |
455 | 455 | ||
456 | len = 1; | 456 | len = 1; |
457 | rb->lcd_getstringsize(off, &w, &h); | 457 | rb->lcd_getstringsize((unsigned char *)off, &w, &h); |
458 | 458 | ||
459 | /* Get horizontel centering for text */ | 459 | /* Get horizontel centering for text */ |
460 | len *= w; | 460 | len *= w; |
@@ -468,7 +468,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
468 | else | 468 | else |
469 | h /= 2; | 469 | h /= 2; |
470 | 470 | ||
471 | rb->lcd_putsxy(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), off); | 471 | rb->lcd_putsxy(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), (unsigned char *)off); |
472 | rb->lcd_update(); | 472 | rb->lcd_update(); |
473 | rb->sleep(HZ); | 473 | rb->sleep(HZ); |
474 | rb->lcd_set_drawmode(DRMODE_FG); | 474 | rb->lcd_set_drawmode(DRMODE_FG); |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index d81b71ee44..0f5c03d71d 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -103,7 +103,7 @@ static int chessclock_set_int(char* string, | |||
103 | #define FLAGS_SET_INT_SECONDS 1 | 103 | #define FLAGS_SET_INT_SECONDS 1 |
104 | 104 | ||
105 | static char * show_time(int secs); | 105 | static char * show_time(int secs); |
106 | static int simple_menu(int nr, char **strarr); | 106 | static int simple_menu(int nr, unsigned char **strarr); |
107 | 107 | ||
108 | static bool pause; | 108 | static bool pause; |
109 | 109 | ||
@@ -215,7 +215,7 @@ static void show_pause_mode(bool enabled) | |||
215 | static const char pause_icon[] = {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}; | 215 | static const char pause_icon[] = {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}; |
216 | 216 | ||
217 | if (enabled) | 217 | if (enabled) |
218 | rb->lcd_mono_bitmap(pause_icon, 52, 0, 7, 8); | 218 | rb->lcd_mono_bitmap((unsigned char *)pause_icon, 52, 0, 7, 8); |
219 | else | 219 | else |
220 | { | 220 | { |
221 | rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 221 | rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
@@ -253,7 +253,7 @@ static int run_timer(int nr) | |||
253 | round_time=true; | 253 | round_time=true; |
254 | } | 254 | } |
255 | rb->snprintf(player_info, sizeof(player_info), "Player %d", nr+1); | 255 | rb->snprintf(player_info, sizeof(player_info), "Player %d", nr+1); |
256 | rb->lcd_puts(0, FIRST_LINE, player_info); | 256 | rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info); |
257 | last_tick=*rb->current_tick; | 257 | last_tick=*rb->current_tick; |
258 | 258 | ||
259 | while (!done) { | 259 | while (!done) { |
@@ -261,9 +261,9 @@ static int run_timer(int nr) | |||
261 | long now; | 261 | long now; |
262 | if (ticks>max_ticks) { | 262 | if (ticks>max_ticks) { |
263 | if (round_time) | 263 | if (round_time) |
264 | rb->lcd_puts(0, FIRST_LINE+1, "ROUND UP!"); | 264 | rb->lcd_puts(0, FIRST_LINE+1, (unsigned char *)"ROUND UP!"); |
265 | else | 265 | else |
266 | rb->lcd_puts(0, FIRST_LINE+1, "TIME OUT!"); | 266 | rb->lcd_puts(0, FIRST_LINE+1, (unsigned char *)"TIME OUT!"); |
267 | rb->backlight_on(); | 267 | rb->backlight_on(); |
268 | } else { | 268 | } else { |
269 | /* | 269 | /* |
@@ -273,7 +273,7 @@ static int run_timer(int nr) | |||
273 | rb->lcd_puts(0, FIRST_LINE, player_info); | 273 | rb->lcd_puts(0, FIRST_LINE, player_info); |
274 | } | 274 | } |
275 | */ | 275 | */ |
276 | rb->lcd_puts(0, FIRST_LINE, player_info); | 276 | rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info); |
277 | now=*rb->current_tick; | 277 | now=*rb->current_tick; |
278 | if (!pause) { | 278 | if (!pause) { |
279 | ticks+=now-last_tick; | 279 | ticks+=now-last_tick; |
@@ -291,9 +291,10 @@ static int run_timer(int nr) | |||
291 | show_time((timer_holder[nr].total_time*HZ- | 291 | show_time((timer_holder[nr].total_time*HZ- |
292 | timer_holder[nr].used_time- | 292 | timer_holder[nr].used_time- |
293 | ticks+HZ-1)/HZ)); | 293 | ticks+HZ-1)/HZ)); |
294 | rb->lcd_puts(0, FIRST_LINE+1, buf); | 294 | rb->lcd_puts(0, FIRST_LINE+1, (unsigned char *)buf); |
295 | } else { | 295 | } else { |
296 | rb->lcd_puts(0, FIRST_LINE+1, show_time((max_ticks-ticks+HZ-1)/HZ)); | 296 | rb->lcd_puts(0, FIRST_LINE+1, |
297 | (unsigned char *)show_time((max_ticks-ticks+HZ-1)/HZ)); | ||
297 | } | 298 | } |
298 | } | 299 | } |
299 | #ifdef HAVE_LCD_BITMAP | 300 | #ifdef HAVE_LCD_BITMAP |
@@ -326,7 +327,7 @@ static int run_timer(int nr) | |||
326 | int ret; | 327 | int ret; |
327 | char *menu[]={"Delete player", "Restart round", | 328 | char *menu[]={"Delete player", "Restart round", |
328 | "Set round time", "Set total time"}; | 329 | "Set round time", "Set total time"}; |
329 | ret=simple_menu(4, menu); | 330 | ret=simple_menu(4, (unsigned char **)menu); |
330 | if (ret==-1) { | 331 | if (ret==-1) { |
331 | retval = 3; | 332 | retval = 3; |
332 | done=true; | 333 | done=true; |
@@ -401,17 +402,17 @@ static int run_timer(int nr) | |||
401 | } | 402 | } |
402 | 403 | ||
403 | static int chessclock_set_int(char* string, | 404 | static int chessclock_set_int(char* string, |
404 | int* variable, | 405 | int* variable, |
405 | int step, | 406 | int step, |
406 | int min, | 407 | int min, |
407 | int max, | 408 | int max, |
408 | int flags) | 409 | int flags) |
409 | { | 410 | { |
410 | bool done = false; | 411 | bool done = false; |
411 | int button; | 412 | int button; |
412 | 413 | ||
413 | rb->lcd_clear_display(); | 414 | rb->lcd_clear_display(); |
414 | rb->lcd_puts_scroll(0, FIRST_LINE, string); | 415 | rb->lcd_puts_scroll(0, FIRST_LINE, (unsigned char *)string); |
415 | 416 | ||
416 | while (!done) { | 417 | while (!done) { |
417 | char str[32]; | 418 | char str[32]; |
@@ -419,7 +420,7 @@ static int chessclock_set_int(char* string, | |||
419 | rb->snprintf(str, sizeof str,"%s (m:s)", show_time(*variable)); | 420 | rb->snprintf(str, sizeof str,"%s (m:s)", show_time(*variable)); |
420 | else | 421 | else |
421 | rb->snprintf(str, sizeof str,"%d", *variable); | 422 | rb->snprintf(str, sizeof str,"%d", *variable); |
422 | rb->lcd_puts(0, FIRST_LINE+1, str); | 423 | rb->lcd_puts(0, FIRST_LINE+1, (unsigned char *)str); |
423 | #ifdef HAVE_LCD_BITMAP | 424 | #ifdef HAVE_LCD_BITMAP |
424 | rb->lcd_update(); | 425 | rb->lcd_update(); |
425 | #endif | 426 | #endif |
@@ -477,7 +478,7 @@ static char * show_time(int seconds) | |||
477 | /* -1 = USB | 478 | /* -1 = USB |
478 | -2 = cancel | 479 | -2 = cancel |
479 | */ | 480 | */ |
480 | static int simple_menu(int nr, char **strarr) | 481 | static int simple_menu(int nr, unsigned char **strarr) |
481 | { | 482 | { |
482 | int show=0; | 483 | int show=0; |
483 | int button; | 484 | int button; |
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index 629576d068..1b1aadbb46 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c | |||
@@ -132,18 +132,19 @@ void roll_credits(void) | |||
132 | 132 | ||
133 | rb->lcd_setfont(FONT_UI); | 133 | rb->lcd_setfont(FONT_UI); |
134 | 134 | ||
135 | rb->lcd_getstringsize("A", &width, &height); | 135 | rb->lcd_getstringsize((unsigned char *)"A", &width, &height); |
136 | 136 | ||
137 | while(1) { | 137 | while(1) { |
138 | rb->lcd_clear_display(); | 138 | rb->lcd_clear_display(); |
139 | for ( i=0; i <= (LCD_HEIGHT-y)/height; i++ ) | 139 | for ( i=0; i <= (LCD_HEIGHT-y)/height; i++ ) |
140 | rb->lcd_putsxy(0, i*height+y, line+i<numnames?credits[line+i]:""); | 140 | rb->lcd_putsxy(0, i*height+y, |
141 | (unsigned char *)(line+i<numnames?credits[line+i]:"")); | ||
141 | rb->snprintf(buffer, sizeof(buffer), " [Credits] %2d/%2d ", | 142 | rb->snprintf(buffer, sizeof(buffer), " [Credits] %2d/%2d ", |
142 | line+1, numnames); | 143 | line+1, numnames); |
143 | rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 144 | rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
144 | rb->lcd_fillrect(0, 0, LCD_WIDTH, height); | 145 | rb->lcd_fillrect(0, 0, LCD_WIDTH, height); |
145 | rb->lcd_set_drawmode(DRMODE_SOLID); | 146 | rb->lcd_set_drawmode(DRMODE_SOLID); |
146 | rb->lcd_putsxy(0, 0, buffer); | 147 | rb->lcd_putsxy(0, 0, (unsigned char *)buffer); |
147 | rb->lcd_update(); | 148 | rb->lcd_update(); |
148 | 149 | ||
149 | if (rb->button_get_w_tmo(HZ/20) & BUTTON_REL) | 150 | if (rb->button_get_w_tmo(HZ/20) & BUTTON_REL) |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 34aea07441..21bf6064e6 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -301,8 +301,8 @@ void showscore(struct pong *p) | |||
301 | int w; | 301 | int w; |
302 | 302 | ||
303 | rb->snprintf(buffer, sizeof(buffer), "%d - %d", p->score[0], p->score[1]); | 303 | rb->snprintf(buffer, sizeof(buffer), "%d - %d", p->score[0], p->score[1]); |
304 | w = rb->lcd_getstringsize(buffer, NULL, NULL); | 304 | w = rb->lcd_getstringsize((unsigned char *)buffer, NULL, NULL); |
305 | rb->lcd_putsxy( (LCD_WIDTH / 2) - (w / 2), 0, buffer); | 305 | rb->lcd_putsxy( (LCD_WIDTH / 2) - (w / 2), 0, (unsigned char *)buffer); |
306 | } | 306 | } |
307 | 307 | ||
308 | /* this is the plugin entry point */ | 308 | /* this is the plugin entry point */ |
diff --git a/apps/plugins/rockboy/main.c b/apps/plugins/rockboy/main.c index 6a99f6aa88..5464d4961e 100644 --- a/apps/plugins/rockboy/main.c +++ b/apps/plugins/rockboy/main.c | |||
@@ -47,8 +47,8 @@ void doevents() | |||
47 | 47 | ||
48 | /* convenience macro for printing loading state */ | 48 | /* convenience macro for printing loading state */ |
49 | #define PUTS(str) do { \ | 49 | #define PUTS(str) do { \ |
50 | rb->lcd_putsxy(1, y, str); \ | 50 | rb->lcd_putsxy(1, y, (unsigned char *)str); \ |
51 | rb->lcd_getstringsize(str, &w, &h); \ | 51 | rb->lcd_getstringsize((unsigned char *)str, &w, &h); \ |
52 | y += h + 1; \ | 52 | y += h + 1; \ |
53 | } while (0) | 53 | } while (0) |
54 | 54 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index f3dd334848..90452e55d6 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -106,7 +106,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
106 | } | 106 | } |
107 | 107 | ||
108 | audio_bufferbase = audio_bufferpointer | 108 | audio_bufferbase = audio_bufferpointer |
109 | = rb->plugin_get_audio_buffer(&audio_buffer_free); | 109 | = rb->plugin_get_audio_buffer((int *)&audio_buffer_free); |
110 | #if MEM <= 8 && !defined(SIMULATOR) | 110 | #if MEM <= 8 && !defined(SIMULATOR) |
111 | /* loaded as an overlay, protect from overwriting ourselves */ | 111 | /* loaded as an overlay, protect from overwriting ourselves */ |
112 | if ((unsigned)(ovl_start_addr - (unsigned char *)audio_bufferbase) | 112 | if ((unsigned)(ovl_start_addr - (unsigned char *)audio_bufferbase) |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index acd66a033a..846fd39bdd 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -156,7 +156,7 @@ static void draw_spot(int p, int x, int y) | |||
156 | rb->lcd_fillrect(x+1, y+1, 14, 14); | 156 | rb->lcd_fillrect(x+1, y+1, 14, 14); |
157 | rb->lcd_set_drawmode(DRMODE_SOLID); | 157 | rb->lcd_set_drawmode(DRMODE_SOLID); |
158 | rb->snprintf(s, sizeof(s), "%d", p); | 158 | rb->snprintf(s, sizeof(s), "%d", p); |
159 | rb->lcd_putsxy(x+2, y+4, s); | 159 | rb->lcd_putsxy(x+2, y+4, (unsigned char *)s); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
@@ -178,7 +178,7 @@ static void move_spot(int x, int y) | |||
178 | hole -= (x+5*y); | 178 | hole -= (x+5*y); |
179 | moves++; | 179 | moves++; |
180 | rb->snprintf(s, sizeof(s), "%d", moves); | 180 | rb->snprintf(s, sizeof(s), "%d", moves); |
181 | rb->lcd_putsxy(85, 20, s); | 181 | rb->lcd_putsxy(85, 20, (unsigned char *)s); |
182 | 182 | ||
183 | for (i=4; i<=16; i+=4) { | 183 | for (i=4; i<=16; i+=4) { |
184 | draw_spot(20, (hole%5)*16, (hole/5)*16); | 184 | draw_spot(20, (hole%5)*16, (hole/5)*16); |
@@ -195,9 +195,9 @@ static void puzzle_init(void) | |||
195 | moves = 0; | 195 | moves = 0; |
196 | rb->lcd_clear_display(); | 196 | rb->lcd_clear_display(); |
197 | rb->lcd_drawrect(80, 0, 32, 64); | 197 | rb->lcd_drawrect(80, 0, 32, 64); |
198 | rb->lcd_putsxy(81, 10, "Moves"); | 198 | rb->lcd_putsxy(81, 10, (unsigned char *)"Moves"); |
199 | rb->snprintf(s, sizeof(s), "%d", moves); | 199 | rb->snprintf(s, sizeof(s), "%d", moves); |
200 | rb->lcd_putsxy(85, 20, s); | 200 | rb->lcd_putsxy(85, 20, (unsigned char *)s); |
201 | 201 | ||
202 | /* shuffle spots */ | 202 | /* shuffle spots */ |
203 | for (i=19; i>=0; i--) { | 203 | for (i=19; i>=0; i--) { |
@@ -324,11 +324,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
324 | rb = api; | 324 | rb = api; |
325 | 325 | ||
326 | /* print title */ | 326 | /* print title */ |
327 | rb->lcd_getstringsize("Sliding Puzzle", &w, &h); | 327 | rb->lcd_getstringsize((unsigned char *)"Sliding Puzzle", &w, &h); |
328 | w = (w+1)/2; | 328 | w = (w+1)/2; |
329 | h = (h+1)/2; | 329 | h = (h+1)/2; |
330 | rb->lcd_clear_display(); | 330 | rb->lcd_clear_display(); |
331 | rb->lcd_putsxy(LCD_WIDTH/2-w, (LCD_HEIGHT/2)-h, "Sliding Puzzle"); | 331 | rb->lcd_putsxy(LCD_WIDTH/2-w, (LCD_HEIGHT/2)-h, (unsigned char *)"Sliding Puzzle"); |
332 | rb->lcd_update(); | 332 | rb->lcd_update(); |
333 | rb->sleep(HZ); | 333 | rb->sleep(HZ); |
334 | 334 | ||
@@ -349,7 +349,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
349 | 349 | ||
350 | rb->lcd_clear_display(); | 350 | rb->lcd_clear_display(); |
351 | rb->lcd_drawrect(80, 0, 32, 64); | 351 | rb->lcd_drawrect(80, 0, 32, 64); |
352 | rb->lcd_putsxy(81, 10, "Moves"); | 352 | rb->lcd_putsxy(81, 10, (unsigned char *)"Moves"); |
353 | for (i=0; i<20; i++) { | 353 | for (i=0; i<20; i++) { |
354 | spots[i]=(i+1); | 354 | spots[i]=(i+1); |
355 | draw_spot(spots[i], (i%5)*16, (i/5)*16); | 355 | draw_spot(spots[i], (i%5)*16, (i/5)*16); |
diff --git a/apps/plugins/wav2wv.c b/apps/plugins/wav2wv.c index 935c0ed4c6..fb8017d368 100644 --- a/apps/plugins/wav2wv.c +++ b/apps/plugins/wav2wv.c | |||
@@ -76,16 +76,16 @@ static void wvupdate (long start_tick, | |||
76 | (bytes_read/2)) / bytes_read); | 76 | (bytes_read/2)) / bytes_read); |
77 | 77 | ||
78 | rb->snprintf(buf, 32, "elapsed time: %d secs", (elapsed_ticks + (HZ/2)) / HZ); | 78 | rb->snprintf(buf, 32, "elapsed time: %d secs", (elapsed_ticks + (HZ/2)) / HZ); |
79 | rb->lcd_puts(0, 2, buf); | 79 | rb->lcd_puts(0, 2, (unsigned char *)buf); |
80 | 80 | ||
81 | rb->snprintf(buf, 32, "progress: %d%%", progress); | 81 | rb->snprintf(buf, 32, "progress: %d%%", progress); |
82 | rb->lcd_puts(0, 4, buf); | 82 | rb->lcd_puts(0, 4, (unsigned char *)buf); |
83 | 83 | ||
84 | rb->snprintf(buf, 32, "realtime: %d%% ", realtime); | 84 | rb->snprintf(buf, 32, "realtime: %d%% ", realtime); |
85 | rb->lcd_puts(0, 6, buf); | 85 | rb->lcd_puts(0, 6, (unsigned char *)buf); |
86 | 86 | ||
87 | rb->snprintf(buf, 32, "compression: %d%% ", compression); | 87 | rb->snprintf(buf, 32, "compression: %d%% ", compression); |
88 | rb->lcd_puts(0, 8, buf); | 88 | rb->lcd_puts(0, 8, (unsigned char *)buf); |
89 | 89 | ||
90 | #ifdef HAVE_LCD_BITMAP | 90 | #ifdef HAVE_LCD_BITMAP |
91 | rb->lcd_update(); | 91 | rb->lcd_update(); |
@@ -102,14 +102,14 @@ static int wav2wv (char *filename) | |||
102 | unsigned long total_bytes_read = 0, total_bytes_written = 0; | 102 | unsigned long total_bytes_read = 0, total_bytes_written = 0; |
103 | unsigned long total_samples, samples_remaining; | 103 | unsigned long total_samples, samples_remaining; |
104 | long *input_buffer = (long *) audiobuf; | 104 | long *input_buffer = (long *) audiobuf; |
105 | unsigned char *output_buffer = audiobuf + 0x100000; | 105 | unsigned char *output_buffer = (unsigned char *)(audiobuf + 0x100000); |
106 | char *extension, save_a; | 106 | char *extension, save_a; |
107 | WavpackConfig config; | 107 | WavpackConfig config; |
108 | WavpackContext *wpc; | 108 | WavpackContext *wpc; |
109 | long start_tick; | 109 | long start_tick; |
110 | 110 | ||
111 | rb->lcd_clear_display(); | 111 | rb->lcd_clear_display(); |
112 | rb->lcd_puts_scroll(0, 0, filename); | 112 | rb->lcd_puts_scroll(0, 0, (unsigned char *)filename); |
113 | #ifdef HAVE_LCD_BITMAP | 113 | #ifdef HAVE_LCD_BITMAP |
114 | rb->lcd_update(); | 114 | rb->lcd_update(); |
115 | #endif | 115 | #endif |