Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: 

* AUDIO_SAMPLE
  * remove unused variable iLoops from the struct
  * rename bRemove to the more descriptive title of bFinishedPlaying
 * change sound_SetupChannel to return a BOOL rather than be return void and throw its output value in a pointer
 * make audio_Update() return void (instead of BOOL) since its output value was TRUE always anyway, plus all its callees ignored the output value
 * increase readability of lots of functions in audio.c
 * remove unused (and nothing doing) functions: audio_StopTrack, audio_SetTrackPan, audio_SetTrackVol and audio_SetTrackFreq

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1444 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-04-12 17:42:15 +00:00
parent 6671750da0
commit c028586ee4
5 changed files with 127 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
lib/sound/audio.c
View File

@ -300,11 +300,6 @@ static AUDIO_SAMPLE *audio_QueueSample( SDWORD iTrack )
AUDIO_SAMPLE *psSample = NULL;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//
// SDWORD iSameSamples = 0;
//
// debug(LOG_SOUND, "audio_queuesample called - track=%d", iTrack );
// return if audio not enabled
if ( g_bAudioEnabled == FALSE || g_bAudioPaused == TRUE || g_bStopAll == TRUE )
{
@ -319,21 +314,22 @@ static AUDIO_SAMPLE *audio_QueueSample( SDWORD iTrack )
return NULL;
}
// debug(LOG_SOUND, "audio_queuetrack called1" );
HEAP_ALLOC( g_psSampleHeap, (void **) &psSample );
if ( psSample != NULL )
if ( psSample == NULL )
{
memset( psSample, 0, sizeof(AUDIO_SAMPLE) ); //[check] -Q
psSample->iTrack = iTrack;
psSample->x = SAMPLE_COORD_INVALID;
psSample->y = SAMPLE_COORD_INVALID;
psSample->z = SAMPLE_COORD_INVALID;
psSample->bRemove = FALSE;
// add to queue
audio_AddSampleToTail( &g_psSampleQueue, psSample );
return NULL;
}
memset( psSample, 0, sizeof(AUDIO_SAMPLE) ); //[check] -Q
psSample->iTrack = iTrack;
psSample->x = SAMPLE_COORD_INVALID;
psSample->y = SAMPLE_COORD_INVALID;
psSample->z = SAMPLE_COORD_INVALID;
psSample->bFinishedPlaying = FALSE;
// add to queue
audio_AddSampleToTail( &g_psSampleQueue, psSample );
return psSample;
}
@ -370,7 +366,7 @@ void audio_QueueTrack( SDWORD iTrack )
void audio_QueueTrackMinDelay( SDWORD iTrack, UDWORD iMinDelay )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AUDIO_SAMPLE *psSample = NULL;
AUDIO_SAMPLE *psSample;
UDWORD iDelay;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -380,15 +376,22 @@ void audio_QueueTrackMinDelay( SDWORD iTrack, UDWORD iMinDelay )
return;
}
// Determine if at least iMinDelay time has passed since the last time this track was played
iDelay = sound_GetGameTime() - sound_GetTrackTimeLastFinished( iTrack );
if ( iDelay > iMinDelay )
if ( !(iDelay > iMinDelay) )
{
psSample = audio_QueueSample( iTrack );
if ( psSample != NULL )
{
sound_SetTrackTimeLastFinished( iTrack, sound_GetGameTime() );
}
return;
}
// Construct an audio sample from requested track
psSample = audio_QueueSample( iTrack );
if ( psSample == NULL )
{
return;
}
// Set last finished tracktime to current time to prevent parallel playing of this track
sound_SetTrackTimeLastFinished( iTrack, sound_GetGameTime() );
}
//*
@ -398,7 +401,7 @@ void audio_QueueTrackMinDelay( SDWORD iTrack, UDWORD iMinDelay )
void audio_QueueTrackMinDelayPos( SDWORD iTrack, UDWORD iMinDelay, SDWORD iX, SDWORD iY, SDWORD iZ )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AUDIO_SAMPLE *psSample = NULL;
AUDIO_SAMPLE *psSample;
UDWORD iDelay;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -408,18 +411,26 @@ void audio_QueueTrackMinDelayPos( SDWORD iTrack, UDWORD iMinDelay, SDWORD iX, SD
return;
}
// Determine if at least iMinDelay time has passed since the last time this track was played
iDelay = sound_GetGameTime() - sound_GetTrackTimeLastFinished( iTrack );
if ( iDelay > iMinDelay )
{
psSample = audio_QueueSample( iTrack );
if ( psSample != NULL )
{
sound_SetTrackTimeLastFinished( iTrack, sound_GetGameTime() );
psSample->x = iX;
psSample->y = iY;
psSample->z = iZ;
}
return;
}
// Construct an audio sample from requested track
psSample = audio_QueueSample( iTrack );
if ( psSample == NULL )
{
return;
}
psSample->x = iX;
psSample->y = iY;
psSample->z = iZ;
// Set last finished tracktime to current time to prevent parallel playing of this track
sound_SetTrackTimeLastFinished( iTrack, sound_GetGameTime() );
}
//*
@ -429,7 +440,7 @@ void audio_QueueTrackMinDelayPos( SDWORD iTrack, UDWORD iMinDelay, SDWORD iX, SD
void audio_QueueTrackPos( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AUDIO_SAMPLE *psSample = NULL;
AUDIO_SAMPLE *psSample;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// return if audio not enabled
@ -438,13 +449,16 @@ void audio_QueueTrackPos( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ )
return;
}
// Construct an audio sample from requested track
psSample = audio_QueueSample( iTrack );
if ( psSample != NULL )
if ( psSample == NULL )
{
psSample->x = iX;
psSample->y = iY;
psSample->z = iZ;
return;
}
psSample->x = iX;
psSample->y = iY;
psSample->z = iZ;
}
//*
@ -454,7 +468,7 @@ void audio_QueueTrackPos( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ )
static void audio_UpdateQueue( void )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AUDIO_SAMPLE *psSample = NULL;
AUDIO_SAMPLE *psSample;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// return if audio not enabled
@ -474,30 +488,32 @@ static void audio_UpdateQueue( void )
audio_Set3DVolume( AUDIO_VOL_MAX );
// check queue for members
if ( g_psSampleQueue != NULL )
if ( g_psSampleQueue == NULL )
{
// remove queue head
psSample = g_psSampleQueue;
audio_RemoveSample( &g_psSampleQueue, psSample );
return;
}
// add sample to list if able to play
if ( !sound_Play2DTrack(psSample, TRUE) )
{
debug( LOG_NEVER, "audio_UpdateQueue: couldn't play sample\n" );
HEAP_FREE( g_psSampleHeap, psSample );
return;
}
// remove queue head
psSample = g_psSampleQueue;
audio_RemoveSample( &g_psSampleQueue, psSample );
audio_AddSampleToHead( &g_psSampleList, psSample );
// add sample to list if able to play
if ( !sound_Play2DTrack(psSample, TRUE) )
{
debug( LOG_NEVER, "audio_UpdateQueue: couldn't play sample\n" );
HEAP_FREE( g_psSampleHeap, psSample );
return;
}
// update last queue sound coords
if ( psSample->x != SAMPLE_COORD_INVALID && psSample->y != SAMPLE_COORD_INVALID
&& psSample->z != SAMPLE_COORD_INVALID )
{
g_sPreviousSample.x = psSample->x;
g_sPreviousSample.y = psSample->y;
g_sPreviousSample.z = psSample->z;
}
audio_AddSampleToHead( &g_psSampleList, psSample );
// update last queue sound coords
if ( psSample->x != SAMPLE_COORD_INVALID && psSample->y != SAMPLE_COORD_INVALID
&& psSample->z != SAMPLE_COORD_INVALID )
{
g_sPreviousSample.x = psSample->x;
g_sPreviousSample.y = psSample->y;
g_sPreviousSample.z = psSample->z;
}
}
@ -505,7 +521,7 @@ static void audio_UpdateQueue( void )
// =======================================================================================================================
// =======================================================================================================================
//
BOOL audio_Update( void )
void audio_Update( void )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Vector3i vecPlayer;
@ -516,7 +532,7 @@ BOOL audio_Update( void )
// if audio not enabled return TRUE to carry on game without audio
if ( g_bAudioEnabled == FALSE )
{
return TRUE;
return;
}
audio_UpdateQueue();
@ -540,7 +556,7 @@ BOOL audio_Update( void )
while ( psSample != NULL )
{
// remove finished samples from list
if ( psSample->bRemove == TRUE )
if ( psSample->bFinishedPlaying == TRUE )
{
audio_RemoveSample( &g_psSampleList, psSample );
psSampleTemp = psSample->psNext;
@ -575,7 +591,7 @@ BOOL audio_Update( void )
}
sound_Update();
return TRUE;
return;
}
@ -767,7 +783,7 @@ static BOOL audio_Play3DTrack( SDWORD iX, SDWORD iY, SDWORD iZ, int iTrack, void
psSample->x = iX;
psSample->y = iY;
psSample->z = iZ;
psSample->bRemove = FALSE;
psSample->bFinishedPlaying = FALSE;
psSample->psObj = psObj;
psSample->pCallback = pUserCallback;
@ -880,19 +896,22 @@ BOOL audio_PlayStream( const char szFileName[], SDWORD iVol, AUDIO_CALLBACK pUse
}
HEAP_ALLOC( g_psSampleHeap, (void **) &psSample );
if ( psSample != NULL )
if ( psSample == NULL )
{
memset( psSample, 0, sizeof(AUDIO_SAMPLE) );
psSample->pCallback = pUserCallback;
psSample->bRemove = FALSE;
audio_Set3DVolume( AUDIO_VOL_MAX );
if ( sound_PlayStream(psSample, szFileName, iVol) == TRUE )
{
return TRUE;
}
return FALSE;
}
memset( psSample, 0, sizeof(AUDIO_SAMPLE) );
psSample->pCallback = pUserCallback;
psSample->bFinishedPlaying = FALSE;
audio_Set3DVolume( AUDIO_VOL_MAX );
if ( !sound_PlayStream(psSample, szFileName, iVol) )
{
return FALSE;
}
return FALSE;
return TRUE;
}
//*
@ -915,19 +934,16 @@ void audio_StopObjTrack( void *psObj, int iTrack )
psSample = g_psSampleList;
while ( psSample != NULL )
{
// If track has been found stop it and return
if ( psSample->psObj == psObj && psSample->iTrack == iTrack )
{
break;
sound_StopTrack(psSample);
return;
}
// get next sample from hash table
psSample = psSample->psNext;
}
if ( psSample != NULL )
{
sound_StopTrack( psSample );
}
}
//*
@ -950,76 +966,35 @@ void audio_PlayTrack( int iTrack )
return;
}
// Allocate a sample
HEAP_ALLOC( g_psSampleHeap, (void **) &psSample );
if ( psSample != NULL )
{
// setup sample
memset( psSample, 0, sizeof(AUDIO_SAMPLE) ); // Set everything to 0 (looks good) -Q
psSample->iTrack = iTrack;
psSample->bRemove = FALSE;
// add sample to list if able to play
if ( !sound_Play2DTrack(psSample, FALSE) )
{
debug( LOG_NEVER, "audio_PlayTrack: couldn't play sample\n" );
HEAP_FREE( g_psSampleHeap, psSample );
return;
}
audio_AddSampleToHead( &g_psSampleList, psSample );
}
}
//*
// =======================================================================================================================
// =======================================================================================================================
//
void audio_StopTrack( int iTrack )
{
// return if audio not enabled
if ( g_bAudioEnabled == FALSE )
if ( psSample == NULL )
{
return;
}
}
//*
// =======================================================================================================================
// =======================================================================================================================
//
void audio_SetTrackPan( int iTrack, int iPan )
{
// return if audio not enabled
if ( g_bAudioEnabled == FALSE )
// setup/initialize sample
psSample->iTrack = iTrack;
psSample->bFinishedPlaying = FALSE;
// Zero callback stuff since we don't need/want it
psSample->pCallback = NULL;
psSample->psObj = NULL;
/* iSample, psPrev, and psNext will be initialized by the
* following functions, and x, y and z will be completely
* ignored so we don't need to bother about it
*/
// add sample to list if able to play
if ( !sound_Play2DTrack(psSample, FALSE) )
{
debug( LOG_NEVER, "audio_PlayTrack: couldn't play sample\n" );
HEAP_FREE( g_psSampleHeap, psSample );
return;
}
}
//*
// =======================================================================================================================
// =======================================================================================================================
//
void audio_SetTrackVol( int iTrack, int iVol )
{
// return if audio not enabled
if ( g_bAudioEnabled == FALSE )
{
return;
}
}
//*
// =======================================================================================================================
// =======================================================================================================================
//
void audio_SetTrackFreq( int iTrack, int iFreq )
{
// return if audio not enabled
if ( g_bAudioEnabled == FALSE )
{
return;
}
audio_AddSampleToHead( &g_psSampleList, psSample );
}
//*

