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/load_amf.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/load_amf.c')
-rw-r--r-- | apps/plugins/mikmod/load_amf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/mikmod/load_amf.c b/apps/plugins/mikmod/load_amf.c index 12e0af0738..5bb1c672fa 100644 --- a/apps/plugins/mikmod/load_amf.c +++ b/apps/plugins/mikmod/load_amf.c | |||
@@ -332,12 +332,14 @@ static UBYTE* AMF_ConvertTrack(void) | |||
332 | 332 | ||
333 | int AMF_Load(int curious) | 333 | int AMF_Load(int curious) |
334 | { | 334 | { |
335 | int t,u,realtrackcnt,realsmpcnt,defaultpanning; | 335 | int u,defaultpanning; |
336 | unsigned int t,realtrackcnt,realsmpcnt; | ||
336 | AMFSAMPLE s; | 337 | AMFSAMPLE s; |
337 | SAMPLE *q; | 338 | SAMPLE *q; |
338 | UWORD *track_remap; | 339 | UWORD *track_remap; |
339 | ULONG samplepos; | 340 | ULONG samplepos; |
340 | int channel_remap[16]; | 341 | int channel_remap[16]; |
342 | (void)curious; | ||
341 | 343 | ||
342 | /* try to read module header */ | 344 | /* try to read module header */ |
343 | _mm_read_UBYTES(mh->id,3,modreader); | 345 | _mm_read_UBYTES(mh->id,3,modreader); |
@@ -505,7 +507,7 @@ int AMF_Load(int curious) | |||
505 | realtrackcnt=track_remap[t]; | 507 | realtrackcnt=track_remap[t]; |
506 | for(t=0;t<of.numpat*of.numchn;t++) | 508 | for(t=0;t<of.numpat*of.numchn;t++) |
507 | of.patterns[t]=(of.patterns[t]<=mh->numtracks)? | 509 | of.patterns[t]=(of.patterns[t]<=mh->numtracks)? |
508 | track_remap[of.patterns[t]]-1:realtrackcnt; | 510 | track_remap[of.patterns[t]]-1:(int)realtrackcnt; |
509 | 511 | ||
510 | MikMod_free(track_remap); | 512 | MikMod_free(track_remap); |
511 | 513 | ||