zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

jaudiolib: Modify OGG looping code to support the LOOP_LENGTH tag (where internally LOOP_START + LOOP_LENGTH = LOOP_END), and all three tags without the underscore.

Browse source 
As a note, libvorbis' vorbis_comment_query() checks for tags case-insensitively.

(This was done to support the output of vgmstream's "test.exe -g".)

git-svn-id: https://svn.eduke32.com/eduke32@3273 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-12-13 02:33:23 +00:00
parent ae59db2390
commit a2f585fcfb
1 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
polymer/eduke32/source/jaudiolib/src/vorbis.c
View file

@ -410,23 +410,61 @@ int32_t MV_PlayLoopedVorbis
vorbis_comment * vc = ov_comment(&vd->vf, 0); vorbis_comment * vc = ov_comment(&vd->vf, 0);
if (vc != NULL) if (vc != NULL)
{ {
char *vc_loopstart = vorbis_comment_query(vc, "LOOP_START", 0); int loopTagCount;
static const char *loopStartTags[] = {
"LOOP_START",
"LOOPSTART"
};
char *vc_loopstart = NULL;
for (loopTagCount = 0; loopTagCount < 2 && vc_loopstart == NULL; ++loopTagCount)
vc_loopstart = vorbis_comment_query(vc, loopStartTags[loopTagCount], 0);
if (vc_loopstart != NULL) if (vc_loopstart != NULL)
{ {
ogg_int64_t ov_loopstart = atol(vc_loopstart); ogg_int64_t ov_loopstart = atol(vc_loopstart);
if (ov_loopstart >= 0) if (ov_loopstart >= 0) // a loop starting at 0 is valid
{ {
char *vc_loopend = vorbis_comment_query(vc, "LOOP_END", 0); static const char *loopEndTags[] = {
"LOOP_END",
"LOOPEND"
};
char *vc_loopend = NULL;
voice->LoopStart = (char *) (intptr_t) ov_loopstart; voice->LoopStart = (char *) (intptr_t) ov_loopstart;
voice->LoopSize = 1; voice->LoopSize = 1;
for (loopTagCount = 0; loopTagCount < 2 && vc_loopend == NULL; ++loopTagCount)
vc_loopend = vorbis_comment_query(vc, loopEndTags[loopTagCount], 0);
if (vc_loopend != NULL) if (vc_loopend != NULL)
{ {
ogg_int64_t ov_loopend = atol(vc_loopend); ogg_int64_t ov_loopend = atol(vc_loopend);
if (ov_loopend > 0) if (ov_loopend > 0) // a loop ending at 0 is invalid
voice->LoopEnd = (char *) (intptr_t) ov_loopend; voice->LoopEnd = (char *) (intptr_t) ov_loopend;
} }
else
{
static const char *loopLengthTags[] = {
"LOOP_LENGTH",
"LOOPLENGTH"
};
char *vc_looplength = NULL;
for (loopTagCount = 0; loopTagCount < 2 && vc_looplength == NULL; ++loopTagCount)
vc_looplength = vorbis_comment_query(vc, loopLengthTags[loopTagCount], 0);
if (vc_looplength != NULL)
{
ogg_int64_t ov_looplength = atol(vc_looplength);
if (ov_looplength > 0) // a loop of length 0 is invalid
voice->LoopEnd = (char *) (intptr_t) (ov_looplength + ov_loopstart);
}
}
} }
} }
} }