zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some functionality-conserving cleanup of jaudiolib code.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4288 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-01 16:19:57 +00:00
parent 7c26c180cd
commit f7035da876
3 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
polymer/eduke32/source/jaudiolib/include/fx_man.h
View file

@ -79,6 +79,7 @@ int32_t FX_SetPan( int32_t handle, int32_t vol, int32_t left, int32_t right );
int32_t FX_SetPitch( int32_t handle, int32_t pitchoffset ); int32_t FX_SetPitch( int32_t handle, int32_t pitchoffset );
int32_t FX_SetFrequency( int32_t handle, int32_t frequency ); int32_t FX_SetFrequency( int32_t handle, int32_t frequency );
#if 0
int32_t FX_PlayVOC( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t FX_PlayVOC( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t vol, int32_t left, int32_t right,
int32_t priority, uint32_t callbackval ); int32_t priority, uint32_t callbackval );
int32_t FX_PlayLoopedVOC( char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend, int32_t FX_PlayLoopedVOC( char *ptr, uint32_t ptrlength, int32_t loopstart, int32_t loopend,
@ -93,6 +94,13 @@ int32_t FX_PlayVOC3D( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_
int32_t priority, uint32_t callbackval ); int32_t priority, uint32_t callbackval );
int32_t FX_PlayWAV3D( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t angle, int32_t distance, int32_t FX_PlayWAV3D( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t angle, int32_t distance,
int32_t priority, uint32_t callbackval ); int32_t priority, uint32_t callbackval );
int32_t FX_PlayRaw( char *ptr, uint32_t length, unsigned rate,
int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
uint32_t callbackval );
int32_t FX_PlayLoopedRaw( char *ptr, uint32_t length, char *loopstart,
char *loopend, unsigned rate, int32_t pitchoffset, int32_t vol, int32_t left,
int32_t right, int32_t priority, uint32_t callbackval );
#endif
int32_t FX_PlayAuto( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t FX_PlayAuto( char *ptr, uint32_t ptrlength, int32_t pitchoffset, int32_t vol, int32_t left, int32_t right,
int32_t priority, uint32_t callbackval ); int32_t priority, uint32_t callbackval );
@ -102,12 +110,6 @@ int32_t FX_PlayLoopedAuto( char *ptr, uint32_t ptrlength, int32_t loopstart, int
int32_t FX_PlayAuto3D( char *ptr, uint32_t ptrlength, int32_t loophow, int32_t pitchoffset, int32_t angle, int32_t distance, int32_t FX_PlayAuto3D( 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 priority, uint32_t callbackval );
int32_t FX_PlayRaw( char *ptr, uint32_t length, unsigned rate,
int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
uint32_t callbackval );
int32_t FX_PlayLoopedRaw( char *ptr, uint32_t length, char *loopstart,
char *loopend, unsigned rate, int32_t pitchoffset, int32_t vol, int32_t left,
int32_t right, int32_t priority, uint32_t callbackval );
int32_t FX_Pan3D( int32_t handle, int32_t angle, int32_t distance ); int32_t FX_Pan3D( int32_t handle, int32_t angle, int32_t distance );
int32_t FX_SoundActive( int32_t handle ); int32_t FX_SoundActive( int32_t handle );
int32_t FX_SoundsPlaying( void ); int32_t FX_SoundsPlaying( void );

6
polymer/eduke32/source/jaudiolib/src/fx_man.c
View file

@ -506,7 +506,7 @@ int32_t FX_SetFrequency
return status; return status;
} }
#if 0
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
Function: FX_PlayVOC Function: FX_PlayVOC
@ -747,7 +747,7 @@ int32_t FX_PlayLoopedRaw
return handle; return handle;
} }
#endif
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
Function: FX_Pan3D Function: FX_Pan3D
@ -922,7 +922,7 @@ static wavedata FX_AutoDetectFormat(const char *ptr, uint32_t length)
int32_t FX_PlayAuto(char *ptr, uint32_t length, int32_t pitchoffset, int32_t vol, int32_t FX_PlayAuto(char *ptr, uint32_t length, int32_t pitchoffset, int32_t vol,
int32_t left, int32_t right, int32_t priority, uint32_t callbackval) int32_t left, int32_t right, int32_t priority, uint32_t callbackval)
{ {
return FX_PlayLoopedAuto(ptr, length, -1, -1, pitchoffset, vol, left, right, priority, callbackval);; return FX_PlayLoopedAuto(ptr, length, -1, -1, pitchoffset, vol, left, right, priority, callbackval);
} }
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------

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

