stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

sdl2: Bump up mixer support to SDL2_mixxer

Browse source
This commit is contained in:
Ronald Kinard 2014-03-20 21:54:02 -05:00
parent 3839c2fd58
commit 4c636123a4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sdl2/Makefile.cfg
View file

@ -105,7 +105,7 @@ ifdef NOMIXER
else else
i_sound_o=$(OBJDIR)/mixer_sound.o i_sound_o=$(OBJDIR)/mixer_sound.o
OPTS+=-DHAVE_MIXER OPTS+=-DHAVE_MIXER
SDL_LDFLAGS+=-lSDL_mixer SDL_LDFLAGS+=-lSDL2_mixer
endif endif
ifdef SDL_TTF ifdef SDL_TTF
@ -121,7 +121,7 @@ endif
ifdef SDL_NET ifdef SDL_NET
OPTS+=-DHAVE_SDLNET OPTS+=-DHAVE_SDLNET
SDL_LDFLAGS+=-lSDL_net SDL_LDFLAGS+=-lSDL2_net
endif endif
ifdef SDLMAIN ifdef SDLMAIN

4
src/sdl2/mixer_sound.c
View file

@ -617,7 +617,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
} }
#endif #endif
music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len)); music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
if (!music) if (!music)
{ {
CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError()); CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
@ -778,7 +778,7 @@ void I_SetMIDIMusicVolume(UINT8 volume)
INT32 I_RegisterSong(void *data, size_t len) INT32 I_RegisterSong(void *data, size_t len)
{ {
music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len)); music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
if (!music) if (!music)
{ {
CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError()); CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());