Attachment #31901 for bug #51852

View | Details | Raw Unified | Return to bug 51852
Collapse All | Expand All




			if ( ! Player_Active() ) {
				return(-1);
			}
//			Player_SetSynchroValue(i);
			return 0;
			break;
#endif

			if ( ! Player_Active() ) {
				return(-1);
			}
			return -1;
//			return Player_GetSynchroValue();
			break;
#endif
		    default:

#endif
#ifdef MOD_MUSIC
	MikMod_Exit();
//	MikMod_UnregisterAllLoaders();
//	MikMod_UnregisterAllDrivers();
#endif
}


Lines 108-114 Link Here

(-)SDL_mixer-1.2.5.orig/configure.in (-1 / +1 lines)
108	, enable_music_mod=yes)	108	, enable_music_mod=yes)
109	if test x$enable_music_mod = xyes; then	109	if test x$enable_music_mod = xyes; then
110	CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"	110	CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
111	MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"	111	SYSTEM_LIBS="$SYSTEM_LIBS -lmikmod"
112	fi	112	fi
113	AC_ARG_ENABLE(music-midi,	113	AC_ARG_ENABLE(music-midi,
114	[ --enable-music-midi enable MIDI music via timidity [default=yes]],	114	[ --enable-music-midi enable MIDI music via timidity [default=yes]],




lib_LTLIBRARIES = libSDL_mixer.la

SUBDIRS = @MUSIC_SUBDIRS@
DIST_SUBDIRS = timidity native_midi native_midi_gpl

libSDL_mixerincludedir = $(includedir)/SDL
libSDL_mixerinclude_HEADERS =	\

	effects_internal.c	\
	effects_internal.h

if USE_MIKMOD
MIKMOD_LIB = mikmod/libmikmod.la
else
MIKMOD_LIB =
endif
if USE_TIMIDITY
TIMIDITY_LIB = timidity/libtimidity.la
else

libSDL_mixer_la_LDFLAGS = 		\
	-release $(LT_RELEASE)	\
	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_mixer_la_LIBADD = $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@

noinst_PROGRAMS = playwave playmus


Return to bug 51852

Lines 1066-1072 Link Here

(-)SDL_mixer-1.2.5.orig/music.c (-4 / +5 lines)
1066	if ( ! Player_Active() ) {	1066	if ( ! Player_Active() ) {
1067	return(-1);	1067	return(-1);
1068	}	1068	}
1069	Player_SetSynchroValue(i);	1069	// Player_SetSynchroValue(i);
1070	return 0;	1070	return 0;
1071	break;	1071	break;
1072	#endif	1072	#endif
Lines 1088-1094 Link Here
1088	if ( ! Player_Active() ) {	1088	if ( ! Player_Active() ) {
1089	return(-1);	1089	return(-1);
1090	}	1090	}
1091	return Player_GetSynchroValue();	1091	return -1;
		1092	// return Player_GetSynchroValue();
1092	break;	1093	break;
1093	#endif	1094	#endif
1094	default:	1095	default:
Lines 1110-1117 Link Here
1110	#endif	1111	#endif
1111	#ifdef MOD_MUSIC	1112	#ifdef MOD_MUSIC
1112	MikMod_Exit();	1113	MikMod_Exit();
1113	MikMod_UnregisterAllLoaders();	1114	// MikMod_UnregisterAllLoaders();
1114	MikMod_UnregisterAllDrivers();	1115	// MikMod_UnregisterAllDrivers();
1115	#endif	1116	#endif
1116	}	1117	}
1117		1118

Lines 3-9 Link Here

(-)SDL_mixer-1.2.5.orig/Makefile.am (-7 / +2 lines)
3	lib_LTLIBRARIES = libSDL_mixer.la	3	lib_LTLIBRARIES = libSDL_mixer.la
4		4
5	SUBDIRS = @MUSIC_SUBDIRS@	5	SUBDIRS = @MUSIC_SUBDIRS@
6	DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl	6	DIST_SUBDIRS = timidity native_midi native_midi_gpl
7		7
8	libSDL_mixerincludedir = $(includedir)/SDL	8	libSDL_mixerincludedir = $(includedir)/SDL
9	libSDL_mixerinclude_HEADERS = \	9	libSDL_mixerinclude_HEADERS = \
Lines 29-39 Link Here
29	effects_internal.c \	29	effects_internal.c \
30	effects_internal.h	30	effects_internal.h
31		31
32	if USE_MIKMOD
33	MIKMOD_LIB = mikmod/libmikmod.la
34	else
35	MIKMOD_LIB =
36	endif
37	if USE_TIMIDITY	32	if USE_TIMIDITY
38	TIMIDITY_LIB = timidity/libtimidity.la	33	TIMIDITY_LIB = timidity/libtimidity.la
39	else	34	else
Lines 62-68 Link Here
62	libSDL_mixer_la_LDFLAGS = \	57	libSDL_mixer_la_LDFLAGS = \
63	-release $(LT_RELEASE) \	58	-release $(LT_RELEASE) \
64	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	59	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
65	libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@	60	libSDL_mixer_la_LIBADD = $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
66		61
67	noinst_PROGRAMS = playwave playmus	62	noinst_PROGRAMS = playwave playmus
68		63