@ -47,7 +47,7 @@ static void MV_ServiceVoc( void );
static VoiceNode *MV_GetVoice( int32_t handle ); static VoiceNode *MV_GetVoice( int32_t handle );
static int16_t *MV_GetVolumeTable( int32_t vol ); static const int16_t *MV_GetVolumeTable( int32_t vol );
static void MV_CalcVolume( int32_t MaxLevel ); static void MV_CalcVolume( int32_t MaxLevel );
static void MV_CalcPanTable( void ); static void MV_CalcPanTable( void );
@ -88,9 +88,7 @@ static int32_t MV_SwapLeftRight = FALSE;
static int32_t MV_RequestedMixRate; static int32_t MV_RequestedMixRate;
int32_t MV_MixRate; int32_t MV_MixRate;
static int32_t MV_BuffShift; //static int32_t MV_BuffShift;
static int32_t MV_TotalMemory;
static int32_t MV_BufferEmpty[ MV_NUMBEROFBUFFERS ]; static int32_t MV_BufferEmpty[ MV_NUMBEROFBUFFERS ];
char *MV_MixBuffer[ MV_NUMBEROFBUFFERS + 1 ]; char *MV_MixBuffer[ MV_NUMBEROFBUFFERS + 1 ];
@ -804,16 +802,9 @@ int32_t MV_SetFrequency
volume. volume.
---------------------------------------------------------------------*/ ---------------------------------------------------------------------*/
static int16_t *MV_GetVolumeTable(int32_t vol) static const int16_t *MV_GetVolumeTable(int32_t vol)
{ {
int32_t volume; return MV_VolumeTable[MIX_VOLUME(vol)];
int16_t *table;
volume = MIX_VOLUME(vol);
table = (int16_t *) &MV_VolumeTable[ volume ];
return table;
} }
@ -1304,7 +1295,7 @@ static int32_t MV_SetMixMode
MV_Bits = 16; MV_Bits = 16;
} }
MV_BuffShift = 7 + MV_Channels; // MV_BuffShift = 7 + MV_Channels;
MV_SampleSize = sizeof(MONO8) * MV_Channels; MV_SampleSize = sizeof(MONO8) * MV_Channels;
if (MV_Bits == 8) if (MV_Bits == 8)
@ -1314,7 +1305,7 @@ static int32_t MV_SetMixMode
else else
{ {
MV_Silence = SILENCE_16BIT; MV_Silence = SILENCE_16BIT;
MV_BuffShift += 1; // MV_BuffShift += 1;
MV_SampleSize *= 2; MV_SampleSize *= 2;
} }
@ -1483,21 +1474,17 @@ static void MV_CalcVolume(int32_t MaxVolume)
static void MV_CalcPanTable(void) static void MV_CalcPanTable(void)
{ {
int32_t level; int32_t angle, distance;
int32_t angle; const int32_t HalfAngle = MV_NUMPANPOSITIONS / 2;
int32_t distance; const int32_t QuarterAngle = HalfAngle / 2;
int32_t HalfAngle;
int32_t ramp;
HalfAngle = (MV_NUMPANPOSITIONS / 2);
for (distance = 0; distance <= MV_MAXVOLUME; distance++) for (distance = 0; distance <= MV_MAXVOLUME; distance++)
{ {
level = (255 * (MV_MAXVOLUME - distance)) / MV_MAXVOLUME; const int32_t level = (255 * (MV_MAXVOLUME - distance)) / MV_MAXVOLUME;
for (angle = 0; angle <= HalfAngle / 2; angle++)
for (angle = 0; angle <= QuarterAngle; angle++)
{ {
ramp = level - ((level * angle) / const int32_t ramp = level - (level * angle) / QuarterAngle;
(MV_NUMPANPOSITIONS / 4));
MV_PanTable[ angle ][ distance ].left = ramp; MV_PanTable[ angle ][ distance ].left = ramp;
MV_PanTable[ HalfAngle - angle ][ distance ].left = ramp; MV_PanTable[ HalfAngle - angle ][ distance ].left = ramp;
@ -1601,6 +1588,7 @@ int32_t MV_Init
int32_t status; int32_t status;
int32_t buffer; int32_t buffer;
int32_t index; int32_t index;
int32_t totalmem;
if (MV_Installed) if (MV_Installed)
{ {
@ -1625,9 +1613,9 @@ int32_t MV_Init
// by 0x84597CA: S_SoundStartup (sounds.c:62) // by 0x84597CA: S_SoundStartup (sounds.c:62)
// by 0x80D7869: app_main (game.c:10378) // by 0x80D7869: app_main (game.c:10378)
// by 0x870C9C0: main (sdlayer.c:222) // by 0x870C9C0: main (sdlayer.c:222)
MV_TotalMemory = Voices * sizeof(VoiceNode) + sizeof(HARSH_CLIP_TABLE_8) + MV_TOTALBUFFERSIZE + 2; totalmem = Voices * sizeof(VoiceNode) + sizeof(HARSH_CLIP_TABLE_8) + MV_TOTALBUFFERSIZE + 2;
ptr = (char *) calloc(1, MV_TotalMemory); ptr = (char *) calloc(1, totalmem);
if (!ptr) if (!ptr)
{ {
MV_SetErrorCode(MV_NoMem); MV_SetErrorCode(MV_NoMem);
@ -1669,7 +1657,6 @@ int32_t MV_Init
free(MV_Voices); free(MV_Voices);
MV_Voices = NULL; MV_Voices = NULL;
MV_HarshClipTable = NULL; MV_HarshClipTable = NULL;
MV_TotalMemory = 0;
MV_SetErrorCode(status); MV_SetErrorCode(status);
return MV_Error; return MV_Error;
@ -1743,7 +1730,6 @@ int32_t MV_Shutdown(void)
// Free any voices we allocated // Free any voices we allocated
free(MV_Voices); free(MV_Voices);
MV_Voices = NULL; MV_Voices = NULL;
MV_TotalMemory = 0;
LL_Reset((VoiceNode*) &VoiceList, next, prev); LL_Reset((VoiceNode*) &VoiceList, next, prev);
LL_Reset((VoiceNode*) &VoicePool, next, prev); LL_Reset((VoiceNode*) &VoicePool, next, prev);