audio_format: converted typedef AudioFormat to struct audio_format

Get rid of CamelCase, and don't use a typedef, so we can
forward-declare it, and unclutter the include dependencies.
This commit is contained in:
Max Kellermann
2008-09-07 19:19:55 +02:00
parent bd81fd8b0c
commit f1dd9c209c
34 changed files with 98 additions and 83 deletions
+9 -7
View File
@@ -21,13 +21,15 @@
#include "../config.h"
#include "audio_format.h"
#include "mpd_types.h"
#include "os_compat.h"
#ifdef HAVE_LIBSAMPLERATE
#include <samplerate.h>
#endif
struct audio_format;
typedef struct _ConvState {
#ifdef HAVE_LIBSAMPLERATE
SRC_STATE *state;
@@ -42,17 +44,17 @@ typedef struct _ConvState {
int error;
} ConvState;
void pcm_volumeChange(char *buffer, int bufferSize, const AudioFormat * format,
void pcm_volumeChange(char *buffer, int bufferSize, const struct audio_format *format,
int volume);
void pcm_mix(char *buffer1, const char *buffer2, size_t bufferSize1,
size_t bufferSize2, const AudioFormat * format, float portion1);
size_t bufferSize2, const struct audio_format *format, float portion1);
size_t pcm_convertAudioFormat(const AudioFormat * inFormat,
size_t pcm_convertAudioFormat(const struct audio_format *inFormat,
const char *inBuffer, size_t inSize,
const AudioFormat * outFormat,
const struct audio_format *outFormat,
char *outBuffer, ConvState *convState);
size_t pcm_sizeOfConvBuffer(const AudioFormat * inFormat, size_t inSize,
const AudioFormat * outFormat);
size_t pcm_sizeOfConvBuffer(const struct audio_format *inFormat, size_t inSize,
const struct audio_format *outFormat);
#endif