Add some UNREFERENCED_PARAMETER for when Vorbis or FLAC are disabled.

git-svn-id: https://svn.eduke32.com/eduke32@5554 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-01-12 10:31:05 +00:00
parent c1f67576a4
commit 4c7a460d6a
4 changed files with 49 additions and 0 deletions

View file

@ -1029,6 +1029,8 @@ void G_LoadLookups(void)
////////// //////////
#ifdef FORMAT_UPGRADE_ELIGIBLE
static int32_t S_TryFormats(char * const testfn, char * const fn_suffix, char const searchfirst) static int32_t S_TryFormats(char * const testfn, char * const fn_suffix, char const searchfirst)
{ {
#ifdef HAVE_FLAC #ifdef HAVE_FLAC
@ -1137,3 +1139,5 @@ int32_t S_OpenAudio(const char *fn, char searchfirst, uint8_t const ismusic)
Bfree(testfn); Bfree(testfn);
return origfp; return origfp;
} }
#endif

View file

@ -127,7 +127,12 @@ extern void G_LoadLookups(void);
////////// //////////
#if defined HAVE_FLAC || defined HAVE_VORBIS
# define FORMAT_UPGRADE_ELIGIBLE
extern int32_t S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic); extern int32_t S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic);
#else
# define S_OpenAudio(fn, searchfirst, ismusic) kopen4loadfrommod(fn, searchfirst)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -671,6 +671,17 @@ void MV_ReleaseFLACVoice(VoiceNode *voice)
int32_t MV_PlayFLAC(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend, int32_t pitchoffset, int32_t MV_PlayFLAC(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend, int32_t pitchoffset,
int32_t vol, int32_t left, int32_t right, int32_t priority, uint32_t callbackval) int32_t vol, int32_t left, int32_t right, int32_t priority, uint32_t callbackval)
{ {
UNREFERENCED_PARAMETER(ptr);
UNREFERENCED_PARAMETER(ptrlength);
UNREFERENCED_PARAMETER(loopstart);
UNREFERENCED_PARAMETER(loopend);
UNREFERENCED_PARAMETER(pitchoffset);
UNREFERENCED_PARAMETER(vol);
UNREFERENCED_PARAMETER(left);
UNREFERENCED_PARAMETER(right);
UNREFERENCED_PARAMETER(priority);
UNREFERENCED_PARAMETER(callbackval);
MV_Printf("MV_PlayFLAC: FLAC support not included in this binary.\n"); MV_Printf("MV_PlayFLAC: FLAC support not included in this binary.\n");
return -1; return -1;
} }
@ -678,6 +689,15 @@ int32_t MV_PlayFLAC(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t lo
int32_t MV_PlayFLAC3D(char *ptr, uint32_t ptrlength, int32_t loophow, int32_t pitchoffset, int32_t angle, int32_t MV_PlayFLAC3D(char *ptr, uint32_t ptrlength, int32_t loophow, int32_t pitchoffset, int32_t angle,
int32_t distance, int32_t priority, uint32_t callbackval) int32_t distance, int32_t priority, uint32_t callbackval)
{ {
UNREFERENCED_PARAMETER(ptr);
UNREFERENCED_PARAMETER(ptrlength);
UNREFERENCED_PARAMETER(loophow);
UNREFERENCED_PARAMETER(pitchoffset);
UNREFERENCED_PARAMETER(angle);
UNREFERENCED_PARAMETER(distance);
UNREFERENCED_PARAMETER(priority);
UNREFERENCED_PARAMETER(callbackval);
MV_Printf("MV_PlayFLAC: FLAC support not included in this binary.\n"); MV_Printf("MV_PlayFLAC: FLAC support not included in this binary.\n");
return -1; return -1;
} }

View file

@ -481,6 +481,17 @@ void MV_ReleaseVorbisVoice( VoiceNode * voice )
int32_t MV_PlayVorbis(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend, int32_t pitchoffset, int32_t MV_PlayVorbis(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend, int32_t pitchoffset,
int32_t vol, int32_t left, int32_t right, int32_t priority, uint32_t callbackval) int32_t vol, int32_t left, int32_t right, int32_t priority, uint32_t callbackval)
{ {
UNREFERENCED_PARAMETER(ptr);
UNREFERENCED_PARAMETER(ptrlength);
UNREFERENCED_PARAMETER(loopstart);
UNREFERENCED_PARAMETER(loopend);
UNREFERENCED_PARAMETER(pitchoffset);
UNREFERENCED_PARAMETER(vol);
UNREFERENCED_PARAMETER(left);
UNREFERENCED_PARAMETER(right);
UNREFERENCED_PARAMETER(priority);
UNREFERENCED_PARAMETER(callbackval);
MV_Printf("MV_PlayVorbis: OggVorbis support not included in this binary.\n"); MV_Printf("MV_PlayVorbis: OggVorbis support not included in this binary.\n");
return -1; return -1;
} }
@ -488,6 +499,15 @@ int32_t MV_PlayVorbis(char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t
int32_t MV_PlayVorbis3D(char *ptr, uint32_t ptrlength, int32_t loophow, int32_t pitchoffset, int32_t angle, int32_t MV_PlayVorbis3D(char *ptr, uint32_t ptrlength, int32_t loophow, int32_t pitchoffset, int32_t angle,
int32_t distance, int32_t priority, uint32_t callbackval) int32_t distance, int32_t priority, uint32_t callbackval)
{ {
UNREFERENCED_PARAMETER(ptr);
UNREFERENCED_PARAMETER(ptrlength);
UNREFERENCED_PARAMETER(loophow);
UNREFERENCED_PARAMETER(pitchoffset);
UNREFERENCED_PARAMETER(angle);
UNREFERENCED_PARAMETER(distance);
UNREFERENCED_PARAMETER(priority);
UNREFERENCED_PARAMETER(callbackval);
MV_Printf("MV_PlayVorbis: OggVorbis support not included in this binary.\n"); MV_Printf("MV_PlayVorbis: OggVorbis support not included in this binary.\n");
return -1; return -1;
} }