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

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)
{