FXJ - Updated the mikmod support to MikMod 3.1.8

FXJ - Added Mix_HookMusicFinished() API function
libsdl-org · Dec 27, 1999 · 75033fb · 75033fb
1 parent e26675e
commit 75033fb
Show file tree

Hide file tree

Showing 34 changed files with 9,203 additions and 8,147 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,8 @@
 
+1.0.2:
+FXJ -	Updated the mikmod support to MikMod 3.1.8
+FXJ -	Added Mix_HookMusicFinished() API function
+
 1.0.1:
 SOL -	Added a post-mixing callback
 SP  -	A few music-related bugfixes
@@ -14,4 +18,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)
diff --git a/Makefile.am b/Makefile.am
@@ -1,15 +1,15 @@
 # Makefile.am for the SDL sample mixer library and players
 
-lib_LTLIBRARIES = libmixer.la
+lib_LTLIBRARIES = libSDLmixer.la
 
 SUBDIRS = @MUSIC_SUBDIRS@
 DIST_SUBIDRS = mikmod timidity
 
-libmixerincludedir = $(includedir)
-libmixerinclude_HEADERS =	\
+libSDLmixerincludedir = $(includedir)
+libSDLmixerinclude_HEADERS =	\
 	mixer.h
 
-libmixer_la_SOURCES =		\
+libSDLmixer_la_SOURCES =	\
 	mixer.c			\
 	music.c			\
 	music_cmd.c		\
@@ -29,12 +29,12 @@ else
 TIMIDITY_LIB =
 endif
 
-libmixer_la_LDFLAGS = 		\
+libSDLmixer_la_LDFLAGS = 		\
         -release $(LT_RELEASE)	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
+libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
 
 bin_PROGRAMS = playwave playmus
 
-playwave_LDADD = libmixer.la
-playmus_LDADD = libmixer.la
+playwave_LDADD = libSDLmixer.la
+playmus_LDADD = libSDLmixer.la
diff --git a/Makefile.in b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -87,30 +88,30 @@ SDL_CONFIG = @SDL_CONFIG@
 SDL_LIBS = @SDL_LIBS@
 VERSION = @VERSION@
 
-lib_LTLIBRARIES = libmixer.la
+lib_LTLIBRARIES = libSDLmixer.la
 
 SUBDIRS = @MUSIC_SUBDIRS@
 DIST_SUBIDRS = mikmod timidity
 
-libmixerincludedir = $(includedir)
-libmixerinclude_HEADERS =  	mixer.h
+libSDLmixerincludedir = $(includedir)
+libSDLmixerinclude_HEADERS =  	mixer.h
 
 
-libmixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
+libSDLmixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
 
 @USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
 @USE_MIKMOD_FALSE@MIKMOD_LIB = 
 @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
 @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
 
-libmixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libSDLmixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
+libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
 
 bin_PROGRAMS = playwave playmus
 
-playwave_LDADD = libmixer.la
-playmus_LDADD = libmixer.la
+playwave_LDADD = libSDLmixer.la
+playmus_LDADD = libSDLmixer.la
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -121,31 +122,31 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES = 
-@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES =  \
+@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = 
+@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
-@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES =  \
+@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES =  \
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
-@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES =  \
+@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
 @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
-libmixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
+libSDLmixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
 PROGRAMS =  $(bin_PROGRAMS)
 
 playwave_SOURCES = playwave.c
 playwave_OBJECTS =  playwave.o
-playwave_DEPENDENCIES =  libmixer.la
+playwave_DEPENDENCIES =  libSDLmixer.la
 playwave_LDFLAGS = 
 playmus_SOURCES = playmus.c
 playmus_OBJECTS =  playmus.o
-playmus_DEPENDENCIES =  libmixer.la
+playmus_DEPENDENCIES =  libSDLmixer.la
 playmus_LDFLAGS = 
 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)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(libmixerinclude_HEADERS)
+HEADERS =  $(libSDLmixerinclude_HEADERS)
 
 DIST_COMMON =  README COPYING Makefile.am Makefile.in acinclude.m4 \
 aclocal.m4 config.guess config.sub configure configure.in install-sh \
@@ -158,8 +159,8 @@ TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/mixer.P .deps/music.P .deps/music_cmd.P \
 .deps/playmus.P .deps/playwave.P .deps/wavestream.P
-SOURCES = $(libmixer_la_SOURCES) playwave.c playmus.c
-OBJECTS = $(libmixer_la_OBJECTS) playwave.o playmus.o
+SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c
+OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o
 
 all: all-redirect
 .SUFFIXES:
@@ -236,8 +237,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS)
+libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS)
 
 mostlyclean-binPROGRAMS:
 
@@ -253,8 +254,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -272,19 +273,19 @@ playmus: $(playmus_OBJECTS) $(playmus_DEPENDENCIES)
 	@rm -f playmus
 	$(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS)
 
-install-libmixerincludeHEADERS: $(libmixerinclude_HEADERS)
+install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libmixerincludedir)
-	@list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir)
+	@list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
 	done
 
-uninstall-libmixerincludeHEADERS:
+uninstall-libSDLmixerincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(libmixerincludedir)/$$p; \
+	list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -422,7 +423,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -482,23 +483,23 @@ installcheck: installcheck-recursive
 install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
 install-exec: install-exec-recursive
 
-install-data-am: install-libmixerincludeHEADERS
+install-data-am: install-libSDLmixerincludeHEADERS
 install-data: install-data-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
 uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
-		uninstall-libmixerincludeHEADERS
+		uninstall-libSDLmixerincludeHEADERS
 uninstall: uninstall-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
-		$(DESTDIR)$(libmixerincludedir)
+		$(DESTDIR)$(libSDLmixerincludedir)
 
 
 mostlyclean-generic:
@@ -548,8 +549,8 @@ distclean-compile clean-compile maintainer-clean-compile \
 mostlyclean-libtool distclean-libtool clean-libtool \
 maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
-install-binPROGRAMS uninstall-libmixerincludeHEADERS \
-install-libmixerincludeHEADERS install-data-recursive \
+install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \
+install-libSDLmixerincludeHEADERS install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \

diff --git a/README b/README
@@ -6,7 +6,7 @@ It supports 4 channels of 16 bit stereo audio, plus a single channel
 of music, mixed by the popular MikMod MOD, Timidity MIDI and SMPEG MP3
 libraries.
 
-See the header file mixer.h and the examples playwave.c and playmus.c
+See the header file SDL_mixer.h and the examples playwave.c and playmus.c
 for documentation on this mixer library.
 
 The mixer can currently load Microsoft WAVE files as audio samples
@@ -19,7 +19,8 @@ so if playing regular WAVE files sound great, but playing MIDI files
 sound choppy, try using 8-bit audio, mono audio, or lower frequencies.
 
 To play MIDI files, you'll need to get a complete set of GUS patches
-from:  http://www.devolution.com/~slouken/SDL/timidity/timidity.tar.gz
+from:
+http://www.devolution.com/~slouken/SDL/projectx/mixer/timidity/timidity.tar.gz
 and unpack them in /usr/local/lib under UNIX, and C:\ under Win32.
 
 You may add panning, reverb, echo, whatever, but if you do, please

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -627,6 +627,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]