Initial work on SDL Mixer X

src/p_enemy.c

@@ -11378,7 +11378,7 @@ void A_ConnectToGround(mobj_t *actor)
 	mobj_t *work;
 	fixed_t workz;
 	fixed_t workh;
-	INT8 dir;
+	SINT8 dir;
 	angle_t ang;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -11636,4 +11636,4 @@ void A_CheckFlags2(mobj_t *actor)
 
 	if (actor->flags2 & locvar1)
 		P_SetMobjState(actor, (statenum_t)locvar2);
-}
+}

src/sdl/Makefile.cfg

@@ -80,7 +80,7 @@ ifdef NOMIXER
 else
 	i_sound_o=$(OBJDIR)/mixer_sound.o
 	OPTS+=-DHAVE_MIXER
-	SDL_LDFLAGS+=-lSDL2_mixer
+	SDL_LDFLAGS+=-lSDL2_mixer_ext
 endif
 
 ifdef SDL_TTF

src/sdl/mixer_sound.c

@@ -20,7 +20,7 @@
 #pragma warning(default : 4214 4244)
 #endif
 
-#include "SDL_mixer.h"
+#include <SDL2/SDL_mixer_ext.h>
 
 /* This is the version number macro for the current SDL_mixer version: */
 #ifndef SDL_MIXER_COMPILEDVERSION
@@ -686,6 +686,9 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 
 	if (loop_point != 0.0f)
 		Mix_HookMusicFinished(music_loop);
+
+	CONS_Printf("X Song length %.4f\n", Mix_GetMusicTotalTime(music));
+
 	return true;
 }
 
@@ -773,6 +776,7 @@ boolean I_SetSongTrack(int track)
 
 FUNCMATH void I_InitMIDIMusic(void)
 {
+	Mix_SetMidiPlayer(MIDI_Fluidsynth);
 }
 
 void I_ShutdownMIDIMusic(void)

src/sdl/sdl_sound.c

@@ -32,7 +32,7 @@
 #endif
 
 #ifdef HAVE_MIXER
-#include "SDL_mixer.h"
+#include <SDL2/SDL_mixer_ext.h>
 /* This is the version number macro for the current SDL_mixer version: */
 #ifndef SDL_MIXER_COMPILEDVERSION
 #define SDL_MIXER_COMPILEDVERSION \