Skip to content

Commit

Permalink
Fixed various issues with the new SDL_mixer code (thanks Ozkan!)
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Oct 17, 2017
1 parent 7d308b4 commit bb0320d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 44 deletions.
4 changes: 2 additions & 2 deletions VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj
View file
Expand Up @@ -170,7 +170,7 @@
<ClCompile Include="..\..\music_mad.c" />
<ClCompile Include="..\..\music_mikmod.c" />
<ClCompile Include="..\..\music_ogg.c" />
<ClCompile Include="..\..\wavestream.c" />
<ClCompile Include="..\..\music_wav.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\dynamic_flac.h" />
Expand All @@ -190,7 +190,7 @@
<ClInclude Include="..\..\music_mikmod.h" />
<ClInclude Include="..\..\music_ogg.h" />
<ClInclude Include="..\..\SDL_mixer.h" />
<ClInclude Include="..\..\wavestream.h" />
<ClInclude Include="..\..\music_wav.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\VisualC-WinRT\WinPhone80_VS2012\SDL-WinPhone80.vcxproj">
Expand Down
4 changes: 2 additions & 2 deletions VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters
View file
Expand Up @@ -21,7 +21,7 @@
<ClCompile Include="..\..\music_mad.c" />
<ClCompile Include="..\..\music_mikmod.c" />
<ClCompile Include="..\..\music_ogg.c" />
<ClCompile Include="..\..\wavestream.c" />
<ClCompile Include="..\..\music_wav.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\dynamic_flac.h" />
Expand All @@ -41,6 +41,6 @@
<ClInclude Include="..\..\music_mikmod.h" />
<ClInclude Include="..\..\music_ogg.h" />
<ClInclude Include="..\..\SDL_mixer.h" />
<ClInclude Include="..\..\wavestream.h" />
<ClInclude Include="..\..\music_wav.h" />
</ItemGroup>
</Project>
22 changes: 2 additions & 20 deletions configure
View file
Expand Up @@ -11086,20 +11086,12 @@ case "$host" in
fi
;;
*)
SOURCES=""
EXE=""
;;
esac

# Standard C sources
SOURCES="$SOURCES \
$srcdir/effect_position.c \
$srcdir/effect_stereoreverse.c \
$srcdir/effects_internal.c \
$srcdir/load_aiff.c \
$srcdir/load_voc.c \
$srcdir/mixer.c \
$srcdir/music.c"
SOURCES=`ls $srcdir/*.c | fgrep -v playwave.c | fgrep -v playmus.c`

