From 8f4148bab10dbe59782534923b3f4cf221e54c7b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 15 Nov 2004 23:34:56 +0000
Subject: [PATCH] Updated for Visual C++ 6 build

---
 VisualC.zip         | Bin 115887 -> 115888 bytes
 effect_position.c   |   8 ++++----
 music.c             |  14 --------------
 timidity/playmidi.c |   4 ++--
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/VisualC.zip b/VisualC.zip
index d6fdf3979818dd71a7da6c7ace2a7cd4c97b402d..36421da5d35cac904309e8c52c4c157764abdb67 100644
GIT binary patch
delta 1027
zcmZ4A$-beJoiD(fnT3l11eWLJ8&2et74TA>>F5i@p%p9)6Bs8lPQEB1H8E6%1td24
zAdlF_ZXOmeXY*{9t;}%Y%~>45Q1OF29z1aI>6!Z(`8FF$ZfE8M+2Czj^Y_-|k1|Re
zAbUV~vb3yJ&e|)<9zJHPJO$Kpv_rf09C29kKtVWc?G^D`+he4iI7%|V2V84EG4KD+
zV~;x%c`mIyasB5ShUtHkBKIXRd2IB&B=fAt*pYi$L&EDC<z+nAf+w!)3fr70arRj0
zspU7-5*NJvxwiFMj)&W!G|lwM3uMLWAKq$BmUs{<c;01SOVYuF9=YRn4<4LwO$hDW
zbGqSNoXYy1|J}{I?-g*KaL<Tg;CHB*xAZmZ9T(k8yVe@T=W|av_aG~L$&+L6>`zVb
zkm!{W*)4JZ&~51}Gn1>I9M$N^+uo%$^+&sW$(l6g+l}Hk<(RfkRFeC4vRu~V%4*?9
z9?LW<_6n8kTVillSZw`^Id`|L&7Wp;vO?*wVb9)+Yp3fbeLPU6R~oA3v*z;TI5}tL
z)a<g!OXM``m(<+zH-7dxa^2KD%@Mv=-pu-*_I>%vs}{$bvV3!76fexF*}3SC=>qR%
zFBjNe-<p+lYUAm$^BpbmokHTrPk(9c>@PW0r1^6j-!#5*s~OKlYT^tIW^Utu7R*26
zZ055ktHURr6K@S#$@f88=kk_@3#tjHxH;u))77R(t^Bf@>Dlu7ebJuN<_61j+1&K$
z*1A`+^OVGnl?j)V4osTjb$$Kw!}?e4k8`lTdl!&<D#(Auj~`xB<{fMLRO)v6(#q8p
z>z$*SLX3C+4XM?g{$|_iSncU&YrjbSI;c|P@NVg^J>UMluijg0A`&y-;@gR>)e;8-
z4_{e!OYDe|{%iTI{F|Q|#B517{CLK@Ve77o=j^3ym)Em=tIqIeIoIE&zs@nV@SnZ+
zzmxF}&%fwD5K`XHXMVnW|FtLllmEz@L6V}Gf*XX<px^~&Y(A&J$qixM*8U^{W;I`Q
z*nZK0v7?Fwlvbz5?q<|x0j1IHJ-ZnVSr7?$`mz0t24I=#zxFfgG5(#dd4SQA$zEZ)
z!68P;>AeRS&6zr(oCyaRS*AY*iCjmBuuc|GWSj1AkkOQhMFXM<sLqvf@^t+}jEd90
zA7nIVd;(&}12y*_VoYXQY&m_xAx5?7QimCBnWs1~Oy1xiHof35qbc((Fh^wip2Li;
p%>Uy-G9r`p6U3+M9|6i%cEAMKCa>?{o!)nZQJT$fHzP2|0|1Yg#~=Uz

delta 1030
zcmdnc$-cgmoiD(fnT3l11l&EM^d|Dj3W$A<vAf~dU>{n+!Z3kxBID$X5>gXGWmrIB
zlMnKUZS3Y@0dqFbX4%RN7v7x35eyYS$m78S7oVQBpOJ5~q2zXE&Jy=1JsHE9(Kjc5
zlu_cS`4nRZ!jq+CrLyI!csftInQ|U#$zAFdI89=Mh)l|%Ra1XC{hpTX%+aWq%b!}?
z@#g3Je4BX^#~OTH_nk{;-SNfz>?cuChc4e!MKgl^T!Su%u*5!>He9-49@jRlsIzT}
zCeqh?{5Si0Io|#p&As;Kgq|tqB$iKJC@WU~_*QGO#Dh@5^Dg^Zk{lCz<c`-pcyPis
zA+&SPX@!}4J>n$)o3oeieJC`c|H2LixrQG$$*)=OxaeNmwbm#;pZiE!!B*{{s^stT
zsU9jlZhT#_J^2sc^1eE=(e_i4h|Bh9*Qs8AF7sQ3ZEk#fpgV`Z@s@`m|L-U5d@8T5
zau%utYwn5bOxfp?Fl)I<oN95^<!$eDQYU>1X-k%<UL36-edJN&+n86Yd{#tko*Xad
z%$$~8HF>F=X1#&k`^`PSYNlnYzE=nnHr@Sf@6ErdS*GVUE{GDAcIPlrk6$PBPfEpm
z)yoC8*SBURo!aPKe!in6zEep2xc4`wqwZFzJEzn{vwOE&%bqFbveRGjz;he_vta%i
z=O&*y8NR;htaxkCO1=;5I+wRJsCXaX)K{rEX=%LhO2Vb}Tr=j^|H@k$S>{)$@u|dE
zcU8sBqN#xeGZ$P=atNO0aee*s!}?e4k8`lTdl!&<D#%~x<HxBQw!N;0u15w<^NT%N
zEqhC7!K|Bam%qy1nX*0hZPd=3cZ;uI;8%OdT%>>X`PT3C_g}wVyzs%VBOBe<-960F
zC$-G%>NbUGm67pR?9NO(TySxo;Zb9K#%r(Ktm93p{Qh&i`F>#@#~gXy`!UU{9{s7G
z_Gj|`hI23D52(7;$>z-y|G(yB{N%s#W{{L<uHXh?G%9$38Jo{5aB@RfceFo=fLYC#
z9JXI_VC<-30cD2ial09{r*GTG$hUp^Zbo$$MEae6d_SWB3n=kU|Gl44kMYlRtpkjn
zOm+&>4G%F&PVYOwXwK9D<vcjRXw7sD!C{#!pvXSm@gSoq6SD?HJx~eDWLpiM=?j6P
zjFYAt9AZ?Q{^KB{IpbpxJD!nw`h-J_$xMqZr%yb@s5V{tFrzK=WCw=H8y&=^7anFb
zWxfgKh)mymn9-H_Upz=gWU@hm_;iCKK-r28m;l@44IRAG`;Rb6v-$331ZH{wdo91F

diff --git a/effect_position.c b/effect_position.c
index 9a952c2c..f55202fd 100644
--- a/effect_position.c
+++ b/effect_position.c
@@ -1179,10 +1179,10 @@ static Mix_EffectFunc_t get_position_effect_func(Uint16 format, int channels)
                                                  		_Eff_position_u8;
 	    		break;
 	    	    case 4:
-                        _Eff_position_u8_c4;
+                        f = _Eff_position_u8_c4;
 	    		break;
 	    	    case 6:
-                        _Eff_position_u8_c6;
+                        f = _Eff_position_u8_c6;
 	    		break;
 	    }
             break;
@@ -1195,10 +1195,10 @@ static Mix_EffectFunc_t get_position_effect_func(Uint16 format, int channels)
                                                  		_Eff_position_s8;
 	    		break;
 	    	    case 4:
-                        _Eff_position_s8_c4;
+                    f = _Eff_position_s8_c4;
 	    		break;
 	    	    case 6:
-                        _Eff_position_s8_c6;
+                    f = _Eff_position_s8_c6;
 	    		break;
 	    }
             break;
diff --git a/music.c b/music.c
index 949f14b5..473c0747 100644
--- a/music.c
+++ b/music.c
@@ -44,9 +44,6 @@
 #undef CMD_MUSIC
 #endif
 
-inline static void noop(const char *a, ...) {}
-#define debug noop
-
 #ifdef CMD_MUSIC
 #include "music_cmd.h"
 #endif
@@ -1245,29 +1242,23 @@ BOOL LMM_Seek(struct MREADER *mr,long to,int dir)
 {
 	int at;
 	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
-	debug("LMM_Seek(%p, %ld, %d) = ",mr,to,dir);
 	if(dir==SEEK_SET)
 		to+=lmmmr->offset;
 	at=SDL_RWseek(lmmmr->rw, to, dir);
-	debug("%d (%d)\n",at-lmmmr->offset, at<lmmmr->offset);
 	return at<lmmmr->offset;
 }
 long LMM_Tell(struct MREADER *mr)
 {
 	int at;
 	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
-	debug("LMM_Tell(%p) = ",mr);
 	at=SDL_RWtell(lmmmr->rw)-lmmmr->offset;
-	debug("%d\n",at);
 	return at;
 }
 BOOL LMM_Read(struct MREADER *mr,void *buf,size_t sz)
 {
 	int got;
 	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
-	debug("LMM_Read(%p,%p,%lu) = ",mr,buf,sz);
 	got=SDL_RWread(lmmmr->rw, buf, sz, 1);
-	debug("%d\n",got);
 	return got;
 }
 int LMM_Get(struct MREADER *mr)
@@ -1275,19 +1266,15 @@ int LMM_Get(struct MREADER *mr)
 	unsigned char c;
 	int i=EOF;
 	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
-	debug("LMM_Get(%p) = ",mr);
 	if(SDL_RWread(lmmmr->rw,&c,1,1))
 		i=c;
-	debug("%d\n",i);
 	return i;
 }
 BOOL LMM_Eof(struct MREADER *mr)
 {
 	int offset;
 	LMM_MREADER* lmmmr=(LMM_MREADER*)mr;
-	debug("LMM_Eof(%p) = ",mr);
 	offset=LMM_Tell(mr);
-	debug("%d\n", offset>=lmmmr->eof);
 	return offset>=lmmmr->eof;
 }
 MODULE *MikMod_LoadSongRW(SDL_RWops *rw, int maxchan)
@@ -1308,7 +1295,6 @@ MODULE *MikMod_LoadSongRW(SDL_RWops *rw, int maxchan)
 	lmmmr.eof=SDL_RWtell(rw);
 	SDL_RWseek(rw,lmmmr.offset,SEEK_SET);
 	m=Player_LoadGeneric((MREADER*)&lmmmr,maxchan,0);
-	debug("MikMod_LoadSongRW(%p,%d) = %p\n",rw,maxchan,m);
 	return m;
 }
 # endif
diff --git a/timidity/playmidi.c b/timidity/playmidi.c
index d40452e5..876692af 100644
--- a/timidity/playmidi.c
+++ b/timidity/playmidi.c
@@ -485,7 +485,7 @@ static void kill_others(int i)
 
 static void clone_voice(Instrument *ip, int v, MidiEvent *e, int clone_type, int variationbank)
 {
-  int w, k, played_note, chorus=0, reverb=0, milli;
+  int w, played_note, chorus=0, reverb=0, milli;
   int chan = voice[v].channel;
 
   if (clone_type == STEREO_CLONE) {
@@ -1450,7 +1450,7 @@ static void do_compute_data(uint32 count)
 	{
 	  if (!voice[i].sample_offset && voice[i].echo_delay_count)
 	    {
-		if (voice[i].echo_delay_count >= count) voice[i].echo_delay_count -= count;
+		if ((uint32)voice[i].echo_delay_count >= count) voice[i].echo_delay_count -= count;
 		else
 		  {
 	            mix_voice(buffer_pointer+voice[i].echo_delay_count, i, count-voice[i].echo_delay_count);