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

* Use a forward declaration of `struct OggVorbisDecoderState` instead of a dual typedef (one typedef as void for external functions, one as the struct for the implementation file), only to allow us to take pointers to it 

* Drop now unnecessary extern "C" declaration, since C++'s function overloading shouldn't cause problems now
 * Add "struct" keyword in front of all declarations of `struct OggVorbisDecoderState` or pointers to it

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1698 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-05-25 14:56:18 +00:00
parent 12078733b8
commit de4b91e2c3
4 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sound/cdaudio.c
View File

@ -52,7 +52,7 @@ static unsigned int music_track = 0;
static ALuint music_buffers[NB_BUFFERS];
static ALuint music_source;
OggVorbisDecoderState* decoder = NULL;
struct OggVorbisDecoderState* decoder = NULL;
static inline unsigned int numProcessedBuffers(void)
{

33
lib/sound/oggvorbis.c
View File

@ -30,7 +30,9 @@
#define OGG_ENDIAN 0
#endif
typedef struct
#include "oggvorbis.h"
struct OggVorbisDecoderState
{
// Internal identifier towards PhysicsFS
PHYSFS_file* fileHandle;
@ -43,20 +45,17 @@ typedef struct
// Internal meta data
vorbis_info* VorbisInfo;
} OggVorbisDecoderState;
#define _LIBSOUND_OGGVORBIS_C_
#include "oggvorbis.h"
};
static size_t wz_oggVorbis_read(void *ptr, size_t size, size_t nmemb, void *datasource)
{
PHYSFS_file* fileHandle = ((OggVorbisDecoderState*)datasource)->fileHandle;
PHYSFS_file* fileHandle = ((struct OggVorbisDecoderState*)datasource)->fileHandle;
return PHYSFS_read(fileHandle, ptr, 1, size*nmemb);
}
static int wz_oggVorbis_seek(void *datasource, ogg_int64_t offset, int whence) {
PHYSFS_file* fileHandle = ((OggVorbisDecoderState*)datasource)->fileHandle;
BOOL allowSeeking = ((OggVorbisDecoderState*)datasource)->allowSeeking;
PHYSFS_file* fileHandle = ((struct OggVorbisDecoderState*)datasource)->fileHandle;
BOOL allowSeeking = ((struct OggVorbisDecoderState*)datasource)->allowSeeking;
int curPos, fileSize, newPos;
@ -101,7 +100,7 @@ static int wz_oggVorbis_close(void *datasource) {
}
static long wz_oggVorbis_tell(void *datasource) {
PHYSFS_file* fileHandle = ((OggVorbisDecoderState*)datasource)->fileHandle;
PHYSFS_file* fileHandle = ((struct OggVorbisDecoderState*)datasource)->fileHandle;
return PHYSFS_tell(fileHandle);
}
@ -112,11 +111,11 @@ static const ov_callbacks wz_oggVorbis_callbacks = {
wz_oggVorbis_tell
};
OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking)
struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking)
{
int error;
OggVorbisDecoderState* decoder = malloc(sizeof(OggVorbisDecoderState));
struct OggVorbisDecoderState* decoder = malloc(sizeof(struct OggVorbisDecoderState));
if (decoder == NULL)
{
debug(LOG_ERROR, "sound_CreateOggVorbisDecoder: couldn't allocate memory\n");
@ -140,7 +139,7 @@ OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHand
return decoder;
}
void sound_DestroyOggVorbisDecoder(OggVorbisDecoderState* decoder)
void sound_DestroyOggVorbisDecoder(struct OggVorbisDecoderState* decoder)
{
// Close the OggVorbis decoding stream
ov_clear(&decoder->oggVorbis_stream);
@ -148,27 +147,27 @@ void sound_DestroyOggVorbisDecoder(OggVorbisDecoderState* decoder)
free(decoder);
}
static inline unsigned int getSampleCount(OggVorbisDecoderState* decoder)
static inline unsigned int getSampleCount(struct OggVorbisDecoderState* decoder)
{
int numSamples = ov_pcm_total(&decoder->oggVorbis_stream, -1);
if (numSamples == OV_EINVAL)
return 0;
return numSamples;
}
static inline unsigned int getCurrentSample(OggVorbisDecoderState* decoder)
static inline unsigned int getCurrentSample(struct OggVorbisDecoderState* decoder)
{
int samplePos = ov_pcm_tell(&decoder->oggVorbis_stream);
if (samplePos == OV_EINVAL)
return 0;
return samplePos;
}
soundDataBuffer* sound_DecodeOggVorbis(OggVorbisDecoderState* decoder, size_t bufferSize)
soundDataBuffer* sound_DecodeOggVorbis(struct OggVorbisDecoderState* decoder, size_t bufferSize)
{
size_t size = 0;
int result;

18
lib/sound/oggvorbis.h
View File

@ -40,20 +40,12 @@ typedef struct
unsigned int frequency;
} soundDataBuffer;
#ifndef _LIBSOUND_OGGVORBIS_C_
typedef void OggVorbisDecoderState;
#endif
// Forward declaration so we can take pointers to this type
struct OggVorbisDecoderState;
#ifdef __cplusplus
extern "C"
{
#endif
OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking);
void sound_DestroyOggVorbisDecoder(OggVorbisDecoderState* decoder);
struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking);
void sound_DestroyOggVorbisDecoder(struct OggVorbisDecoderState* decoder);
soundDataBuffer* sound_DecodeOggVorbis(OggVorbisDecoderState* decoder, size_t bufferSize);
#ifdef __cplusplus
}
#endif
soundDataBuffer* sound_DecodeOggVorbis(struct OggVorbisDecoderState* decoder, size_t bufferSize);
#endif // _LIBSOUND_OGGVORBIS_H_

2
lib/sound/openal_track.c
View File

@ -253,7 +253,7 @@ static inline TRACK* sound_DecodeOggVorbisTrack(TRACK *psTrack, PHYSFS_file* PHY
ALenum format;
ALuint buffer;
OggVorbisDecoderState* decoder = sound_CreateOggVorbisDecoder(PHYSFS_fileHandle, TRUE);
struct OggVorbisDecoderState* decoder = sound_CreateOggVorbisDecoder(PHYSFS_fileHandle, TRUE);
soundDataBuffer* soundBuffer;
soundBuffer = sound_DecodeOggVorbis(decoder, 0);