OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- renamed a few functions in the public interface of ZMusic.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-30 02:40:22 +02:00
commit 2bc72f38cc
6 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/sound/music/i_music.cpp
View file

@ -192,7 +192,7 @@ static void SetupGenMidi()
auto genmidi = data.Read();
if (genmidi.Size() < 8 + 175 * 36 || memcmp(genmidi.Data(), "#OPL_II#", 8)) return;
SetGenMidi(genmidi.Data()+8);
ZMusic_SetGenMidi(genmidi.Data()+8);
}
static void SetupWgOpn()
@ -203,7 +203,7 @@ static void SetupWgOpn()
return;
}
FMemLump data = Wads.ReadLump(lump);
SetWgOpn(data.GetMem(), (uint32_t)data.GetSize());
ZMusic_SetWgOpn(data.GetMem(), (uint32_t)data.GetSize());
}
static void SetupDMXGUS()
@ -214,7 +214,7 @@ static void SetupDMXGUS()
return;
}
FMemLump data = Wads.ReadLump(lump);
SetDmxGus(data.GetMem(), (uint32_t)data.GetSize());
ZMusic_SetDmxGus(data.GetMem(), (uint32_t)data.GetSize());
}
@ -249,9 +249,10 @@ void I_InitMusic (void)
callbacks.OpenSoundFont = mus_openSoundFont;
callbacks.DumbVorbisDecode = dumb_decode_vorbis_;
SetCallbacks(&callbacks);
ZMusic_SetCallbacks(&callbacks);
SetupGenMidi();
SetupDMXGUS();
SetupWgOpn();
}

4
src/sound/s_music.cpp
View file

@ -478,7 +478,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
id = strtoul (more+1, nullptr, 16);
}
S_StopMusic (true);
mus_playing.handle = I_RegisterCDSong (track, id);
mus_playing.handle = ZMusic_OpenCDSong (track, id);
}
else
{
@ -542,7 +542,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
try
{
auto mreader = new FileReaderMusicInterface(reader);
mus_playing.handle = I_RegisterSong(mreader, devp? (EMidiDevice)devp->device : MDEV_DEFAULT, devp? devp->args.GetChars() : "");
mus_playing.handle = ZMusic_OpenSong(mreader, devp? (EMidiDevice)devp->device : MDEV_DEFAULT, devp? devp->args.GetChars() : "");
}
catch (const std::runtime_error& err)
{