zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the CDDA check to not catch all RIFF files.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-30 19:57:47 +02:00
parent a76cdd0946
commit 9bb8da2533
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/zmusic/zmusic/zmusic.cpp
View file

@ -221,21 +221,10 @@ MusInfo *ZMusic_OpenSong (MusicIO::FileInterface *reader, EMidiDevice device, co
} }
// Check for CDDA "format" // Check for CDDA "format"
else if (id[0] == (('R') | (('I') << 8) | (('F') << 16) | (('F') << 24))) else if ((id[0] == MAKE_ID('R', 'I', 'F', 'F') && id[2] == MAKE_ID('C', 'D', 'D', 'A')))
{ {
uint32_t subid; // This is a CDDA file
info = CDDA_OpenSong(reader);
reader->seek(8, SEEK_CUR);
if (reader->read(&subid, 4) == 4)
{
reader->seek(-12, SEEK_CUR);
if (subid == (('C') | (('D') << 8) | (('D') << 16) | (('A') << 24)))
{
// This is a CDDA file
info = CDDA_OpenSong(reader);
}
}
} }
// Check for various raw OPL formats // Check for various raw OPL formats