8
lib/sound/audio.h
View File

@ -31,7 +31,7 @@
/***************************************************************************/
extern BOOL audio_Init( AUDIO_CALLBACK pStopTrackCallback );
extern BOOL audio_Update(void);
extern void audio_Update(void);
extern BOOL audio_Shutdown(void);
extern BOOL audio_Disabled( void );
@ -68,12 +68,6 @@ extern void audio_QueueTrackGroupPos( SDWORD iTrack, SDWORD iGroup,
extern void audio_PlayPreviousQueueTrack( void );
extern BOOL audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY,
SDWORD *iZ );
extern void audio_StopTrack( int iTrack );
extern void audio_SetTrackPan( int iTrack, int iPan );
extern void audio_SetTrackVol( int iTrack, int iVol );
extern void audio_SetTrackFreq( int iTrack, int iFreq );
extern void audio_PauseAll( void );
extern void audio_ResumeAll( void );
extern void audio_StopAll( void );

20
lib/sound/openal_track.c
View File

@ -476,18 +476,18 @@ static void sound_AddActiveSample( AUDIO_SAMPLE *psSample )
// =======================================================================================================================
// =======================================================================================================================
//
static void sound_SetupChannel( AUDIO_SAMPLE *psSample, SDWORD *piLoops )
static BOOL sound_SetupChannel( AUDIO_SAMPLE *psSample )
{
if ( sound_TrackLooped(psSample->iTrack) == TRUE )
sound_AddActiveSample( psSample );
if (sound_TrackLooped(psSample->iTrack))
{
*piLoops = -1;
return TRUE;
}
else
{
*piLoops = 0;
return FALSE;
}
sound_AddActiveSample( psSample );
}
//*
@ -497,7 +497,6 @@ static void sound_SetupChannel( AUDIO_SAMPLE *psSample, SDWORD *piLoops )
BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SDWORD iLoops;
ALfloat zero[3] = { 0.0, 0.0, 0.0 };
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -512,8 +511,7 @@ BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued )
alSourcefv( psSample->iSample, AL_VELOCITY, zero );
alSourcei( psSample->iSample, AL_BUFFER, psTrack->iBufferName );
alSourcei( psSample->iSample, AL_SOURCE_RELATIVE, AL_TRUE );
sound_SetupChannel( psSample, &iLoops );
alSourcei( psSample->iSample, AL_LOOPING, (iLoops) ? AL_TRUE : AL_FALSE );
alSourcei( psSample->iSample, AL_LOOPING, (sound_SetupChannel(psSample)) ? AL_TRUE : AL_FALSE );
alSourcePlay( psSample->iSample );
if ( bQueued )
{
@ -533,7 +531,6 @@ BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued )
//
BOOL sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample )
{
SDWORD iLoops;
ALfloat zero[3] = { 0.0, 0.0, 0.0 };
if (sfx3d_volume == 0.0) {
@ -546,8 +543,7 @@ BOOL sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample )
sound_SetObjectPosition( psSample->iSample, psSample->x, psSample->y, psSample->z );
alSourcefv( psSample->iSample, AL_VELOCITY, zero );
alSourcei( psSample->iSample, AL_BUFFER, psTrack->iBufferName );
sound_SetupChannel( psSample, &iLoops );
alSourcei( psSample->iSample, AL_LOOPING, (iLoops) ? AL_TRUE : AL_FALSE );
alSourcei( psSample->iSample, AL_LOOPING, (sound_SetupChannel(psSample)) ? AL_TRUE : AL_FALSE );
alSourcePlay( psSample->iSample );
return TRUE;
}

4
lib/sound/track.c
View File

@ -369,8 +369,8 @@ void sound_FinishedCallback( AUDIO_SAMPLE *psSample )
psSample->pCallback(psSample->psObj);
}
// set remove flag
psSample->bRemove = TRUE;
// set finished flag
psSample->bFinishedPlaying = TRUE;
}
//*

3
lib/sound/track.h
View File

@ -73,8 +73,7 @@ typedef struct AUDIO_SAMPLE
SDWORD iTrack;
ALuint iSample; // OpenAL name of the sound source
SDWORD x, y, z;
SDWORD iLoops;
BOOL bRemove;
BOOL bFinishedPlaying;
AUDIO_CALLBACK pCallback;
void *psObj;
struct AUDIO_SAMPLE *psPrev;