diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 23:17:42 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 23:17:42 +0000 |
commit | e2186479d56762d097b943696423ad8588ca7f92 (patch) | |
tree | 833fb9909a1842e1eb216a695d7bc507855be4e5 /apps/plugins/mikmod/mikmod.c | |
parent | 7887e596a99fcaf2198d624bfedf5e2ad97a49cd (diff) | |
download | rockbox-e2186479d56762d097b943696423ad8588ca7f92.tar.gz rockbox-e2186479d56762d097b943696423ad8588ca7f92.zip |
FS#12259: Remove '-w' compiler option for MikMod. Resolve all yet unreported compiler warnings and fix a bug in load_gt2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30424 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mikmod/mikmod.c')
-rw-r--r-- | apps/plugins/mikmod/mikmod.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c index d132f80498..63d575a958 100644 --- a/apps/plugins/mikmod/mikmod.c +++ b/apps/plugins/mikmod/mikmod.c | |||
@@ -50,9 +50,6 @@ static unsigned char* audio_buffer; | |||
50 | static size_t audio_buffer_free; | 50 | static size_t audio_buffer_free; |
51 | 51 | ||
52 | 52 | ||
53 | /* The rockbox plugin interface */ | ||
54 | MEM_FUNCTION_WRAPPERS; | ||
55 | |||
56 | bool quit; | 53 | bool quit; |
57 | int playingtime IBSS_ATTR; | 54 | int playingtime IBSS_ATTR; |
58 | MODULE *module IBSS_ATTR; | 55 | MODULE *module IBSS_ATTR; |
@@ -147,10 +144,12 @@ void mmsupp_printf(const char *fmt, ...) | |||
147 | /************************* File Access ***************************/ | 144 | /************************* File Access ***************************/ |
148 | 145 | ||
149 | /* support function for qsort() */ | 146 | /* support function for qsort() */ |
147 | /* not used | ||
150 | static int compare(const void* p1, const void* p2) | 148 | static int compare(const void* p1, const void* p2) |
151 | { | 149 | { |
152 | return rb->strcasecmp(*((char **)p1), *((char **)p2)); | 150 | return rb->strcasecmp(*((char **)p1), *((char **)p2)); |
153 | } | 151 | } |
152 | */ | ||
154 | 153 | ||
155 | bool mod_ext(const char ext[]) | 154 | bool mod_ext(const char ext[]) |
156 | { | 155 | { |
@@ -290,7 +289,7 @@ void get_more(unsigned char** start, size_t* size) | |||
290 | #endif | 289 | #endif |
291 | } | 290 | } |
292 | 291 | ||
293 | void showinfo() | 292 | void showinfo(void) |
294 | { | 293 | { |
295 | char statustext[LINE_LENGTH]; | 294 | char statustext[LINE_LENGTH]; |
296 | 295 | ||
@@ -348,9 +347,9 @@ void showinfo() | |||
348 | rb->lcd_update(); | 347 | rb->lcd_update(); |
349 | } | 348 | } |
350 | 349 | ||
351 | void showsamples() | 350 | void showsamples(void) |
352 | { | 351 | { |
353 | int i, j; | 352 | int i; |
354 | char statustext[LINE_LENGTH]; | 353 | char statustext[LINE_LENGTH]; |
355 | 354 | ||
356 | if ( screenupdated ) | 355 | if ( screenupdated ) |
@@ -367,9 +366,9 @@ void showsamples() | |||
367 | screenupdated = true; | 366 | screenupdated = true; |
368 | } | 367 | } |
369 | 368 | ||
370 | void showinstruments() | 369 | void showinstruments(void) |
371 | { | 370 | { |
372 | int i, j; | 371 | int i; |
373 | char statustext[LINE_LENGTH]; | 372 | char statustext[LINE_LENGTH]; |
374 | 373 | ||
375 | if ( screenupdated ) | 374 | if ( screenupdated ) |
@@ -386,7 +385,7 @@ void showinstruments() | |||
386 | screenupdated = true; | 385 | screenupdated = true; |
387 | } | 386 | } |
388 | 387 | ||
389 | void showcomments() | 388 | void showcomments(void) |
390 | { | 389 | { |
391 | int i, j=0, k=0, l; | 390 | int i, j=0, k=0, l; |
392 | char statustext[LINE_LENGTH]; | 391 | char statustext[LINE_LENGTH]; |
@@ -425,7 +424,7 @@ void showcomments() | |||
425 | screenupdated = true; | 424 | screenupdated = true; |
426 | } | 425 | } |
427 | 426 | ||
428 | int changedisplay() | 427 | void changedisplay(void) |
429 | { | 428 | { |
430 | display = (display+1) % 4; | 429 | display = (display+1) % 4; |
431 | 430 | ||
@@ -494,7 +493,7 @@ static struct configdata config[] = | |||
494 | { TYPE_BOOL, 0, 1, { .bool_p = &settings.boost }, "CPU Boost", NULL}, | 493 | { TYPE_BOOL, 0, 1, { .bool_p = &settings.boost }, "CPU Boost", NULL}, |
495 | }; | 494 | }; |
496 | 495 | ||
497 | void applysettings() | 496 | void applysettings(void) |
498 | { | 497 | { |
499 | md_pansep = settings.pansep; | 498 | md_pansep = settings.pansep; |
500 | md_reverb = settings.reverb; | 499 | md_reverb = settings.reverb; |
@@ -525,7 +524,6 @@ void applysettings() | |||
525 | int settings_menu(void) | 524 | int settings_menu(void) |
526 | { | 525 | { |
527 | int selection = 0; | 526 | int selection = 0; |
528 | bool old_val; | ||
529 | 527 | ||
530 | MENUITEM_STRINGLIST(settings_menu, "Mikmod Settings", NULL, "Panning Separation", | 528 | MENUITEM_STRINGLIST(settings_menu, "Mikmod Settings", NULL, "Panning Separation", |
531 | "Reverberation", "Interpolation", "Reverse Channels", "Surround", | 529 | "Reverberation", "Interpolation", "Reverse Channels", "Surround", |