Trivial warning fixes; some are still left and are non-trivial
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2421 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -323,7 +323,7 @@ static BOOL ML_LoadPatterns(void)
|
|||||||
if (trekker && of.numchn == 8) {
|
if (trekker && of.numchn == 8) {
|
||||||
/* Startrekker module dual pattern */
|
/* Startrekker module dual pattern */
|
||||||
for (t = 0; t < of.numpat; t++) {
|
for (t = 0; t < of.numpat; t++) {
|
||||||
for (s = 0; s < (64U * 4); s++) {
|
for (s = 0; s < (64 * 4); s++) {
|
||||||
patbuf[s].a = _mm_read_UBYTE(modreader);
|
patbuf[s].a = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].b = _mm_read_UBYTE(modreader);
|
patbuf[s].b = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].c = _mm_read_UBYTE(modreader);
|
patbuf[s].c = _mm_read_UBYTE(modreader);
|
||||||
@@ -332,7 +332,7 @@ static BOOL ML_LoadPatterns(void)
|
|||||||
for (s = 0; s < 4; s++)
|
for (s = 0; s < 4; s++)
|
||||||
if (!(of.tracks[tracks++] = ConvertTrack(patbuf + s, 4)))
|
if (!(of.tracks[tracks++] = ConvertTrack(patbuf + s, 4)))
|
||||||
return 0;
|
return 0;
|
||||||
for (s = 0; s < (64U * 4); s++) {
|
for (s = 0; s < (64 * 4); s++) {
|
||||||
patbuf[s].a = _mm_read_UBYTE(modreader);
|
patbuf[s].a = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].b = _mm_read_UBYTE(modreader);
|
patbuf[s].b = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].c = _mm_read_UBYTE(modreader);
|
patbuf[s].c = _mm_read_UBYTE(modreader);
|
||||||
@@ -346,7 +346,7 @@ static BOOL ML_LoadPatterns(void)
|
|||||||
/* Generic module pattern */
|
/* Generic module pattern */
|
||||||
for (t = 0; t < of.numpat; t++) {
|
for (t = 0; t < of.numpat; t++) {
|
||||||
/* Load the pattern into the temp buffer and convert it */
|
/* Load the pattern into the temp buffer and convert it */
|
||||||
for (s = 0; s < (64U * of.numchn); s++) {
|
for (s = 0; s < (64 * of.numchn); s++) {
|
||||||
patbuf[s].a = _mm_read_UBYTE(modreader);
|
patbuf[s].a = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].b = _mm_read_UBYTE(modreader);
|
patbuf[s].b = _mm_read_UBYTE(modreader);
|
||||||
patbuf[s].c = _mm_read_UBYTE(modreader);
|
patbuf[s].c = _mm_read_UBYTE(modreader);
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ static BOOL STM_LoadPatterns(void)
|
|||||||
|
|
||||||
/* Allocate temporary buffer for loading and converting the patterns */
|
/* Allocate temporary buffer for loading and converting the patterns */
|
||||||
for(t=0;t<of.numpat;t++) {
|
for(t=0;t<of.numpat;t++) {
|
||||||
for(s=0;s<(64U*of.numchn);s++) {
|
for(s=0;s<(64*of.numchn);s++) {
|
||||||
stmbuf[s].note = _mm_read_UBYTE(modreader);
|
stmbuf[s].note = _mm_read_UBYTE(modreader);
|
||||||
stmbuf[s].insvol = _mm_read_UBYTE(modreader);
|
stmbuf[s].insvol = _mm_read_UBYTE(modreader);
|
||||||
stmbuf[s].volcmd = _mm_read_UBYTE(modreader);
|
stmbuf[s].volcmd = _mm_read_UBYTE(modreader);
|
||||||
@@ -255,6 +255,8 @@ BOOL STM_Load(BOOL curious)
|
|||||||
ULONG MikMod_ISA; /* We must generate our own ISA, it's not stored in stm */
|
ULONG MikMod_ISA; /* We must generate our own ISA, it's not stored in stm */
|
||||||
SAMPLE *q;
|
SAMPLE *q;
|
||||||
|
|
||||||
|
(void)curious; /* unused arg */
|
||||||
|
|
||||||
/* try to read stm header */
|
/* try to read stm header */
|
||||||
_mm_read_string(mh->songname,20,modreader);
|
_mm_read_string(mh->songname,20,modreader);
|
||||||
_mm_read_string(mh->trackername,8,modreader);
|
_mm_read_string(mh->trackername,8,modreader);
|
||||||
|
|||||||
@@ -651,6 +651,8 @@ BOOL XM_Load(BOOL curious)
|
|||||||
BOOL dummypat=0;
|
BOOL dummypat=0;
|
||||||
char tracker[21],modtype[60];
|
char tracker[21],modtype[60];
|
||||||
|
|
||||||
|
(void)curious; /* unused arg */
|
||||||
|
|
||||||
/* try to read module header */
|
/* try to read module header */
|
||||||
_mm_read_string(mh->id,17,modreader);
|
_mm_read_string(mh->id,17,modreader);
|
||||||
_mm_read_string(mh->songname,21,modreader);
|
_mm_read_string(mh->songname,21,modreader);
|
||||||
|
|||||||
@@ -93,7 +93,8 @@ void FreeLinear(void)
|
|||||||
|
|
||||||
int speed_to_finetune(ULONG speed,int sample)
|
int speed_to_finetune(ULONG speed,int sample)
|
||||||
{
|
{
|
||||||
int ctmp=0,tmp,note=1,finetune=0;
|
int note=1,finetune=0;
|
||||||
|
ULONG ctmp=0,tmp;
|
||||||
|
|
||||||
speed>>=1;
|
speed>>=1;
|
||||||
while((tmp=getfrequency(of.flags,getlinearperiod(note<<1,0)))<speed) {
|
while((tmp=getfrequency(of.flags,getlinearperiod(note<<1,0)))<speed) {
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ static BOOL _mm_MemReader_Read(MREADER* reader,void* ptr,size_t size)
|
|||||||
s = ((MMEMREADER*)reader)->buffer;
|
s = ((MMEMREADER*)reader)->buffer;
|
||||||
s += ((MMEMREADER*)reader)->pos;
|
s += ((MMEMREADER*)reader)->pos;
|
||||||
|
|
||||||
if ( ((MMEMREADER*)reader)->pos + size > ((MMEMREADER*)reader)->len)
|
if ( ((MMEMREADER*)reader)->pos + (long)size > ((MMEMREADER*)reader)->len)
|
||||||
{
|
{
|
||||||
((MMEMREADER*)reader)->pos = ((MMEMREADER*)reader)->len;
|
((MMEMREADER*)reader)->pos = ((MMEMREADER*)reader)->len;
|
||||||
return 0; /* not enough remaining bytes */
|
return 0; /* not enough remaining bytes */
|
||||||
|
|||||||
@@ -549,6 +549,9 @@ static int DoPTEffect0(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (!dat && (flags & UF_ARPMEM))
|
if (!dat && (flags & UF_ARPMEM))
|
||||||
@@ -566,6 +569,10 @@ static int DoPTEffect1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick && dat)
|
if (!tick && dat)
|
||||||
a->slidespeed = (UWORD)dat << 2;
|
a->slidespeed = (UWORD)dat << 2;
|
||||||
@@ -580,6 +587,10 @@ static int DoPTEffect2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick && dat)
|
if (!tick && dat)
|
||||||
a->slidespeed = (UWORD)dat << 2;
|
a->slidespeed = (UWORD)dat << 2;
|
||||||
@@ -624,6 +635,10 @@ static int DoPTEffect3(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if ((!tick)&&(dat)) a->portspeed=(UWORD)dat<<2;
|
if ((!tick)&&(dat)) a->portspeed=(UWORD)dat<<2;
|
||||||
if (a->main.period)
|
if (a->main.period)
|
||||||
@@ -676,6 +691,10 @@ static int DoPTEffect4(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat&0x0f) a->vibdepth=dat&0xf;
|
if (dat&0x0f) a->vibdepth=dat&0xf;
|
||||||
@@ -704,6 +723,10 @@ static int DoPTEffect5(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (a->main.period)
|
if (a->main.period)
|
||||||
DoToneSlide(tick, a);
|
DoToneSlide(tick, a);
|
||||||
@@ -722,6 +745,10 @@ static int DoPTEffect7(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE q;
|
UBYTE q;
|
||||||
UWORD temp = 0; /* silence warning */
|
UWORD temp = 0; /* silence warning */
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat&0x0f) a->trmdepth=dat&0xf;
|
if (dat&0x0f) a->trmdepth=dat&0xf;
|
||||||
@@ -769,6 +796,9 @@ static int DoPTEffect8(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (mod->panflag)
|
if (mod->panflag)
|
||||||
a->main.panning = mod->panning[channel] = dat;
|
a->main.panning = mod->panning[channel] = dat;
|
||||||
@@ -780,6 +810,10 @@ static int DoPTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat) a->soffset=(UWORD)dat<<8;
|
if (dat) a->soffset=(UWORD)dat<<8;
|
||||||
@@ -797,6 +831,10 @@ static int DoPTEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (tick)
|
if (tick)
|
||||||
DoVolSlide(a, dat);
|
DoVolSlide(a, dat);
|
||||||
@@ -817,6 +855,9 @@ static int DoPTEffectB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
|
|
||||||
if (tick || mod->patdly2)
|
if (tick || mod->patdly2)
|
||||||
@@ -851,6 +892,10 @@ static int DoPTEffectC(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (tick) return 0;
|
if (tick) return 0;
|
||||||
if (dat==(UBYTE)-1) a->anote=dat=0; /* note cut */
|
if (dat==(UBYTE)-1) a->anote=dat=0; /* note cut */
|
||||||
@@ -864,6 +909,9 @@ static int DoPTEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if ((tick)||(mod->patdly2)) return 0;
|
if ((tick)||(mod->patdly2)) return 0;
|
||||||
if ((mod->positions[mod->sngpos]!=LAST_PATTERN)&&
|
if ((mod->positions[mod->sngpos]!=LAST_PATTERN)&&
|
||||||
@@ -1025,6 +1073,10 @@ static int DoPTEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (tick||mod->patdly2) return 0;
|
if (tick||mod->patdly2) return 0;
|
||||||
if (mod->extspd&&(dat>=mod->bpmlimit))
|
if (mod->extspd&&(dat>=mod->bpmlimit))
|
||||||
@@ -1044,6 +1096,10 @@ static int DoS3MEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE speed;
|
UBYTE speed;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
speed = UniGetByte();
|
speed = UniGetByte();
|
||||||
|
|
||||||
if (tick || mod->patdly2)
|
if (tick || mod->patdly2)
|
||||||
@@ -1093,6 +1149,9 @@ static void DoS3MVolSlide(UWORD tick, UWORD flags, MP_CONTROL *a, UBYTE inf)
|
|||||||
|
|
||||||
static int DoS3MEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoS3MEffectD(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
DoS3MVolSlide(tick, flags, a, UniGetByte());
|
DoS3MVolSlide(tick, flags, a, UniGetByte());
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
@@ -1124,6 +1183,10 @@ static int DoS3MEffectE(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (a->main.period)
|
if (a->main.period)
|
||||||
DoS3MSlideDn(tick, a,dat);
|
DoS3MSlideDn(tick, a,dat);
|
||||||
@@ -1155,6 +1218,10 @@ static int DoS3MEffectF(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (a->main.period)
|
if (a->main.period)
|
||||||
DoS3MSlideUp(tick, a,dat);
|
DoS3MSlideUp(tick, a,dat);
|
||||||
@@ -1166,6 +1233,10 @@ static int DoS3MEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE inf, on, off;
|
UBYTE inf, on, off;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (inf)
|
if (inf)
|
||||||
a->s3mtronof = inf;
|
a->s3mtronof = inf;
|
||||||
@@ -1192,6 +1263,9 @@ static int DoS3MEffectQ(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE inf;
|
UBYTE inf;
|
||||||
|
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (a->main.period) {
|
if (a->main.period) {
|
||||||
if (inf) {
|
if (inf) {
|
||||||
@@ -1254,6 +1328,10 @@ static int DoS3MEffectR(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
UBYTE dat, q;
|
UBYTE dat, q;
|
||||||
UWORD temp=0; /* silence warning */
|
UWORD temp=0; /* silence warning */
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat&0x0f) a->trmdepth=dat&0xf;
|
if (dat&0x0f) a->trmdepth=dat&0xf;
|
||||||
@@ -1301,6 +1379,10 @@ static int DoS3MEffectT(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE tempo;
|
UBYTE tempo;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
tempo = UniGetByte();
|
tempo = UniGetByte();
|
||||||
|
|
||||||
if (tick || mod->patdly2)
|
if (tick || mod->patdly2)
|
||||||
@@ -1316,6 +1398,10 @@ static int DoS3MEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
UBYTE dat, q;
|
UBYTE dat, q;
|
||||||
UWORD temp = 0; /* silence warning */
|
UWORD temp = 0; /* silence warning */
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat&0x0f) a->vibdepth=dat&0xf;
|
if (dat&0x0f) a->vibdepth=dat&0xf;
|
||||||
@@ -1360,6 +1446,11 @@ static int DoS3MEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
|
|
||||||
static int DoKeyOff(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoKeyOff(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
a->main.keyoff|=KEY_OFF;
|
a->main.keyoff|=KEY_OFF;
|
||||||
if ((!(a->main.volflg&EF_ON))||(a->main.volflg&EF_LOOP))
|
if ((!(a->main.volflg&EF_ON))||(a->main.volflg&EF_LOOP))
|
||||||
a->main.keyoff=KEY_KILL;
|
a->main.keyoff=KEY_KILL;
|
||||||
@@ -1371,6 +1462,9 @@ static int DoKeyFade(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if ((tick>=dat)||(tick==mod->sngspd-1)) {
|
if ((tick>=dat)||(tick==mod->sngspd-1)) {
|
||||||
a->main.keyoff=KEY_KILL;
|
a->main.keyoff=KEY_KILL;
|
||||||
@@ -1389,6 +1483,10 @@ static int DoXMEffectA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE inf, lo, hi;
|
UBYTE inf, lo, hi;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (inf)
|
if (inf)
|
||||||
a->s3mvolslide = inf;
|
a->s3mvolslide = inf;
|
||||||
@@ -1423,6 +1521,10 @@ static int DoXMEffectE1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat) a->fportupspd=dat;
|
if (dat) a->fportupspd=dat;
|
||||||
@@ -1437,6 +1539,10 @@ static int DoXMEffectE2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat) a->fportdnspd=dat;
|
if (dat) a->fportdnspd=dat;
|
||||||
@@ -1451,6 +1557,10 @@ static int DoXMEffectEA(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick)
|
if (!tick)
|
||||||
if (dat) a->fslideupspd=dat;
|
if (dat) a->fslideupspd=dat;
|
||||||
@@ -1464,6 +1574,10 @@ static int DoXMEffectEB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick)
|
if (!tick)
|
||||||
if (dat) a->fslidednspd=dat;
|
if (dat) a->fslidednspd=dat;
|
||||||
@@ -1475,6 +1589,11 @@ static int DoXMEffectEB(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
|
|
||||||
static int DoXMEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoXMEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
mod->volume=UniGetByte()<<1;
|
mod->volume=UniGetByte()<<1;
|
||||||
if (mod->volume>128) mod->volume=128;
|
if (mod->volume>128) mod->volume=128;
|
||||||
|
|
||||||
@@ -1485,6 +1604,10 @@ static int DoXMEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE inf;
|
UBYTE inf;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
|
|
||||||
if (tick) {
|
if (tick) {
|
||||||
@@ -1506,6 +1629,10 @@ static int DoXMEffectL(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if ((!tick)&&(a->main.i)) {
|
if ((!tick)&&(a->main.i)) {
|
||||||
UWORD points;
|
UWORD points;
|
||||||
@@ -1532,6 +1659,9 @@ static int DoXMEffectP(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE inf, lo, hi;
|
UBYTE inf, lo, hi;
|
||||||
SWORD pan;
|
SWORD pan;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (!mod->panflag)
|
if (!mod->panflag)
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1560,6 +1690,10 @@ static int DoXMEffectX1(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (dat)
|
if (dat)
|
||||||
a->ffportupspd = dat;
|
a->ffportupspd = dat;
|
||||||
@@ -1580,6 +1714,10 @@ static int DoXMEffectX2(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE dat;
|
UBYTE dat;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (dat)
|
if (dat)
|
||||||
a->ffportdnspd=dat;
|
a->ffportdnspd=dat;
|
||||||
@@ -1640,6 +1778,10 @@ static void DoITToneSlide(UWORD tick, MP_CONTROL *a, UBYTE dat)
|
|||||||
|
|
||||||
static int DoITEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoITEffectG(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
DoITToneSlide(tick, a, UniGetByte());
|
DoITToneSlide(tick, a, UniGetByte());
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1691,6 +1833,10 @@ static void DoITVibrato(UWORD tick, MP_CONTROL *a, UBYTE dat)
|
|||||||
|
|
||||||
static int DoITEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoITEffectH(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
DoITVibrato(tick, a, UniGetByte());
|
DoITVibrato(tick, a, UniGetByte());
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1700,6 +1846,11 @@ static int DoITEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE inf, on, off;
|
UBYTE inf, on, off;
|
||||||
|
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (inf)
|
if (inf)
|
||||||
a->s3mtronof = inf;
|
a->s3mtronof = inf;
|
||||||
@@ -1722,6 +1873,11 @@ static int DoITEffectI(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
|
|
||||||
static int DoITEffectM(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoITEffectM(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
a->main.chanvol=UniGetByte();
|
a->main.chanvol=UniGetByte();
|
||||||
if (a->main.chanvol>64)
|
if (a->main.chanvol>64)
|
||||||
a->main.chanvol=64;
|
a->main.chanvol=64;
|
||||||
@@ -1735,6 +1891,10 @@ static int DoITEffectN(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE inf, lo, hi;
|
UBYTE inf, lo, hi;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
|
|
||||||
if (inf)
|
if (inf)
|
||||||
@@ -1771,6 +1931,9 @@ static int DoITEffectP(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE inf, lo, hi;
|
UBYTE inf, lo, hi;
|
||||||
SWORD pan;
|
SWORD pan;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
if (inf)
|
if (inf)
|
||||||
a->pansspd = inf;
|
a->pansspd = inf;
|
||||||
@@ -1808,6 +1971,11 @@ static int DoITEffectT(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE tempo;
|
UBYTE tempo;
|
||||||
SWORD temp;
|
SWORD temp;
|
||||||
|
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
tempo = UniGetByte();
|
tempo = UniGetByte();
|
||||||
|
|
||||||
if (mod->patdly2)
|
if (mod->patdly2)
|
||||||
@@ -1829,6 +1997,10 @@ static int DoITEffectU(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE dat, q;
|
UBYTE dat, q;
|
||||||
UWORD temp = 0; /* silence warning */
|
UWORD temp = 0; /* silence warning */
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
if (dat&0x0f) a->vibdepth=dat&0xf;
|
if (dat&0x0f) a->vibdepth=dat&0xf;
|
||||||
@@ -1873,6 +2045,10 @@ static int DoITEffectW(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
{
|
{
|
||||||
UBYTE inf, lo, hi;
|
UBYTE inf, lo, hi;
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
|
|
||||||
if (inf)
|
if (inf)
|
||||||
@@ -1909,6 +2085,7 @@ static int DoITEffectY(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWOR
|
|||||||
UBYTE dat, q;
|
UBYTE dat, q;
|
||||||
SLONG temp = 0; /* silence warning */
|
SLONG temp = 0; /* silence warning */
|
||||||
|
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
|
||||||
dat=UniGetByte();
|
dat=UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
@@ -2033,6 +2210,8 @@ static int DoVolEffects(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UBYTE c, inf;
|
UBYTE c, inf;
|
||||||
|
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
c = UniGetByte();
|
c = UniGetByte();
|
||||||
inf = UniGetByte();
|
inf = UniGetByte();
|
||||||
|
|
||||||
@@ -2083,6 +2262,11 @@ static int DoULTEffect9(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWO
|
|||||||
{
|
{
|
||||||
UWORD offset=UniGetWord();
|
UWORD offset=UniGetWord();
|
||||||
|
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
if (offset)
|
if (offset)
|
||||||
a->ultoffset=offset;
|
a->ultoffset=offset;
|
||||||
|
|
||||||
@@ -2100,6 +2284,11 @@ static int DoMEDSpeed(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD
|
|||||||
{
|
{
|
||||||
UWORD speed=UniGetWord();
|
UWORD speed=UniGetWord();
|
||||||
|
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
mod->bpm=speed;
|
mod->bpm=speed;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2132,6 +2321,9 @@ static int DoOktArp(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD c
|
|||||||
{
|
{
|
||||||
UBYTE dat, dat2;
|
UBYTE dat, dat2;
|
||||||
|
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
dat2 = UniGetByte(); /* arpeggio style */
|
dat2 = UniGetByte(); /* arpeggio style */
|
||||||
dat = UniGetByte();
|
dat = UniGetByte();
|
||||||
if (!tick) {
|
if (!tick) {
|
||||||
@@ -2150,6 +2342,12 @@ static int DoOktArp(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD c
|
|||||||
|
|
||||||
static int DoNothing(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
static int DoNothing(UWORD tick, UWORD flags, MP_CONTROL *a, MODULE *mod, SWORD channel)
|
||||||
{
|
{
|
||||||
|
(void)tick; /* unused arg */
|
||||||
|
(void)flags; /* unused arg */
|
||||||
|
(void)a; /* unused arg */
|
||||||
|
(void)mod; /* unused arg */
|
||||||
|
(void)channel; /* unused arg */
|
||||||
|
|
||||||
UniSkipOpcode();
|
UniSkipOpcode();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -3241,7 +3439,7 @@ MIKMODAPI void Player_Mute(SLONG arg1,...)
|
|||||||
static void Player_ToggleMute_internal(SLONG arg1,va_list ap)
|
static void Player_ToggleMute_internal(SLONG arg1,va_list ap)
|
||||||
{
|
{
|
||||||
SLONG arg2,arg3=0;
|
SLONG arg2,arg3=0;
|
||||||
ULONG t;
|
SLONG t;
|
||||||
|
|
||||||
if (pf) {
|
if (pf) {
|
||||||
switch (arg1) {
|
switch (arg1) {
|
||||||
|
|||||||
@@ -775,7 +775,7 @@ void VC1_WriteSamples(SBYTE* buf,ULONG todo)
|
|||||||
if(vc_mode & DMODE_SOFT_MUSIC) md_player();
|
if(vc_mode & DMODE_SOFT_MUSIC) md_player();
|
||||||
tickleft=(md_mixfreq*125L)/(md_bpm*50L);
|
tickleft=(md_mixfreq*125L)/(md_bpm*50L);
|
||||||
}
|
}
|
||||||
left = MIN(tickleft, todo);
|
left = MIN(tickleft, (long)todo);
|
||||||
buffer = buf;
|
buffer = buf;
|
||||||
tickleft -= left;
|
tickleft -= left;
|
||||||
todo -= left;
|
todo -= left;
|
||||||
|
|||||||
@@ -710,7 +710,7 @@ void VC2_WriteSamples(SBYTE* buf,ULONG todo)
|
|||||||
tickleft=(md_mixfreq*125L*SAMPLING_FACTOR)/(md_bpm*50L);
|
tickleft=(md_mixfreq*125L*SAMPLING_FACTOR)/(md_bpm*50L);
|
||||||
tickleft&=~(SAMPLING_FACTOR-1);
|
tickleft&=~(SAMPLING_FACTOR-1);
|
||||||
}
|
}
|
||||||
left = MIN(tickleft, todo);
|
left = MIN(tickleft, (long)todo);
|
||||||
buffer = buf;
|
buffer = buf;
|
||||||
tickleft -= left;
|
tickleft -= left;
|
||||||
todo -= left;
|
todo -= left;
|
||||||
|
|||||||
@@ -410,11 +410,15 @@ SWORD VC1_SampleLoad(struct SAMPLOAD* sload,int type)
|
|||||||
|
|
||||||
ULONG VC1_SampleSpace(int type)
|
ULONG VC1_SampleSpace(int type)
|
||||||
{
|
{
|
||||||
|
(void)type; /* unused arg */
|
||||||
|
|
||||||
return vc_memory;
|
return vc_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
ULONG VC1_SampleLength(int type,SAMPLE* s)
|
ULONG VC1_SampleLength(int type,SAMPLE* s)
|
||||||
{
|
{
|
||||||
|
(void)type; /* unused arg */
|
||||||
|
|
||||||
if (!s) return 0;
|
if (!s) return 0;
|
||||||
|
|
||||||
return (s->length*((s->flags&SF_16BITS)?2:1))+16;
|
return (s->length*((s->flags&SF_16BITS)?2:1))+16;
|
||||||
|
|||||||
Reference in New Issue
Block a user