zdoom/zmusic
0
0
Fork 0
mirror of https://github.com/ZDoom/ZMusic.git synced 2024-11-23 20:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added more loop tag labels as used by EDuke32's sound engine.

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-11 20:02:29 +01:00
parent bd138d248e
commit 92563245ce
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
source/streamsources/music_libsndfile.cpp
View file

@ -203,6 +203,10 @@ static void ParseVorbisComments(MusicIO::FileInterface *fr, uint32_t *start, zmu
return;
size_t count = vc_data[0] | (vc_data[1]<<8) | (vc_data[2]<<16) | (vc_data[3]<<24);
zmusic_bool loopass = false;
uint32_t looplen = 0;
bool endfound = false;
for(size_t i = 0; i < count; i++)
{
// Each comment is a 32LE integer for the comment length, followed by
@ -224,10 +228,42 @@ static void ParseVorbisComments(MusicIO::FileInterface *fr, uint32_t *start, zmu
return;
strdat[length] = 0;
if(strnicmp(strdat, "LOOP_START=", 11) == 0)
S_ParseTimeTag(strdat + 11, startass, start);
else if(strnicmp(strdat, "LOOP_END=", 9) == 0)
S_ParseTimeTag(strdat + 9, endass, end);
static const char* loopStartTags[] = { "LOOP_START=", "LOOPSTART=", "LOOP=" };
static const char* loopEndTags[] = { "LOOP_END=", "LOOPEND=" };
static const char* loopLengthTags[] = { "LOOP_LENGTH", "LOOPLENGTH" };
for (auto tag : loopStartTags)
{
if (!strnicmp(strdat, tag, strlen(tag)))
{
S_ParseTimeTag(strdat + 11, startass, start);
break;
}
}
for (auto tag : loopEndTags)
{
if (!strnicmp(strdat, tag, strlen(tag)))
{
S_ParseTimeTag(strdat + 11, endass, end);
endfound = true;
break;
}
}
for (auto tag : loopLengthTags)
{
if (!strnicmp(strdat, tag, strlen(tag)))
{
S_ParseTimeTag(strdat + 11, &loopass, &looplen);
*end += *start;
break;
}
}
}
// Use loop length only if no end defined.
if (!endfound && looplen && loopass == *startass)
{
*endass = loopass;
*end = *start + looplen;
}
}