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

* remove unneeded header include directives 

* use plain data types where appropriate
 * move the decision for streaming to a parameter of the decoder function (less tight coupling of client to internal decoder callbacks)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1565 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-04-30 16:55:53 +00:00
parent 53a8aebb9c
commit 1643e335e4
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/sound/openal_track.c
View File

@ -36,9 +36,6 @@
#endif
#ifndef WZ_NOOGG
#include <ogg/ogg.h>
#include <vorbis/codec.h>
#include <vorbis/vorbisenc.h>
#include <vorbis/vorbisfile.h>
#endif
@ -72,8 +69,8 @@ static ALfloat sfx3d_volume = 1.0;
static ALCdevice* device = 0;
static ALCcontext* context = 0;
static ALvoid *data = NULL; // Needed for ReadTrackFromBuffer, must be global, so it can be free'd on shutdown
static ALsizei DataBuffer_size = 16 * 1024;
static char* data = NULL; // Needed for ReadTrackFromBuffer, must be global, so it can be free'd on shutdown
static size_t DataBuffer_size = 16 * 1024;
BOOL openal_initialized = FALSE;
@ -338,7 +335,7 @@ static ov_callbacks ovPHYSFS_callbacks = {
ovPHYSFS_tell
};
static inline TRACK* sound_DecodeTrack( TRACK *psTrack, fileInfo* fileHandle )
static inline TRACK* sound_DecodeTrack(TRACK *psTrack, PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking)
{
OggVorbis_File ogg_stream;
vorbis_info* ogg_info;
@ -349,9 +346,10 @@ static inline TRACK* sound_DecodeTrack( TRACK *psTrack, fileInfo* fileHandle )
ALuint buffer;
ALsizei size=0;
int result, section;
fileInfo fileHandle = { PHYSFS_fileHandle, allowSeeking };
if (ov_open_callbacks(fileHandle, &ogg_stream, NULL, 0, ovPHYSFS_callbacks) < 0)
if (ov_open_callbacks(&fileHandle, &ogg_stream, NULL, 0, ovPHYSFS_callbacks) < 0)
{
free(psTrack);
return NULL;
@ -404,17 +402,16 @@ static inline TRACK* sound_DecodeTrack( TRACK *psTrack, fileInfo* fileHandle )
TRACK* sound_LoadTrackFromFile(const char *fileName)
{
TRACK* pTrack;
fileInfo fileHandle;
PHYSFS_file* fileHandle;
// Use PhysicsFS to open the file
fileHandle.fileHandle = PHYSFS_openRead(fileName);
if (fileHandle.fileHandle == NULL)
fileHandle = PHYSFS_openRead(fileName);
if (fileHandle == NULL)
{
debug(LOG_ERROR, "sound_LoadTrackFromFile: PHYSFS_openRead(\"%s\") failed with error: %s\n", fileName, PHYSFS_getLastError());
return NULL;
}
fileHandle.allowSeeking = TRUE;
// allocate track, plus the memory required to contain the filename
// one malloc call ensures only one free call is required
pTrack = (TRACK*)malloc(sizeof(TRACK) + strlen(GetLastResourceFilename()) + 1);
@ -430,12 +427,12 @@ TRACK* sound_LoadTrackFromFile(const char *fileName)
// Set filename pointer and copy the filename into struct
pTrack->pName = (char*)pTrack + sizeof(TRACK);
strcpy( pTrack->pName, GetLastResourceFilename() );
strcpy(pTrack->pName, GetLastResourceFilename());
// Now use sound_ReadTrackFromBuffer to decode the file's contents
pTrack = sound_DecodeTrack( pTrack, &fileHandle);
pTrack = sound_DecodeTrack(pTrack, fileHandle, TRUE);
PHYSFS_close(fileHandle.fileHandle);
PHYSFS_close(fileHandle);
return pTrack;
}