zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

trivial stylistic changes continued: upcase all macro constants and make

Browse source 
MV_MaxVolume into one again.

git-svn-id: https://svn.eduke32.com/eduke32@2099 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-11-01 22:02:14 +00:00
parent 2da13064c1
commit a9278e1977
3 changed files with 63 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
polymer/eduke32/source/jaudiolib/src/_multivc.h
View file

@ -55,17 +55,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define T_RIGHTQUIET 32 #define T_RIGHTQUIET 32
#define T_DEFAULT T_SIXTEENBIT_STEREO #define T_DEFAULT T_SIXTEENBIT_STEREO
#define MV_MaxPanPosition 127 #define MV_MAXPANPOSITION 127 /* formerly 31 */
#define MV_NumPanPositions ( MV_MaxPanPosition + 1 ) #define MV_NUMPANPOSITIONS ( MV_MAXPANPOSITION + 1 )
#define MV_MaxTotalVolume 255 #define MV_MAXTOTALVOLUME 255
//#define MV_MaxVolume 63 #define MV_MAXVOLUME 255 /* formerly 63 */
#define MV_NumVoices 8 #define MV_NUMVOICES 8
// mirrors FX_MUSIC_PRIORITY from fx_man.h // mirrors FX_MUSIC_PRIORITY from fx_man.h
#define MV_MUSIC_PRIORITY INT_MAX #define MV_MUSIC_PRIORITY INT_MAX
#define MIX_VOLUME( volume ) \ #define MIX_VOLUME( volume ) \
( ( max( 0, min( ( volume ), 255 ) ) * ( MV_MaxVolume + 1 ) ) >> 8 ) ( ( max( 0, min( ( volume ), 255 ) ) * ( MV_MAXVOLUME + 1 ) ) >> 8 )
// ( ( max( 0, min( ( volume ), 255 ) ) ) >> 2 ) // ( ( max( 0, min( ( volume ), 255 ) ) ) >> 2 )
#define STEREO 1 #define STEREO 1
@ -86,12 +86,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SILENCE_8BIT 0x80808080 #define SILENCE_8BIT 0x80808080
//#define SILENCE_16BIT_PAS 0 //#define SILENCE_16BIT_PAS 0
#define MixBufferSize 256 #define MV_MIXBUFFERSIZE 256
#define MV_NUMBEROFBUFFERS 16
#define MV_TOTALBUFFERSIZE ( MV_MIXBUFFERSIZE * MV_NUMBEROFBUFFERS )
#define NumberOfBuffers 16 //#define PI 3.1415926536
#define TotalBufferSize ( MixBufferSize * NumberOfBuffers )
#define PI 3.1415926536
typedef enum typedef enum
{ {
@ -219,12 +218,11 @@ typedef struct
typedef MONO8 VOLUME8[ 256 ]; typedef MONO8 VOLUME8[ 256 ];
typedef MONO16 VOLUME16[ 256 ]; typedef MONO16 VOLUME16[ 256 ];
extern Pan MV_PanTable[ MV_NumPanPositions ][ 255 + 1 ]; extern Pan MV_PanTable[ MV_NUMPANPOSITIONS ][ MV_MAXVOLUME + 1 ];
extern int32_t MV_ErrorCode; extern int32_t MV_ErrorCode;
extern int32_t MV_Installed; extern int32_t MV_Installed;
extern int32_t MV_MaxVolume;
extern int32_t MV_MixRate; extern int32_t MV_MixRate;
typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ]; typedef char HARSH_CLIP_TABLE_8[ MV_NUMVOICES * 256 ];
#define MV_SetErrorCode( status ) \ #define MV_SetErrorCode( status ) \
MV_ErrorCode = ( status ); MV_ErrorCode = ( status );

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

@ -100,20 +100,17 @@ static int32_t MV_ReverbLevel;
static int32_t MV_ReverbDelay; static int32_t MV_ReverbDelay;
static VOLUME16 *MV_ReverbTable = NULL; static VOLUME16 *MV_ReverbTable = NULL;
//static int16_t MV_VolumeTable[ MV_MaxVolume + 1 ][ 256 ]; static int16_t MV_VolumeTable[ MV_MAXVOLUME + 1 ][ 256 ];
static int16_t MV_VolumeTable[ 255 + 1 ][ 256 ]; Pan MV_PanTable[ MV_NUMPANPOSITIONS ][ MV_MAXVOLUME + 1 ];
//static Pan MV_PanTable[ MV_NumPanPositions ][ MV_MaxVolume + 1 ];
Pan MV_PanTable[ MV_NumPanPositions ][ 255 + 1 ];
int32_t MV_Installed = FALSE; int32_t MV_Installed = FALSE;
static int32_t MV_TotalVolume = MV_MaxTotalVolume; static int32_t MV_TotalVolume = MV_MAXTOTALVOLUME;
static int32_t MV_MaxVoices = 1; static int32_t MV_MaxVoices = 1;
static int32_t MV_BufferSize = MixBufferSize; static int32_t MV_BufferSize = MV_MIXBUFFERSIZE;
static int32_t MV_BufferLength; static int32_t MV_BufferLength;
static int32_t MV_NumberOfBuffers = NumberOfBuffers; static int32_t MV_NumberOfBuffers = MV_NUMBEROFBUFFERS;
static int32_t MV_MixMode = MONO_8BIT; static int32_t MV_MixMode = MONO_8BIT;
static int32_t MV_Channels = 1; static int32_t MV_Channels = 1;
@ -129,8 +126,8 @@ static int32_t MV_BuffShift;
static int32_t MV_TotalMemory; static int32_t MV_TotalMemory;
static int32_t MV_BufferEmpty[ NumberOfBuffers ]; static int32_t MV_BufferEmpty[ MV_NUMBEROFBUFFERS ];
char *MV_MixBuffer[ NumberOfBuffers + 1 ]; char *MV_MixBuffer[ MV_NUMBEROFBUFFERS + 1 ];
static VoiceNode *MV_Voices = NULL; static VoiceNode *MV_Voices = NULL;
@ -138,14 +135,12 @@ static volatile VoiceNode VoiceList;
static volatile VoiceNode VoicePool; static volatile VoiceNode VoicePool;
static int32_t MV_MixPage = 0; static int32_t MV_MixPage = 0;
static int32_t MV_VoiceHandle = MV_MinVoiceHandle; static int32_t MV_VoiceHandle = MV_MINVOICEHANDLE;
void (*MV_Printf)(const char *fmt, ...) = NULL; void (*MV_Printf)(const char *fmt, ...) = NULL;
static void (*MV_CallBackFunc)(uint32_t) = NULL; static void (*MV_CallBackFunc)(uint32_t) = NULL;
static void (*MV_MixFunction)(VoiceNode *voice, int32_t buffer); static void (*MV_MixFunction)(VoiceNode *voice, int32_t buffer);
int32_t MV_MaxVolume = 255;
char *MV_HarshClipTable; char *MV_HarshClipTable;
char *MV_MixDestination; char *MV_MixDestination;
int16_t *MV_LeftVolume; int16_t *MV_LeftVolume;
@ -249,7 +244,7 @@ static void MV_Mix(VoiceNode *voice,int32_t buffer)
if (voice->length == 0 && (!voice->GetSound || voice->GetSound(voice) != KeepPlaying)) if (voice->length == 0 && (!voice->GetSound || voice->GetSound(voice) != KeepPlaying))
return; return;
length = MixBufferSize; length = MV_MIXBUFFERSIZE;
FixedPointBufferSize = voice->FixedPointBufferSize; FixedPointBufferSize = voice->FixedPointBufferSize;
MV_MixDestination = MV_MixBuffer[ buffer ]; MV_MixDestination = MV_MixBuffer[ buffer ];
@ -697,8 +692,8 @@ static playbackstatus MV_GetNextVOCBlock(VoiceNode *voice)
voice->SamplingRate = samplespeed; voice->SamplingRate = samplespeed;
voice->RateScale = (voice->SamplingRate * voice->PitchScale) / MV_MixRate; voice->RateScale = (voice->SamplingRate * voice->PitchScale) / MV_MixRate;
// Multiply by MixBufferSize - 1 // Multiply by MV_MIXBUFFERSIZE - 1
voice->FixedPointBufferSize = (voice->RateScale * MixBufferSize) - voice->FixedPointBufferSize = (voice->RateScale * MV_MIXBUFFERSIZE) -
voice->RateScale; voice->RateScale;
if (voice->LoopEnd != NULL) if (voice->LoopEnd != NULL)
@ -841,7 +836,7 @@ static VoiceNode *MV_GetVoice(int32_t handle)
{ {
VoiceNode *voice; VoiceNode *voice;
if (handle < MV_MinVoiceHandle || handle > MV_MaxVoices) if (handle < MV_MINVOICEHANDLE || handle > MV_MaxVoices)
{ {
if (MV_Printf) if (MV_Printf)
MV_Printf("MV_GetVoice(): bad handle (%d)!\n", handle); MV_Printf("MV_GetVoice(): bad handle (%d)!\n", handle);
@ -1019,7 +1014,7 @@ VoiceNode *MV_AllocVoice(int32_t priority)
voice = node; voice = node;
} }
if (priority >= voice->priority && voice != &VoiceList && voice->handle >= MV_MinVoiceHandle) if (priority >= voice->priority && voice != &VoiceList && voice->handle >= MV_MINVOICEHANDLE)
MV_Kill(voice->handle); MV_Kill(voice->handle);
if (LL_Empty(&VoicePool, next, prev)) if (LL_Empty(&VoicePool, next, prev))
@ -1034,13 +1029,13 @@ VoiceNode *MV_AllocVoice(int32_t priority)
LL_Remove(voice, next, prev); LL_Remove(voice, next, prev);
RestoreInterrupts(); RestoreInterrupts();
MV_VoiceHandle = MV_MinVoiceHandle; MV_VoiceHandle = MV_MINVOICEHANDLE;
// Find a free voice handle // Find a free voice handle
do do
{ {
if (++MV_VoiceHandle < MV_MinVoiceHandle || MV_VoiceHandle > MV_MaxVoices) if (++MV_VoiceHandle < MV_MINVOICEHANDLE || MV_VoiceHandle > MV_MaxVoices)
MV_VoiceHandle = MV_MinVoiceHandle; MV_VoiceHandle = MV_MINVOICEHANDLE;
} }
while (MV_VoicePlaying(MV_VoiceHandle)); while (MV_VoicePlaying(MV_VoiceHandle));
@ -1103,8 +1098,8 @@ static void MV_SetVoicePitch
voice->PitchScale = PITCH_GetScale(pitchoffset); voice->PitchScale = PITCH_GetScale(pitchoffset);
voice->RateScale = (rate * voice->PitchScale) / MV_MixRate; voice->RateScale = (rate * voice->PitchScale) / MV_MixRate;
// Multiply by MixBufferSize - 1 // Multiply by MV_MIXBUFFERSIZE - 1
voice->FixedPointBufferSize = (voice->RateScale * MixBufferSize) - voice->FixedPointBufferSize = (voice->RateScale * MV_MIXBUFFERSIZE) -
voice->RateScale; voice->RateScale;
} }
@ -1551,13 +1546,13 @@ int32_t MV_Pan3D
if (distance < 0) if (distance < 0)
{ {
distance = -distance; distance = -distance;
angle += MV_NumPanPositions / 2; angle += MV_NUMPANPOSITIONS / 2;
} }
volume = MIX_VOLUME(distance); volume = MIX_VOLUME(distance);
// Ensure angle is within 0 - 31 // Ensure angle is within 0 - 127
angle &= MV_MaxPanPosition; angle &= MV_MAXPANPOSITION;
left = MV_PanTable[ angle ][ volume ].left; left = MV_PanTable[ angle ][ volume ].left;
right = MV_PanTable[ angle ][ volume ].right; right = MV_PanTable[ angle ][ volume ].right;
@ -1605,7 +1600,7 @@ int32_t MV_GetMaxReverbDelay(void)
{ {
int32_t maxdelay; int32_t maxdelay;
maxdelay = MixBufferSize * MV_NumberOfBuffers; maxdelay = MV_MIXBUFFERSIZE * MV_NumberOfBuffers;
return maxdelay; return maxdelay;
} }
@ -1634,7 +1629,7 @@ void MV_SetReverbDelay(int32_t delay)
int32_t maxdelay; int32_t maxdelay;
maxdelay = MV_GetMaxReverbDelay(); maxdelay = MV_GetMaxReverbDelay();
MV_ReverbDelay = max(MixBufferSize, min(delay, maxdelay)); MV_ReverbDelay = max(MV_MIXBUFFERSIZE, min(delay, maxdelay));
MV_ReverbDelay *= MV_SampleSize; MV_ReverbDelay *= MV_SampleSize;
} }
@ -1698,9 +1693,9 @@ static int32_t MV_SetMixMode
MV_SampleSize *= 2; MV_SampleSize *= 2;
} }
MV_BufferSize = MixBufferSize * MV_SampleSize; MV_BufferSize = MV_MIXBUFFERSIZE * MV_SampleSize;
MV_NumberOfBuffers = TotalBufferSize / MV_BufferSize; MV_NumberOfBuffers = MV_TOTALBUFFERSIZE / MV_BufferSize;
MV_BufferLength = TotalBufferSize; MV_BufferLength = MV_TOTALBUFFERSIZE;
MV_RightChannelOffset = MV_SampleSize / 2; MV_RightChannelOffset = MV_SampleSize / 2;
@ -1720,7 +1715,7 @@ static int32_t MV_StartPlayback(void)
int32_t buffer; int32_t buffer;
// Initialize the buffers // Initialize the buffers
ClearBuffer_DW(MV_MixBuffer[ 0 ], MV_Silence, TotalBufferSize >> 2); ClearBuffer_DW(MV_MixBuffer[ 0 ], MV_Silence, MV_TOTALBUFFERSIZE >> 2);
for (buffer = 0; buffer < MV_NumberOfBuffers; buffer++) for (buffer = 0; buffer < MV_NumberOfBuffers; buffer++)
{ {
MV_BufferEmpty[ buffer ] = TRUE; MV_BufferEmpty[ buffer ] = TRUE;
@ -2000,13 +1995,13 @@ int32_t MV_PlayWAV3D
if (distance < 0) if (distance < 0)
{ {
distance = -distance; distance = -distance;
angle += MV_NumPanPositions / 2; angle += MV_NUMPANPOSITIONS / 2;
} }
volume = MIX_VOLUME(distance); volume = MIX_VOLUME(distance);
// Ensure angle is within 0 - 31 // Ensure angle is within 0 - 127
angle &= MV_MaxPanPosition; angle &= MV_MAXPANPOSITION;
left = MV_PanTable[ angle ][ volume ].left; left = MV_PanTable[ angle ][ volume ].left;
right = MV_PanTable[ angle ][ volume ].right; right = MV_PanTable[ angle ][ volume ].right;
@ -2189,13 +2184,13 @@ int32_t MV_PlayVOC3D
if (distance < 0) if (distance < 0)
{ {
distance = -distance; distance = -distance;
angle += MV_NumPanPositions / 2; angle += MV_NUMPANPOSITIONS / 2;
} }
volume = MIX_VOLUME(distance); volume = MIX_VOLUME(distance);
// Ensure angle is within 0 - 31 // Ensure angle is within 0 - 31
angle &= MV_MaxPanPosition; angle &= MV_MAXPANPOSITION;
left = MV_PanTable[ angle ][ volume ].left; left = MV_PanTable[ angle ][ volume ].left;
right = MV_PanTable[ angle ][ volume ].right; right = MV_PanTable[ angle ][ volume ].right;
@ -2337,14 +2332,14 @@ static void MV_CreateVolumeTable
int32_t level; int32_t level;
int32_t i; int32_t i;
level = (volume * MaxVolume) / MV_MaxTotalVolume; level = (volume * MaxVolume) / MV_MAXTOTALVOLUME;
if (MV_Bits == 16) if (MV_Bits == 16)
{ {
for (i = 0; i < 65536; i += 256) for (i = 0; i < 65536; i += 256)
{ {
val = i - 0x8000; val = i - 0x8000;
val *= level; val *= level;
val /= MV_MaxVolume; val /= MV_MAXVOLUME;
MV_VolumeTable[ index ][ i / 256 ] = val; MV_VolumeTable[ index ][ i / 256 ] = val;
} }
} }
@ -2354,7 +2349,7 @@ static void MV_CreateVolumeTable
{ {
val = i - 0x80; val = i - 0x80;
val *= level; val *= level;
val /= MV_MaxVolume; val /= MV_MAXVOLUME;
MV_VolumeTable[ volume ][ i ] = val; MV_VolumeTable[ volume ][ i ] = val;
} }
} }
@ -2384,7 +2379,7 @@ static void MV_CalcVolume(int32_t MaxVolume)
// For each volume level, create a translation table with the // For each volume level, create a translation table with the
// appropriate volume calculated. // appropriate volume calculated.
for (volume = 0; volume <= MV_MaxVolume; volume++) for (volume = 0; volume <= MV_MAXVOLUME; volume++)
{ {
MV_CreateVolumeTable(volume, volume, MaxVolume); MV_CreateVolumeTable(volume, volume, MaxVolume);
} }
@ -2406,25 +2401,25 @@ static void MV_CalcPanTable(void)
int32_t HalfAngle; int32_t HalfAngle;
int32_t ramp; int32_t ramp;
HalfAngle = (MV_NumPanPositions / 2); 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; level = (255 * (MV_MAXVOLUME - distance)) / MV_MAXVOLUME;
for (angle = 0; angle <= HalfAngle / 2; angle++) for (angle = 0; angle <= HalfAngle / 2; angle++)
{ {
ramp = level - ((level * angle) / ramp = level - ((level * angle) /
(MV_NumPanPositions / 4)); (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;
MV_PanTable[ HalfAngle + angle ][ distance ].left = level; MV_PanTable[ HalfAngle + angle ][ distance ].left = level;
MV_PanTable[ MV_MaxPanPosition - angle ][ distance ].left = level; MV_PanTable[ MV_MAXPANPOSITION - angle ][ distance ].left = level;
MV_PanTable[ angle ][ distance ].right = level; MV_PanTable[ angle ][ distance ].right = level;
MV_PanTable[ HalfAngle - angle ][ distance ].right = level; MV_PanTable[ HalfAngle - angle ][ distance ].right = level;
MV_PanTable[ HalfAngle + angle ][ distance ].right = ramp; MV_PanTable[ HalfAngle + angle ][ distance ].right = ramp;
MV_PanTable[ MV_MaxPanPosition - angle ][ distance ].right = ramp; MV_PanTable[ MV_MAXPANPOSITION - angle ][ distance ].right = ramp;
} }
} }
} }
@ -2439,7 +2434,7 @@ static void MV_CalcPanTable(void)
void MV_SetVolume(int32_t volume) void MV_SetVolume(int32_t volume)
{ {
volume = max(0, volume); volume = max(0, volume);
volume = min(volume, MV_MaxTotalVolume); volume = min(volume, MV_MAXTOTALVOLUME);
MV_TotalVolume = volume; MV_TotalVolume = volume;
@ -2526,7 +2521,7 @@ int32_t MV_Init
MV_SetErrorCode(MV_Ok); MV_SetErrorCode(MV_Ok);
MV_TotalMemory = Voices * sizeof(VoiceNode) + sizeof(HARSH_CLIP_TABLE_8) + TotalBufferSize; MV_TotalMemory = Voices * sizeof(VoiceNode) + sizeof(HARSH_CLIP_TABLE_8) + MV_TOTALBUFFERSIZE;
ptr = (char *) calloc(1, MV_TotalMemory); ptr = (char *) calloc(1, MV_TotalMemory);
if (!ptr) if (!ptr)
{ {
@ -2598,7 +2593,7 @@ int32_t MV_Init
// Calculate pan table // Calculate pan table
MV_CalcPanTable(); MV_CalcPanTable();
MV_SetVolume(MV_MaxTotalVolume); MV_SetVolume(MV_MAXTOTALVOLUME);
// Start the playback engine // Start the playback engine
status = MV_StartPlayback(); status = MV_StartPlayback();
@ -2651,7 +2646,7 @@ int32_t MV_Shutdown(void)
MV_MaxVoices = 1; MV_MaxVoices = 1;
// Release the descriptor from our mix buffer // Release the descriptor from our mix buffer
for (buffer = 0; buffer < NumberOfBuffers; buffer++) for (buffer = 0; buffer < MV_NUMBEROFBUFFERS; buffer++)
{ {
MV_MixBuffer[ buffer ] = NULL; MV_MixBuffer[ buffer ] = NULL;
} }

2
polymer/eduke32/source/jaudiolib/src/multivoc.h
View file

@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define UNREFERENCED_PARAMETER(x) x=x #define UNREFERENCED_PARAMETER(x) x=x
#endif #endif
#define MV_MinVoiceHandle 1 #define MV_MINVOICEHANDLE 1
extern int32_t MV_ErrorCode; extern int32_t MV_ErrorCode;