* Sam Lantinga Tue Feb 1 13:25:44 PST 2000

- Added Visual C++ project file * Markus Oberhumer Tue Feb 1 13:23:11 PST 2000 - Cleaned up code for compiling with Visual C++ - Don't hang in Mix_HaltMusic() if the music is paused
libsdl-org · Feb 1, 2000 · 192b070 · 192b070
1 parent aeb90c1
commit 192b070
Show file tree

Hide file tree

Showing 28 changed files with 108 additions and 2,219 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 
 1.0.4:
+* Sam Lantinga Tue Feb  1 13:25:44 PST 2000
+- Added Visual C++ project file
+* Markus Oberhumer Tue Feb  1 13:23:11 PST 2000
+- Cleaned up code for compiling with Visual C++
+- Don't hang in Mix_HaltMusic() if the music is paused
 * Sam Lantinga Fri Jan 28 08:54:56 PST 2000
 - Fixed looping WAVE chunks that are not aligned on sample boundaries
 
@@ -12,8 +17,8 @@
 1.0.2:
 * Sam Lantinga Fri Jan 14 11:06:56 PST 2000
 - Made the CHANGELOG entries Y2K compliant. :)
-FXJ -	Updated the mikmod support to MikMod 3.1.8
-FXJ -	Added Mix_HookMusicFinished() API function
+MFX -	Updated the mikmod support to MikMod 3.1.8
+MFX -	Added Mix_HookMusicFinished() API function
 
 1.0.1:
 SOL -	Added a post-mixing callback
@@ -30,4 +35,4 @@ SP  -   Added expiration delay for samples
 Initial Key:
 SOL - Sam Lantinga (hercules@lokigames.com)
 SP  - Stephane Peter (megastep@lokigames.com)
-FXJ - Markus Oberhumer (markus.oberhumer@jk.uni-linz.ac.at)
+MFX - Markus Oberhumer (markus.oberhumer@jk.uni-linz.ac.at)
diff --git a/Makefile.am b/Makefile.am
@@ -2,6 +2,8 @@
 
 lib_LTLIBRARIES = libSDL_mixer.la
 
+EXTRA_DIST = CHANGES VisualC.zip
+
 SUBDIRS = @MUSIC_SUBDIRS@
 DIST_SUBIDRS = mikmod timidity
 

diff --git a/Makefile.in b/Makefile.in
@@ -89,6 +89,9 @@ VERSION = @VERSION@
 
 lib_LTLIBRARIES = libSDL_mixer.la
 
+EXTRA_DIST =  	CHANGES				autogen.sh
+
+
 SUBDIRS = @MUSIC_SUBDIRS@
 DIST_SUBIDRS = mikmod timidity
 
@@ -103,9 +106,6 @@ libSDL_mixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wa
 @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
 @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
 
-EXTRA_DIST =  	CHANGES				autogen.sh
-
-
 libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)

diff --git a/VisualC.zip b/VisualC.zip
diff --git a/mikmod/Makefile.am b/mikmod/Makefile.am
@@ -10,7 +10,6 @@ libmikmod_la_SOURCES =		\
 	load_xm.c		\
 	mdreg.c			\
 	mdriver.c		\
-	mdulaw.c		\
 	mikmod.h		\
 	mikmod_build.h		\
 	mikmod_internals.h	\

diff --git a/mikmod/Makefile.in b/mikmod/Makefile.in
@@ -87,7 +87,7 @@ VERSION = @VERSION@
 
 noinst_LTLIBRARIES = libmikmod.la
 
-libmikmod_la_SOURCES =  	drv_nos.c			drv_sdl.c			load_it.c			load_mod.c			load_s3m.c			load_xm.c			mdreg.c				mdriver.c			mdulaw.c			mikmod.h			mikmod_build.h			mikmod_internals.h		mloader.c			mlreg.c				mlutil.c			mmalloc.c			mmerror.c			mmio.c				mplayer.c			munitrk.c			mwav.c				npertab.c			sloader.c			virtch.c			virtch2.c			virtch_common.c
+libmikmod_la_SOURCES =  	drv_nos.c			drv_sdl.c			load_it.c			load_mod.c			load_s3m.c			load_xm.c			mdreg.c				mdriver.c			mikmod.h			mikmod_build.h			mikmod_internals.h		mloader.c			mlreg.c				mlutil.c			mmalloc.c			mmerror.c			mmio.c				mplayer.c			munitrk.c			mwav.c				npertab.c			sloader.c			virtch.c			virtch2.c			virtch_common.c
 
 
 EXTRA_DIST = AUTHORS COPYING.LESSER README
