zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace a few "#ifdef GEKKO" statements added for the Wii port with "#ifdef HAVE_VORBIS" like they should have been in the first place. Allows jaudiolib to build without Ogg support on platforms other than the Wii if desired. 

git-svn-id: https://svn.eduke32.com/eduke32@2719 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-06-02 00:01:36 +00:00
parent b9c553624b
commit cbbaec7694
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
polymer/eduke32/source/jaudiolib/src/fx_man.c
View File

@ -938,11 +938,11 @@ int32_t FX_PlayAuto(char *ptr, uint32_t length, int32_t pitchoffset, int32_t vol
case 'R'+('I'<<8)+('F'<<16)+('F'<<24): case 'R'+('I'<<8)+('F'<<16)+('F'<<24):
handle = MV_PlayWAV(ptr, length, pitchoffset, vol, left, right, priority, callbackval); handle = MV_PlayWAV(ptr, length, pitchoffset, vol, left, right, priority, callbackval);
break; break;
#ifdef HAVE_VORBIS
case 'O'+('g'<<8)+('g'<<16)+('S'<<24): case 'O'+('g'<<8)+('g'<<16)+('S'<<24):
#ifndef GEKKO
handle = MV_PlayVorbis(ptr, length, pitchoffset, vol, left, right, priority, callbackval); handle = MV_PlayVorbis(ptr, length, pitchoffset, vol, left, right, priority, callbackval);
#endif
break; break;
#endif
default: default:
switch (LITTLE32(*(int32_t *)(ptr + 8))) switch (LITTLE32(*(int32_t *)(ptr + 8)))
{ {
@ -995,11 +995,11 @@ int32_t FX_PlayLoopedAuto(char *ptr, uint32_t length, int32_t loopstart, int32_t
case 'R'+('I'<<8)+('F'<<16)+('F'<<24): case 'R'+('I'<<8)+('F'<<16)+('F'<<24):
handle = MV_PlayLoopedWAV(ptr, length, loopstart, loopend, pitchoffset, vol, left, right, priority, callbackval); handle = MV_PlayLoopedWAV(ptr, length, loopstart, loopend, pitchoffset, vol, left, right, priority, callbackval);
break; break;
#ifdef HAVE_VORBIS
case 'O'+('g'<<8)+('g'<<16)+('S'<<24): case 'O'+('g'<<8)+('g'<<16)+('S'<<24):
#ifndef GEKKO
handle = MV_PlayLoopedVorbis(ptr, length, loopstart, loopend, pitchoffset, vol, left, right, priority, callbackval); handle = MV_PlayLoopedVorbis(ptr, length, loopstart, loopend, pitchoffset, vol, left, right, priority, callbackval);
#endif
break; break;
#endif
default: default:
switch (LITTLE32(*(int32_t *)(ptr + 8))) switch (LITTLE32(*(int32_t *)(ptr + 8)))
{ {
@ -1038,11 +1038,11 @@ int32_t FX_PlayAuto3D(char *ptr, uint32_t length, int32_t pitchoffset, int32_t a
case 'R'+('I'<<8)+('F'<<16)+('F'<<24): // RIFF case 'R'+('I'<<8)+('F'<<16)+('F'<<24): // RIFF
handle = MV_PlayWAV3D(ptr, length, pitchoffset, angle, distance, priority, callbackval); handle = MV_PlayWAV3D(ptr, length, pitchoffset, angle, distance, priority, callbackval);
break; break;
#ifdef HAVE_VORBIS
case 'O'+('g'<<8)+('g'<<16)+('S'<<24): // OggS case 'O'+('g'<<8)+('g'<<16)+('S'<<24): // OggS
#ifndef GEKKO
handle = MV_PlayVorbis3D(ptr, length, pitchoffset, angle, distance, priority, callbackval); handle = MV_PlayVorbis3D(ptr, length, pitchoffset, angle, distance, priority, callbackval);
#endif
break; break;
#endif
default: default:
switch (LITTLE32(*(int32_t *)(ptr + 8))) switch (LITTLE32(*(int32_t *)(ptr + 8)))
{ {

4
polymer/eduke32/source/jaudiolib/src/multivoc.c
View File

@ -334,7 +334,7 @@ static void MV_StopVoice(VoiceNode *voice)
RestoreInterrupts(); RestoreInterrupts();
#ifndef GEKKO #ifdef HAVE_VORBIS
if (voice->wavetype == Vorbis) if (voice->wavetype == Vorbis)
MV_ReleaseVorbisVoice(voice); MV_ReleaseVorbisVoice(voice);
#endif #endif
@ -458,7 +458,7 @@ static void MV_ServiceVoc(void)
//MV_StopVoice( voice ); //MV_StopVoice( voice );
LL_Remove(voice, next, prev); LL_Remove(voice, next, prev);
LL_Add((VoiceNode*) &VoicePool, voice, next, prev); LL_Add((VoiceNode*) &VoicePool, voice, next, prev);
#ifndef GEKKO #ifdef HAVE_VORBIS
if (voice->wavetype == Vorbis) if (voice->wavetype == Vorbis)
MV_ReleaseVorbisVoice(voice); MV_ReleaseVorbisVoice(voice);
#endif #endif