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/mplayer.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/mplayer.c')
-rw-r--r-- | apps/plugins/mikmod/mplayer.c | 164 |
1 files changed, 159 insertions, 5 deletions
diff --git a/apps/plugins/mikmod/mplayer.c b/apps/plugins/mikmod/mplayer.c index 92585f0320..396cf6c115 100644 --- a/apps/plugins/mikmod/mplayer.c +++ b/apps/plugins/mikmod/mplayer.c | |||
@@ -546,6 +546,8 @@ static void DoArpeggio(UWORD tick, UWORD flags, MP_CONTROL *a, UBYTE style) | |||
546 | static int DoPTEffect0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 546 | static int DoPTEffect0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
547 | { | 547 | { |
548 | UBYTE dat; | 548 | UBYTE dat; |
549 | (void)mod; | ||
550 | (void)channel; | ||
549 | 551 | ||
550 | dat = UniGetByte(); | 552 | dat = UniGetByte(); |
551 | if (!tick) { | 553 | if (!tick) { |
@@ -563,6 +565,9 @@ static int DoPTEffect0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
563 | static int DoPTEffect1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 565 | static int DoPTEffect1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
564 | { | 566 | { |
565 | UBYTE dat; | 567 | UBYTE dat; |
568 | (void)flags; | ||
569 | (void)mod; | ||
570 | (void)channel; | ||
566 | 571 | ||
567 | dat = UniGetByte(); | 572 | dat = UniGetByte(); |
568 | if (!tick && dat) | 573 | if (!tick && dat) |
@@ -577,6 +582,9 @@ static int DoPTEffect1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
577 | static int DoPTEffect2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 582 | static int DoPTEffect2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
578 | { | 583 | { |
579 | UBYTE dat; | 584 | UBYTE dat; |
585 | (void)flags; | ||
586 | (void)mod; | ||
587 | (void)channel; | ||
580 | 588 | ||
581 | dat = UniGetByte(); | 589 | dat = UniGetByte(); |
582 | if (!tick && dat) | 590 | if (!tick && dat) |
@@ -621,6 +629,9 @@ static void DoToneSlide(UWORD tick, MP_CONTROL *a) | |||
621 | static int DoPTEffect3(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 629 | static int DoPTEffect3(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
622 | { | 630 | { |
623 | UBYTE dat; | 631 | UBYTE dat; |
632 | (void)flags; | ||
633 | (void)mod; | ||
634 | (void)channel; | ||
624 | 635 | ||
625 | dat=UniGetByte(); | 636 | dat=UniGetByte(); |
626 | if ((!tick)&&(dat)) a->portspeed=(UWORD)dat<<2; | 637 | if ((!tick)&&(dat)) a->portspeed=(UWORD)dat<<2; |
@@ -673,6 +684,9 @@ static void DoVibrato(UWORD tick, MP_CONTROL *a) | |||
673 | static int DoPTEffect4(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 684 | static int DoPTEffect4(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
674 | { | 685 | { |
675 | UBYTE dat; | 686 | UBYTE dat; |
687 | (void)flags; | ||
688 | (void)mod; | ||
689 | (void)channel; | ||
676 | 690 | ||
677 | dat=UniGetByte(); | 691 | dat=UniGetByte(); |
678 | if (!tick) { | 692 | if (!tick) { |
@@ -701,6 +715,9 @@ static void DoVolSlide(MP_CONTROL *a, UBYTE dat) | |||
701 | static int DoPTEffect5(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 715 | static int DoPTEffect5(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
702 | { | 716 | { |
703 | UBYTE dat; | 717 | UBYTE dat; |
718 | (void)flags; | ||
719 | (void)mod; | ||
720 | (void)channel; | ||
704 | 721 | ||
705 | dat=UniGetByte(); | 722 | dat=UniGetByte(); |
706 | if (a->main.period) | 723 | if (a->main.period) |
@@ -719,6 +736,9 @@ static int DoPTEffect7(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
719 | UBYTE dat; | 736 | UBYTE dat; |
720 | UBYTE q; | 737 | UBYTE q; |
721 | UWORD temp = 0; /* silence warning */ | 738 | UWORD temp = 0; /* silence warning */ |
739 | (void)flags; | ||
740 | (void)mod; | ||
741 | (void)channel; | ||
722 | 742 | ||
723 | dat=UniGetByte(); | 743 | dat=UniGetByte(); |
724 | if (!tick) { | 744 | if (!tick) { |
@@ -766,6 +786,8 @@ static int DoPTEffect7(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
766 | static int DoPTEffect8(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 786 | static int DoPTEffect8(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
767 | { | 787 | { |
768 | UBYTE dat; | 788 | UBYTE dat; |
789 | (void)tick; | ||
790 | (void)flags; | ||
769 | 791 | ||
770 | dat = UniGetByte(); | 792 | dat = UniGetByte(); |
771 | if (mod->panflag) | 793 | if (mod->panflag) |
@@ -777,13 +799,16 @@ static int DoPTEffect8(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
777 | static int DoPTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 799 | static int DoPTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
778 | { | 800 | { |
779 | UBYTE dat; | 801 | UBYTE dat; |
802 | (void)flags; | ||
803 | (void)mod; | ||
804 | (void)channel; | ||
780 | 805 | ||
781 | dat=UniGetByte(); | 806 | dat=UniGetByte(); |
782 | if (!tick) { | 807 | if (!tick) { |
783 | if (dat) a->soffset=(UWORD)dat<<8; | 808 | if (dat) a->soffset=(UWORD)dat<<8; |
784 | a->main.start=a->hioffset|a->soffset; | 809 | a->main.start=a->hioffset|a->soffset; |
785 | 810 | ||
786 | if ((a->main.s)&&(a->main.start>a->main.s->length)) | 811 | if ((a->main.s)&&(a->main.start > (SLONG)a->main.s->length)) |
787 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? | 812 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? |
788 | a->main.s->loopstart:a->main.s->length; | 813 | a->main.s->loopstart:a->main.s->length; |
789 | } | 814 | } |
@@ -794,6 +819,9 @@ static int DoPTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
794 | static int DoPTEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 819 | static int DoPTEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
795 | { | 820 | { |
796 | UBYTE dat; | 821 | UBYTE dat; |
822 | (void)flags; | ||
823 | (void)mod; | ||
824 | (void)channel; | ||
797 | 825 | ||
798 | dat=UniGetByte(); | 826 | dat=UniGetByte(); |
799 | if (tick) | 827 | if (tick) |
@@ -814,6 +842,8 @@ static int DoPTEffect6(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
814 | static int DoPTEffectB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 842 | static int DoPTEffectB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
815 | { | 843 | { |
816 | UBYTE dat; | 844 | UBYTE dat; |
845 | (void)a; | ||
846 | (void)channel; | ||
817 | 847 | ||
818 | dat=UniGetByte(); | 848 | dat=UniGetByte(); |
819 | 849 | ||
@@ -848,6 +878,9 @@ static int DoPTEffectB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
848 | static int DoPTEffectC(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 878 | static int DoPTEffectC(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
849 | { | 879 | { |
850 | UBYTE dat; | 880 | UBYTE dat; |
881 | (void)flags; | ||
882 | (void)mod; | ||
883 | (void)channel; | ||
851 | 884 | ||
852 | dat=UniGetByte(); | 885 | dat=UniGetByte(); |
853 | if (tick) return 0; | 886 | if (tick) return 0; |
@@ -861,6 +894,8 @@ static int DoPTEffectC(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
861 | static int DoPTEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 894 | static int DoPTEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
862 | { | 895 | { |
863 | UBYTE dat; | 896 | UBYTE dat; |
897 | (void)a; | ||
898 | (void)channel; | ||
864 | 899 | ||
865 | dat=UniGetByte(); | 900 | dat=UniGetByte(); |
866 | if ((tick)||(mod->patdly2)) return 0; | 901 | if ((tick)||(mod->patdly2)) return 0; |
@@ -1022,6 +1057,9 @@ static int DoPTEffectE(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1022 | static int DoPTEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1057 | static int DoPTEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1023 | { | 1058 | { |
1024 | UBYTE dat; | 1059 | UBYTE dat; |
1060 | (void)flags; | ||
1061 | (void)a; | ||
1062 | (void)channel; | ||
1025 | 1063 | ||
1026 | dat=UniGetByte(); | 1064 | dat=UniGetByte(); |
1027 | if (tick||mod->patdly2) return 0; | 1065 | if (tick||mod->patdly2) return 0; |
@@ -1041,6 +1079,9 @@ static int DoPTEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1041 | static int DoS3MEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1079 | static int DoS3MEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1042 | { | 1080 | { |
1043 | UBYTE speed; | 1081 | UBYTE speed; |
1082 | (void)flags; | ||
1083 | (void)a; | ||
1084 | (void)channel; | ||
1044 | 1085 | ||
1045 | speed = UniGetByte(); | 1086 | speed = UniGetByte(); |
1046 | 1087 | ||
@@ -1091,6 +1132,9 @@ static void DoS3MVolSlide(UWORD tick, UWORD flags, MP_CONTROL *a, UBYTE inf) | |||
1091 | 1132 | ||
1092 | static int DoS3MEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1133 | static int DoS3MEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1093 | { | 1134 | { |
1135 | (void)mod; | ||
1136 | (void)channel; | ||
1137 | |||
1094 | DoS3MVolSlide(tick, flags, a, UniGetByte()); | 1138 | DoS3MVolSlide(tick, flags, a, UniGetByte()); |
1095 | 1139 | ||
1096 | return 1; | 1140 | return 1; |
@@ -1121,6 +1165,9 @@ static void DoS3MSlideDn(UWORD tick, MP_CONTROL *a, UBYTE inf) | |||
1121 | static int DoS3MEffectE(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1165 | static int DoS3MEffectE(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1122 | { | 1166 | { |
1123 | UBYTE dat; | 1167 | UBYTE dat; |
1168 | (void)flags; | ||
1169 | (void)mod; | ||
1170 | (void)channel; | ||
1124 | 1171 | ||
1125 | dat=UniGetByte(); | 1172 | dat=UniGetByte(); |
1126 | if (a->main.period) | 1173 | if (a->main.period) |
@@ -1152,6 +1199,9 @@ static void DoS3MSlideUp(UWORD tick, MP_CONTROL *a, UBYTE inf) | |||
1152 | static int DoS3MEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1199 | static int DoS3MEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1153 | { | 1200 | { |
1154 | UBYTE dat; | 1201 | UBYTE dat; |
1202 | (void)flags; | ||
1203 | (void)mod; | ||
1204 | (void)channel; | ||
1155 | 1205 | ||
1156 | dat=UniGetByte(); | 1206 | dat=UniGetByte(); |
1157 | if (a->main.period) | 1207 | if (a->main.period) |
@@ -1163,6 +1213,9 @@ static int DoS3MEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1163 | static int DoS3MEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1213 | static int DoS3MEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1164 | { | 1214 | { |
1165 | UBYTE inf, on, off; | 1215 | UBYTE inf, on, off; |
1216 | (void)flags; | ||
1217 | (void)mod; | ||
1218 | (void)channel; | ||
1166 | 1219 | ||
1167 | inf = UniGetByte(); | 1220 | inf = UniGetByte(); |
1168 | if (inf) | 1221 | if (inf) |
@@ -1189,6 +1242,8 @@ static int DoS3MEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1189 | static int DoS3MEffectQ(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1242 | static int DoS3MEffectQ(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1190 | { | 1243 | { |
1191 | UBYTE inf; | 1244 | UBYTE inf; |
1245 | (void)mod; | ||
1246 | (void)channel; | ||
1192 | 1247 | ||
1193 | inf = UniGetByte(); | 1248 | inf = UniGetByte(); |
1194 | if (a->main.period) { | 1249 | if (a->main.period) { |
@@ -1251,6 +1306,9 @@ static int DoS3MEffectR(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1251 | { | 1306 | { |
1252 | UBYTE dat, q; | 1307 | UBYTE dat, q; |
1253 | UWORD temp=0; /* silence warning */ | 1308 | UWORD temp=0; /* silence warning */ |
1309 | (void)flags; | ||
1310 | (void)mod; | ||
1311 | (void)channel; | ||
1254 | 1312 | ||
1255 | dat = UniGetByte(); | 1313 | dat = UniGetByte(); |
1256 | if (!tick) { | 1314 | if (!tick) { |
@@ -1298,6 +1356,9 @@ static int DoS3MEffectR(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1298 | static int DoS3MEffectT(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1356 | static int DoS3MEffectT(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1299 | { | 1357 | { |
1300 | UBYTE tempo; | 1358 | UBYTE tempo; |
1359 | (void)flags; | ||
1360 | (void)a; | ||
1361 | (void)channel; | ||
1301 | 1362 | ||
1302 | tempo = UniGetByte(); | 1363 | tempo = UniGetByte(); |
1303 | 1364 | ||
@@ -1313,6 +1374,9 @@ static int DoS3MEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1313 | { | 1374 | { |
1314 | UBYTE dat, q; | 1375 | UBYTE dat, q; |
1315 | UWORD temp = 0; /* silence warning */ | 1376 | UWORD temp = 0; /* silence warning */ |
1377 | (void)flags; | ||
1378 | (void)mod; | ||
1379 | (void)channel; | ||
1316 | 1380 | ||
1317 | dat = UniGetByte(); | 1381 | dat = UniGetByte(); |
1318 | if (!tick) { | 1382 | if (!tick) { |
@@ -1358,6 +1422,10 @@ static int DoS3MEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1358 | 1422 | ||
1359 | static int DoKeyOff(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1423 | static int DoKeyOff(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1360 | { | 1424 | { |
1425 | (void)tick; | ||
1426 | (void)flags; | ||
1427 | (void)mod; | ||
1428 | (void)channel; | ||
1361 | a->main.keyoff|=KEY_OFF; | 1429 | a->main.keyoff|=KEY_OFF; |
1362 | if ((!(a->main.volflg&EF_ON))||(a->main.volflg&EF_LOOP)) | 1430 | if ((!(a->main.volflg&EF_ON))||(a->main.volflg&EF_LOOP)) |
1363 | a->main.keyoff=KEY_KILL; | 1431 | a->main.keyoff=KEY_KILL; |
@@ -1368,6 +1436,8 @@ static int DoKeyOff(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD c | |||
1368 | static int DoKeyFade(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1436 | static int DoKeyFade(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1369 | { | 1437 | { |
1370 | UBYTE dat; | 1438 | UBYTE dat; |
1439 | (void)flags; | ||
1440 | (void)channel; | ||
1371 | 1441 | ||
1372 | dat=UniGetByte(); | 1442 | dat=UniGetByte(); |
1373 | if ((tick>=dat)||(tick==mod->sngspd-1)) { | 1443 | if ((tick>=dat)||(tick==mod->sngspd-1)) { |
@@ -1386,6 +1456,9 @@ static int DoKeyFade(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD | |||
1386 | static int DoXMEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1456 | static int DoXMEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1387 | { | 1457 | { |
1388 | UBYTE inf, lo, hi; | 1458 | UBYTE inf, lo, hi; |
1459 | (void)flags; | ||
1460 | (void)mod; | ||
1461 | (void)channel; | ||
1389 | 1462 | ||
1390 | inf = UniGetByte(); | 1463 | inf = UniGetByte(); |
1391 | if (inf) | 1464 | if (inf) |
@@ -1411,6 +1484,9 @@ static int DoXMEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1411 | 1484 | ||
1412 | static int DoXMEffect6(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1485 | static int DoXMEffect6(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1413 | { | 1486 | { |
1487 | (void)flags; | ||
1488 | (void)mod; | ||
1489 | (void)channel; | ||
1414 | if (a->main.period) | 1490 | if (a->main.period) |
1415 | DoVibrato(tick, a); | 1491 | DoVibrato(tick, a); |
1416 | 1492 | ||
@@ -1420,6 +1496,9 @@ static int DoXMEffect6(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1420 | static int DoXMEffectE1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1496 | static int DoXMEffectE1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1421 | { | 1497 | { |
1422 | UBYTE dat; | 1498 | UBYTE dat; |
1499 | (void)flags; | ||
1500 | (void)mod; | ||
1501 | (void)channel; | ||
1423 | 1502 | ||
1424 | dat=UniGetByte(); | 1503 | dat=UniGetByte(); |
1425 | if (!tick) { | 1504 | if (!tick) { |
@@ -1434,6 +1513,9 @@ static int DoXMEffectE1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1434 | static int DoXMEffectE2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1513 | static int DoXMEffectE2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1435 | { | 1514 | { |
1436 | UBYTE dat; | 1515 | UBYTE dat; |
1516 | (void)flags; | ||
1517 | (void)mod; | ||
1518 | (void)channel; | ||
1437 | 1519 | ||
1438 | dat=UniGetByte(); | 1520 | dat=UniGetByte(); |
1439 | if (!tick) { | 1521 | if (!tick) { |
@@ -1448,6 +1530,9 @@ static int DoXMEffectE2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1448 | static int DoXMEffectEA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1530 | static int DoXMEffectEA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1449 | { | 1531 | { |
1450 | UBYTE dat; | 1532 | UBYTE dat; |
1533 | (void)flags; | ||
1534 | (void)mod; | ||
1535 | (void)channel; | ||
1451 | 1536 | ||
1452 | dat=UniGetByte(); | 1537 | dat=UniGetByte(); |
1453 | if (!tick) | 1538 | if (!tick) |
@@ -1461,6 +1546,9 @@ static int DoXMEffectEA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1461 | static int DoXMEffectEB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1546 | static int DoXMEffectEB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1462 | { | 1547 | { |
1463 | UBYTE dat; | 1548 | UBYTE dat; |
1549 | (void)flags; | ||
1550 | (void)mod; | ||
1551 | (void)channel; | ||
1464 | 1552 | ||
1465 | dat=UniGetByte(); | 1553 | dat=UniGetByte(); |
1466 | if (!tick) | 1554 | if (!tick) |
@@ -1473,6 +1561,10 @@ static int DoXMEffectEB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1473 | 1561 | ||
1474 | static int DoXMEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1562 | static int DoXMEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1475 | { | 1563 | { |
1564 | (void)tick; | ||
1565 | (void)flags; | ||
1566 | (void)a; | ||
1567 | (void)channel; | ||
1476 | mod->volume=UniGetByte()<<1; | 1568 | mod->volume=UniGetByte()<<1; |
1477 | if (mod->volume>128) mod->volume=128; | 1569 | if (mod->volume>128) mod->volume=128; |
1478 | 1570 | ||
@@ -1482,6 +1574,9 @@ static int DoXMEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1482 | static int DoXMEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1574 | static int DoXMEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1483 | { | 1575 | { |
1484 | UBYTE inf; | 1576 | UBYTE inf; |
1577 | (void)flags; | ||
1578 | (void)a; | ||
1579 | (void)channel; | ||
1485 | 1580 | ||
1486 | inf = UniGetByte(); | 1581 | inf = UniGetByte(); |
1487 | 1582 | ||
@@ -1503,6 +1598,9 @@ static int DoXMEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1503 | static int DoXMEffectL(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1598 | static int DoXMEffectL(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1504 | { | 1599 | { |
1505 | UBYTE dat; | 1600 | UBYTE dat; |
1601 | (void)flags; | ||
1602 | (void)mod; | ||
1603 | (void)channel; | ||
1506 | 1604 | ||
1507 | dat=UniGetByte(); | 1605 | dat=UniGetByte(); |
1508 | if ((!tick)&&(a->main.i)) { | 1606 | if ((!tick)&&(a->main.i)) { |
@@ -1529,6 +1627,8 @@ static int DoXMEffectP(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1529 | { | 1627 | { |
1530 | UBYTE inf, lo, hi; | 1628 | UBYTE inf, lo, hi; |
1531 | SWORD pan; | 1629 | SWORD pan; |
1630 | (void)flags; | ||
1631 | (void)channel; | ||
1532 | 1632 | ||
1533 | inf = UniGetByte(); | 1633 | inf = UniGetByte(); |
1534 | if (!mod->panflag) | 1634 | if (!mod->panflag) |
@@ -1557,6 +1657,9 @@ static int DoXMEffectP(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1557 | static int DoXMEffectX1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1657 | static int DoXMEffectX1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1558 | { | 1658 | { |
1559 | UBYTE dat; | 1659 | UBYTE dat; |
1660 | (void)flags; | ||
1661 | (void)mod; | ||
1662 | (void)channel; | ||
1560 | 1663 | ||
1561 | dat = UniGetByte(); | 1664 | dat = UniGetByte(); |
1562 | if (dat) | 1665 | if (dat) |
@@ -1577,6 +1680,9 @@ static int DoXMEffectX1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1577 | static int DoXMEffectX2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1680 | static int DoXMEffectX2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1578 | { | 1681 | { |
1579 | UBYTE dat; | 1682 | UBYTE dat; |
1683 | (void)flags; | ||
1684 | (void)mod; | ||
1685 | (void)channel; | ||
1580 | 1686 | ||
1581 | dat = UniGetByte(); | 1687 | dat = UniGetByte(); |
1582 | if (dat) | 1688 | if (dat) |
@@ -1638,6 +1744,9 @@ static void DoITToneSlide(UWORD tick, MP_CONTROL *a, UBYTE dat) | |||
1638 | 1744 | ||
1639 | static int DoITEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1745 | static int DoITEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1640 | { | 1746 | { |
1747 | (void)flags; | ||
1748 | (void)mod; | ||
1749 | (void)channel; | ||
1641 | DoITToneSlide(tick, a, UniGetByte()); | 1750 | DoITToneSlide(tick, a, UniGetByte()); |
1642 | 1751 | ||
1643 | return 0; | 1752 | return 0; |
@@ -1689,6 +1798,9 @@ static void DoITVibrato(UWORD tick, MP_CONTROL *a, UBYTE dat) | |||
1689 | 1798 | ||
1690 | static int DoITEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1799 | static int DoITEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1691 | { | 1800 | { |
1801 | (void)flags; | ||
1802 | (void)mod; | ||
1803 | (void)channel; | ||
1692 | DoITVibrato(tick, a, UniGetByte()); | 1804 | DoITVibrato(tick, a, UniGetByte()); |
1693 | 1805 | ||
1694 | return 0; | 1806 | return 0; |
@@ -1697,6 +1809,10 @@ static int DoITEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1697 | static int DoITEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1809 | static int DoITEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1698 | { | 1810 | { |
1699 | UBYTE inf, on, off; | 1811 | UBYTE inf, on, off; |
1812 | (void)tick; | ||
1813 | (void)flags; | ||
1814 | (void)mod; | ||
1815 | (void)channel; | ||
1700 | 1816 | ||
1701 | inf = UniGetByte(); | 1817 | inf = UniGetByte(); |
1702 | if (inf) | 1818 | if (inf) |
@@ -1720,6 +1836,10 @@ static int DoITEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1720 | 1836 | ||
1721 | static int DoITEffectM(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1837 | static int DoITEffectM(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1722 | { | 1838 | { |
1839 | (void)tick; | ||
1840 | (void)flags; | ||
1841 | (void)mod; | ||
1842 | (void)channel; | ||
1723 | a->main.chanvol=UniGetByte(); | 1843 | a->main.chanvol=UniGetByte(); |
1724 | if (a->main.chanvol>64) | 1844 | if (a->main.chanvol>64) |
1725 | a->main.chanvol=64; | 1845 | a->main.chanvol=64; |
@@ -1732,6 +1852,10 @@ static int DoITEffectM(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1732 | static int DoITEffectN(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 1852 | static int DoITEffectN(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1733 | { | 1853 | { |
1734 | UBYTE inf, lo, hi; | 1854 | UBYTE inf, lo, hi; |
1855 | (void)tick; | ||
1856 | (void)flags; | ||
1857 | (void)mod; | ||
1858 | (void)channel; | ||
1735 | 1859 | ||
1736 | inf = UniGetByte(); | 1860 | inf = UniGetByte(); |
1737 | 1861 | ||
@@ -1768,6 +1892,9 @@ static int DoITEffectP(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1768 | { | 1892 | { |
1769 | UBYTE inf, lo, hi; | 1893 | UBYTE inf, lo, hi; |
1770 | SWORD pan; | 1894 | SWORD pan; |
1895 | (void)flags; | ||
1896 | (void)mod; | ||
1897 | (void)channel; | ||
1771 | 1898 | ||
1772 | inf = UniGetByte(); | 1899 | inf = UniGetByte(); |
1773 | if (inf) | 1900 | if (inf) |
@@ -1805,6 +1932,10 @@ static int DoITEffectT(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1805 | { | 1932 | { |
1806 | UBYTE tempo; | 1933 | UBYTE tempo; |
1807 | SWORD temp; | 1934 | SWORD temp; |
1935 | (void)tick; | ||
1936 | (void)flags; | ||
1937 | (void)a; | ||
1938 | (void)channel; | ||
1808 | 1939 | ||
1809 | tempo = UniGetByte(); | 1940 | tempo = UniGetByte(); |
1810 | 1941 | ||
@@ -1826,6 +1957,9 @@ static int DoITEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1826 | { | 1957 | { |
1827 | UBYTE dat, q; | 1958 | UBYTE dat, q; |
1828 | UWORD temp = 0; /* silence warning */ | 1959 | UWORD temp = 0; /* silence warning */ |
1960 | (void)flags; | ||
1961 | (void)mod; | ||
1962 | (void)channel; | ||
1829 | 1963 | ||
1830 | dat = UniGetByte(); | 1964 | dat = UniGetByte(); |
1831 | if (!tick) { | 1965 | if (!tick) { |
@@ -1870,6 +2004,9 @@ static int DoITEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1870 | static int DoITEffectW(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2004 | static int DoITEffectW(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
1871 | { | 2005 | { |
1872 | UBYTE inf, lo, hi; | 2006 | UBYTE inf, lo, hi; |
2007 | (void)flags; | ||
2008 | (void)a; | ||
2009 | (void)channel; | ||
1873 | 2010 | ||
1874 | inf = UniGetByte(); | 2011 | inf = UniGetByte(); |
1875 | 2012 | ||
@@ -1906,6 +2043,7 @@ static int DoITEffectY(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR | |||
1906 | { | 2043 | { |
1907 | UBYTE dat, q; | 2044 | UBYTE dat, q; |
1908 | SLONG temp = 0; /* silence warning */ | 2045 | SLONG temp = 0; /* silence warning */ |
2046 | (void)flags; | ||
1909 | 2047 | ||
1910 | 2048 | ||
1911 | dat=UniGetByte(); | 2049 | dat=UniGetByte(); |
@@ -1998,7 +2136,7 @@ static int DoITEffectS0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
1998 | a->hioffset=inf<<16; | 2136 | a->hioffset=inf<<16; |
1999 | a->main.start=a->hioffset|a->soffset; | 2137 | a->main.start=a->hioffset|a->soffset; |
2000 | 2138 | ||
2001 | if ((a->main.s)&&(a->main.start>a->main.s->length)) | 2139 | if ((a->main.s)&&(a->main.start > (SLONG)a->main.s->length)) |
2002 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? | 2140 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? |
2003 | a->main.s->loopstart:a->main.s->length; | 2141 | a->main.s->loopstart:a->main.s->length; |
2004 | } | 2142 | } |
@@ -2030,6 +2168,7 @@ static int DoITEffectS0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
2030 | static int DoVolEffects(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2168 | static int DoVolEffects(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
2031 | { | 2169 | { |
2032 | UBYTE c, inf; | 2170 | UBYTE c, inf; |
2171 | (void)channel; | ||
2033 | 2172 | ||
2034 | c = UniGetByte(); | 2173 | c = UniGetByte(); |
2035 | inf = UniGetByte(); | 2174 | inf = UniGetByte(); |
@@ -2080,12 +2219,16 @@ static int DoVolEffects(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
2080 | static int DoULTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2219 | static int DoULTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
2081 | { | 2220 | { |
2082 | UWORD offset=UniGetWord(); | 2221 | UWORD offset=UniGetWord(); |
2222 | (void)tick; | ||
2223 | (void)flags; | ||
2224 | (void)mod; | ||
2225 | (void)channel; | ||
2083 | 2226 | ||
2084 | if (offset) | 2227 | if (offset) |
2085 | a->ultoffset=offset; | 2228 | a->ultoffset=offset; |
2086 | 2229 | ||
2087 | a->main.start=a->ultoffset<<2; | 2230 | a->main.start=a->ultoffset<<2; |
2088 | if ((a->main.s)&&(a->main.start>a->main.s->length)) | 2231 | if ((a->main.s)&&(a->main.start > (SLONG)a->main.s->length)) |
2089 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? | 2232 | a->main.start=a->main.s->flags&(SF_LOOP|SF_BIDI)? |
2090 | a->main.s->loopstart:a->main.s->length; | 2233 | a->main.s->loopstart:a->main.s->length; |
2091 | 2234 | ||
@@ -2097,6 +2240,10 @@ static int DoULTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO | |||
2097 | static int DoMEDSpeed(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2240 | static int DoMEDSpeed(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
2098 | { | 2241 | { |
2099 | UWORD speed=UniGetWord(); | 2242 | UWORD speed=UniGetWord(); |
2243 | (void)tick; | ||
2244 | (void)flags; | ||
2245 | (void)a; | ||
2246 | (void)channel; | ||
2100 | 2247 | ||
2101 | mod->bpm=speed; | 2248 | mod->bpm=speed; |
2102 | 2249 | ||
@@ -2129,6 +2276,8 @@ static int DoMEDEffectF3(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SW | |||
2129 | static int DoOktArp(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2276 | static int DoOktArp(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
2130 | { | 2277 | { |
2131 | UBYTE dat, dat2; | 2278 | UBYTE dat, dat2; |
2279 | (void)mod; | ||
2280 | (void)channel; | ||
2132 | 2281 | ||
2133 | dat2 = UniGetByte(); /* arpeggio style */ | 2282 | dat2 = UniGetByte(); /* arpeggio style */ |
2134 | dat = UniGetByte(); | 2283 | dat = UniGetByte(); |
@@ -2148,6 +2297,11 @@ static int DoOktArp(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD c | |||
2148 | 2297 | ||
2149 | static int DoNothing(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) | 2298 | static int DoNothing(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel) |
2150 | { | 2299 | { |
2300 | (void)tick; | ||
2301 | (void)flags; | ||
2302 | (void)a; | ||
2303 | (void)mod; | ||
2304 | (void)channel; | ||
2151 | UniSkipOpcode(); | 2305 | UniSkipOpcode(); |
2152 | 2306 | ||
2153 | return 0; | 2307 | return 0; |
@@ -2330,7 +2484,7 @@ void pt_UpdateVoices(MODULE *mod, int max_volume) | |||
2330 | 2484 | ||
2331 | if ((aout->main.kick==KICK_NOTE)||(aout->main.kick==KICK_KEYOFF)) { | 2485 | if ((aout->main.kick==KICK_NOTE)||(aout->main.kick==KICK_KEYOFF)) { |
2332 | Voice_Play_internal(channel,s,(aout->main.start==-1)? | 2486 | Voice_Play_internal(channel,s,(aout->main.start==-1)? |
2333 | ((s->flags&SF_UST_LOOP)?s->loopstart:0):aout->main.start); | 2487 | ((s->flags&SF_UST_LOOP) ? (SLONG)s->loopstart : 0) : aout->main.start); |
2334 | aout->main.fadevol=32768; | 2488 | aout->main.fadevol=32768; |
2335 | aout->aswppos=0; | 2489 | aout->aswppos=0; |
2336 | } | 2490 | } |
@@ -3242,7 +3396,7 @@ MIKMODAPI void Player_Mute(SLONG arg1,...) | |||
3242 | static void Player_ToggleMute_internal(SLONG arg1,va_list ap) | 3396 | static void Player_ToggleMute_internal(SLONG arg1,va_list ap) |
3243 | { | 3397 | { |
3244 | SLONG arg2,arg3=0; | 3398 | SLONG arg2,arg3=0; |
3245 | ULONG t; | 3399 | SLONG t; |
3246 | 3400 | ||
3247 | if (pf) { | 3401 | if (pf) { |
3248 | switch (arg1) { | 3402 | switch (arg1) { |