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

Correct openal buffer: void *pMem -> ALuint iBufferName 

as openal 'buffers' are indexed by ALUint.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@755 4a71c877-e1ca-e34f-864e-861f7616d084
master
Stefan Huehner 2006-09-24 18:53:08 +00:00
parent 9d1d34d2a9
commit bc25579a7a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sound/openal_track.c
View File

@ -256,8 +256,8 @@ BOOL sound_QueueSamplePlaying( void )
//
static void sound_SaveTrackData( TRACK *psTrack, ALuint buffer )
{
// save data pointer in track
psTrack->pMem = (void *) buffer;
// save buffer name in track
psTrack->iBufferName = buffer;
}
//*
@ -411,7 +411,7 @@ BOOL sound_ReadTrackFromFile(TRACK *psTrack, char szFileName[])
//
void sound_FreeTrack( TRACK *psTrack )
{
ALuint buffer = (ALuint)(psTrack->pMem);
ALuint buffer = psTrack->iBufferName;
alDeleteBuffers( 1, &buffer );
}
@ -478,7 +478,7 @@ BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued )
alSourcef( psSample->iSample, AL_GAIN, sfx_volume );
alSourcefv( psSample->iSample, AL_POSITION, zero );
alSourcefv( psSample->iSample, AL_VELOCITY, zero );
alSourcei( psSample->iSample, AL_BUFFER, (ALuint) (psTrack->pMem) );
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 );
@ -513,7 +513,7 @@ BOOL sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample )
alSourcef( psSample->iSample, AL_GAIN, sfx3d_volume );
sound_SetObjectPosition( psSample->iSample, psSample->x, psSample->y, psSample->z );
alSourcefv( psSample->iSample, AL_VELOCITY, zero );
alSourcei( psSample->iSample, AL_BUFFER, (ALuint) (psTrack->pMem) );
alSourcei( psSample->iSample, AL_BUFFER, psTrack->iBufferName );
sound_SetupChannel( psSample, &iLoops );
alSourcei( psSample->iSample, AL_LOOPING, (iLoops) ? AL_TRUE : AL_FALSE );
alSourcePlay( psSample->iSample );
@ -524,7 +524,7 @@ BOOL sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample )
// =======================================================================================================================
// =======================================================================================================================
//
BOOL sound_PlayStream( AUDIO_SAMPLE *psSample, char szFileName[], SDWORD iVol )
BOOL sound_PlayStream( AUDIO_SAMPLE *psSample, const char szFileName[], SDWORD iVol )
{
return TRUE;
}

2
lib/sound/track.h
View File

@ -85,7 +85,7 @@ typedef struct TRACK
BOOL bMemBuffer; /* memory buffer flag */
BOOL bCompressed; /* compression data flag */
void * pMem; /* pointer to audio data */
ALuint iBufferName; /* name of the openal buffer */
STRING *pName; // resource name of the track
UDWORD resID; // hashed name of the WAV