base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`

Expand Down Expand Up @@ -11722,7 +11714,6 @@ done
enable_music_cmd=no
fi
if test "x$enable_music_cmd" != xno; then
SOURCES="$SOURCES $srcdir/music_cmd.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
fi
fi
Expand All @@ -11735,7 +11726,6 @@ else
fi

if test x$enable_music_wave = xyes; then
SOURCES="$SOURCES $srcdir/wavestream.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
fi

Expand Down Expand Up @@ -11944,7 +11934,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_modplug.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
echo "-- dynamic libmodplug -> $modplug_lib"
Expand Down Expand Up @@ -12076,7 +12065,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_mikmod.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
echo "-- dynamic libmikmod -> $mikmod_lib"
Expand Down Expand Up @@ -12227,7 +12215,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
Expand Down Expand Up @@ -12337,7 +12324,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisidec -> $ogg_lib"
Expand Down Expand Up @@ -12415,7 +12401,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisfile -> $ogg_lib"
Expand Down Expand Up @@ -12551,7 +12536,6 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_flac.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
echo "-- dynamic libFLAC -> $flac_lib"
Expand Down Expand Up @@ -12891,7 +12875,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libmad" >&5
$as_echo "$have_libmad" >&6; }
if test x$have_libmad = xyes; then
SOURCES="$SOURCES $srcdir/music_mad.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
else
Expand Down Expand Up @@ -12934,7 +12917,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libmpg123" >&5
$as_echo "$have_libmpg123" >&6; }
if test x$have_libmpg123 = xyes; then
SOURCES="$SOURCES $srcdir/music_mpg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
else
Expand All @@ -12944,7 +12926,7 @@ $as_echo "$as_me: WARNING: *** Unable to find mpg123 library (https://www.mpg123
fi

if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
SOURCES="$SOURCES $srcdir/load_mp3.c"
:
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5
$as_echo "$as_me: WARNING: MP3 support disabled" >&2;}
Expand Down
22 changes: 2 additions & 20 deletions configure.in
View file
Expand Up @@ -130,20 +130,12 @@ case "$host" in
fi
;;
*)
SOURCES=""
EXE=""
;;
esac

# Standard C sources
SOURCES="$SOURCES \
$srcdir/effect_position.c \
$srcdir/effect_stereoreverse.c \
$srcdir/effects_internal.c \
$srcdir/load_aiff.c \
$srcdir/load_voc.c \
$srcdir/mixer.c \
$srcdir/music.c"
SOURCES=`ls $srcdir/*.c | fgrep -v playwave.c | fgrep -v playmus.c`

dnl set this to use on systems that use lib64 instead of lib
base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
Expand Down Expand Up @@ -229,7 +221,6 @@ if test "x$enable_music_cmd" != xno; then
enable_music_cmd=no
fi
if test "x$enable_music_cmd" != xno; then
SOURCES="$SOURCES $srcdir/music_cmd.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
fi
fi
Expand All @@ -238,7 +229,6 @@ AC_ARG_ENABLE([music-wave],
AC_HELP_STRING([--enable-music-wave], [enable streaming WAVE music [[default=yes]]]),
[], [enable_music_wave=yes])
if test x$enable_music_wave = xyes; then
SOURCES="$SOURCES $srcdir/wavestream.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
fi

Expand Down Expand Up @@ -277,7 +267,6 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_modplug.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
echo "-- dynamic libmodplug -> $modplug_lib"
Expand Down Expand Up @@ -345,7 +334,6 @@ return 1;
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_mikmod.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
echo "-- dynamic libmikmod -> $mikmod_lib"
Expand Down Expand Up @@ -430,7 +418,6 @@ AC_HELP_STRING([--enable-music-midi-fluidsynth-shared], [dynamically load FluidS
fi
;;
esac
SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
Expand Down Expand Up @@ -479,7 +466,6 @@ if test x$enable_music_ogg = xyes; then
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisidec -> $ogg_lib"
Expand Down Expand Up @@ -509,7 +495,6 @@ if test x$enable_music_ogg = xyes; then
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisfile -> $ogg_lib"
Expand Down Expand Up @@ -569,7 +554,6 @@ if test x$enable_music_flac = xyes; then
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_flac.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
echo "-- dynamic libFLAC -> $flac_lib"
Expand Down Expand Up @@ -635,7 +619,6 @@ if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_mad_gpl = xyes; then
])
AC_MSG_RESULT($have_libmad)
if test x$have_libmad = xyes; then
SOURCES="$SOURCES $srcdir/music_mad.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
else
Expand All @@ -657,7 +640,6 @@ if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_mpg123 = xyes; then
])
AC_MSG_RESULT($have_libmpg123)
if test x$have_libmpg123 = xyes; then
SOURCES="$SOURCES $srcdir/music_mpg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
else
Expand All @@ -666,7 +648,7 @@ if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_mpg123 = xyes; then
fi

if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
SOURCES="$SOURCES $srcdir/load_mp3.c"
:
else
AC_MSG_WARN([MP3 support disabled])
fi
Expand Down
2 changes: 2 additions & 0 deletions music.c
View file
Expand Up @@ -299,9 +299,11 @@ int open_music(const SDL_AudioSpec *spec)
int i;
SDL_bool use_native_midi = SDL_FALSE;

#ifdef MUSIC_MID_NATIVE
if (SDL_GetHintBoolean("SDL_NATIVE_MUSIC", SDL_FALSE) && native_midi_detect()) {
use_native_midi = SDL_TRUE;
}
#endif

music_spec = *spec;
for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) {
Expand Down

0 comments on commit bb0320d

Please sign in to comment.