@@ -103,9 +103,9 @@ LIBS = @LIBS@
 libmikmod_la_LDFLAGS = 
 libmikmod_la_LIBADD = 
 libmikmod_la_OBJECTS =  drv_nos.lo drv_sdl.lo load_it.lo load_mod.lo \
-load_s3m.lo load_xm.lo mdreg.lo mdriver.lo mdulaw.lo mloader.lo \
-mlreg.lo mlutil.lo mmalloc.lo mmerror.lo mmio.lo mplayer.lo munitrk.lo \
-mwav.lo npertab.lo sloader.lo virtch.lo virtch2.lo virtch_common.lo
+load_s3m.lo load_xm.lo mdreg.lo mdriver.lo mloader.lo mlreg.lo \
+mlutil.lo mmalloc.lo mmerror.lo mmio.lo mplayer.lo munitrk.lo mwav.lo \
+npertab.lo sloader.lo virtch.lo virtch2.lo virtch_common.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -120,10 +120,10 @@ TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/drv_nos.P .deps/drv_sdl.P .deps/load_it.P \
 .deps/load_mod.P .deps/load_s3m.P .deps/load_xm.P .deps/mdreg.P \
-.deps/mdriver.P .deps/mdulaw.P .deps/mloader.P .deps/mlreg.P \
-.deps/mlutil.P .deps/mmalloc.P .deps/mmerror.P .deps/mmio.P \
-.deps/mplayer.P .deps/munitrk.P .deps/mwav.P .deps/npertab.P \
-.deps/sloader.P .deps/virtch.P .deps/virtch2.P .deps/virtch_common.P
+.deps/mdriver.P .deps/mloader.P .deps/mlreg.P .deps/mlutil.P \
+.deps/mmalloc.P .deps/mmerror.P .deps/mmio.P .deps/mplayer.P \
+.deps/munitrk.P .deps/mwav.P .deps/npertab.P .deps/sloader.P \
+.deps/virtch.P .deps/virtch2.P .deps/virtch_common.P
 SOURCES = $(libmikmod_la_SOURCES)
 OBJECTS = $(libmikmod_la_OBJECTS)
 

diff --git a/mikmod/load_it.c b/mikmod/load_it.c
@@ -406,7 +406,7 @@ static void IT_LoadMidiConfiguration(MREADER* modreader)
 				filtersettings[i].filter=(midiline[5]-'0')|0x80;
 				dat=(midiline[6])?(midiline[6]-'0'):0;
 				if(midiline[7])dat=(dat<<4)|(midiline[7]-'0');
-				filtersettings[i].inf=dat;
+				filtersettings[i].inf=(UBYTE)dat;
 			}
 		}
 	} else { /* use default information */
@@ -538,7 +538,7 @@ BOOL IT_Load(BOOL curious)
 		return 0;
 	}
 
-	poslookupcnt=mh->ordnum;
+	poslookupcnt=(UBYTE)mh->ordnum;
 	S3MIT_CreateOrders(curious);
 
 	if(!(paraptr=(ULONG*)_mm_malloc((mh->insnum+mh->smpnum+of.numpat)*

diff --git a/mikmod/load_mod.c b/mikmod/load_mod.c
@@ -241,7 +241,7 @@ static BOOL ML_LoadPatterns(void)
 
 	for(t=0;t<of.numpat;t++) {
 		/* 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].b=_mm_read_UBYTE(modreader);
 			patbuf[s].c=_mm_read_UBYTE(modreader);

diff --git a/mikmod/load_s3m.c b/mikmod/load_s3m.c
@@ -294,7 +294,7 @@ BOOL S3M_Load(BOOL curious)
 		return 0;
 	}
 
-	poslookupcnt=mh->ordnum;
+	poslookupcnt=(UBYTE)mh->ordnum;
 	S3MIT_CreateOrders(curious);
 
 	if(!(paraptr=(UWORD*)_mm_malloc((of.numins+of.numpat)*sizeof(UWORD))))

diff --git a/mikmod/load_xm.c b/mikmod/load_xm.c
@@ -614,8 +614,8 @@ BOOL XM_Load(BOOL curious)
 	}
 
 	/* set module variables */
-	of.initspeed = mh->tempo;
-	of.inittempo = mh->bpm;
+	of.initspeed = (UBYTE)mh->tempo;
+	of.inittempo = (UBYTE)mh->bpm;
 	strncpy(tracker,mh->trackername,20);tracker[20]=0;
 	for(t=20;(tracker[t]<=' ')&&(t>=0);t--) tracker[t]=0;