stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 06:00:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong

Browse source
This commit is contained in:
mazmazz 2018-08-24 13:12:14 -04:00
parent bf61dbb6e2
commit bf4e7d2dd6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lua_baselib.c
View file

@ -2333,7 +2333,7 @@ static int lib_sMusicInfo(lua_State *L)
} }
if (!player || P_IsLocalPlayer(player)) if (!player || P_IsLocalPlayer(player))
{ {
char *mname; char mname[7];
UINT16 mflags; UINT16 mflags;
boolean looping; boolean looping;
if (S_MusicInfo(mname, &mflags, &looping)) if (S_MusicInfo(mname, &mflags, &looping))

2
src/win32/win_snd.c
View file

@ -675,7 +675,6 @@ boolean I_LoadSong(char *data, size_t len)
fmt.decodebuffersize = (44100 * 2) / 35; fmt.decodebuffersize = (44100 * 2) / 35;
fmt.pcmreadcallback = GMEReadCallback; fmt.pcmreadcallback = GMEReadCallback;
fmt.userdata = gme; fmt.userdata = gme;
FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER | (looping ? FMOD_LOOP_NORMAL : 0), &fmt, &music_stream));
return true; return true;
} }
#endif #endif
@ -772,6 +771,7 @@ boolean I_PlaySong(boolean looping)
{ {
gme_start_track(gme, 0); gme_start_track(gme, 0);
current_track = 0; current_track = 0;
FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER | (looping ? FMOD_LOOP_NORMAL : 0), &fmt, &music_stream));
FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel)); FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0)); FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
FMR(FMOD_Channel_SetPriority(music_channel, 0)); FMR(FMOD_Channel_SetPriority(music_channel, 0));