Updated for Visual C++ 6 build
authorSam Lantinga <slouken@libsdl.org>
Mon, 15 Nov 2004 23:34:56 +0000
changeset 250cf822f8dc1bf
parent 249 3a26a4b9ab13
child 251 e3ca95c1c368
Updated for Visual C++ 6 build
VisualC.zip
effect_position.c
music.c
timidity/playmidi.c
     1.1 Binary file VisualC.zip has changed
     2.1 --- a/effect_position.c	Sat Nov 13 00:38:01 2004 +0000
     2.2 +++ b/effect_position.c	Mon Nov 15 23:34:56 2004 +0000
     2.3 @@ -1179,10 +1179,10 @@
     2.4                                                   		_Eff_position_u8;
     2.5  	    		break;
     2.6  	    	    case 4:
     2.7 -                        _Eff_position_u8_c4;
     2.8 +                        f = _Eff_position_u8_c4;
     2.9  	    		break;
    2.10  	    	    case 6:
    2.11 -                        _Eff_position_u8_c6;
    2.12 +                        f = _Eff_position_u8_c6;
    2.13  	    		break;
    2.14  	    }
    2.15              break;
    2.16 @@ -1195,10 +1195,10 @@
    2.17                                                   		_Eff_position_s8;
    2.18  	    		break;
    2.19  	    	    case 4:
    2.20 -                        _Eff_position_s8_c4;
    2.21 +                    f = _Eff_position_s8_c4;
    2.22  	    		break;
    2.23  	    	    case 6:
    2.24 -                        _Eff_position_s8_c6;
    2.25 +                    f = _Eff_position_s8_c6;
    2.26  	    		break;
    2.27  	    }
    2.28              break;
     3.1 --- a/music.c	Sat Nov 13 00:38:01 2004 +0000
     3.2 +++ b/music.c	Mon Nov 15 23:34:56 2004 +0000
     3.3 @@ -44,9 +44,6 @@
     3.4  #undef CMD_MUSIC
     3.5  #endif
     3.6  
     3.7 -inline static void noop(const char *a, ...) {}
     3.8 -#define debug noop
     3.9 -
    3.10  #ifdef CMD_MUSIC
    3.11  #include "music_cmd.h"
    3.12  #endif
    3.13 @@ -1245,29 +1242,23 @@
    3.14  {
    3.15  	int at;
    3.16  	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
    3.17 -	debug("LMM_Seek(%p, %ld, %d) = ",mr,to,dir);
    3.18  	if(dir==SEEK_SET)
    3.19  		to+=lmmmr->offset;
    3.20  	at=SDL_RWseek(lmmmr->rw, to, dir);
    3.21 -	debug("%d (%d)\n",at-lmmmr->offset, at<lmmmr->offset);
    3.22  	return at<lmmmr->offset;
    3.23  }
    3.24  long LMM_Tell(struct MREADER *mr)
    3.25  {
    3.26  	int at;
    3.27  	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
    3.28 -	debug("LMM_Tell(%p) = ",mr);
    3.29  	at=SDL_RWtell(lmmmr->rw)-lmmmr->offset;
    3.30 -	debug("%d\n",at);
    3.31  	return at;
    3.32  }
    3.33  BOOL LMM_Read(struct MREADER *mr,void *buf,size_t sz)
    3.34  {
    3.35  	int got;
    3.36  	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
    3.37 -	debug("LMM_Read(%p,%p,%lu) = ",mr,buf,sz);
    3.38  	got=SDL_RWread(lmmmr->rw, buf, sz, 1);
    3.39 -	debug("%d\n",got);
    3.40  	return got;
    3.41  }
    3.42  int LMM_Get(struct MREADER *mr)
    3.43 @@ -1275,19 +1266,15 @@
    3.44  	unsigned char c;
    3.45  	int i=EOF;
    3.46  	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
    3.47 -	debug("LMM_Get(%p) = ",mr);
    3.48  	if(SDL_RWread(lmmmr->rw,&c,1,1))
    3.49  		i=c;
    3.50 -	debug("%d\n",i);
    3.51  	return i;
    3.52  }
    3.53  BOOL LMM_Eof(struct MREADER *mr)
    3.54  {
    3.55  	int offset;
    3.56  	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
    3.57 -	debug("LMM_Eof(%p) = ",mr);
    3.58  	offset=LMM_Tell(mr);
    3.59 -	debug("%d\n", offset>=lmmmr->eof);
    3.60  	return offset>=lmmmr->eof;
    3.61  }
    3.62  MODULE *MikMod_LoadSongRW(SDL_RWops *rw, int maxchan)
    3.63 @@ -1308,7 +1295,6 @@
    3.64  	lmmmr.eof=SDL_RWtell(rw);
    3.65  	SDL_RWseek(rw,lmmmr.offset,SEEK_SET);
    3.66  	m=Player_LoadGeneric((MREADER*)&lmmmr,maxchan,0);
    3.67 -	debug("MikMod_LoadSongRW(%p,%d) = %p\n",rw,maxchan,m);
    3.68  	return m;
    3.69  }
    3.70  # endif
     4.1 --- a/timidity/playmidi.c	Sat Nov 13 00:38:01 2004 +0000
     4.2 +++ b/timidity/playmidi.c	Mon Nov 15 23:34:56 2004 +0000
     4.3 @@ -485,7 +485,7 @@
     4.4  
     4.5  static void clone_voice(Instrument *ip, int v, MidiEvent *e, int clone_type, int variationbank)
     4.6  {
     4.7 -  int w, k, played_note, chorus=0, reverb=0, milli;
     4.8 +  int w, played_note, chorus=0, reverb=0, milli;
     4.9    int chan = voice[v].channel;
    4.10  
    4.11    if (clone_type == STEREO_CLONE) {
    4.12 @@ -1450,7 +1450,7 @@
    4.13  	{
    4.14  	  if (!voice[i].sample_offset && voice[i].echo_delay_count)
    4.15  	    {
    4.16 -		if (voice[i].echo_delay_count >= count) voice[i].echo_delay_count -= count;
    4.17 +		if ((uint32)voice[i].echo_delay_count >= count) voice[i].echo_delay_count -= count;
    4.18  		else
    4.19  		  {
    4.20  	            mix_voice(buffer_pointer+voice[i].echo_delay_count, i, count-voice[i].echo_delay_count);