aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm_utils.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-07 19:19:55 +0200
committerMax Kellermann <max@duempel.org>2008-09-07 19:19:55 +0200
commitf1dd9c209c3a1cf6826d3a38b60f638e0faeadab (patch)
tree91e369d89eac8d298f1473c0dbcdf43065ae3b40 /src/pcm_utils.h
parentbd81fd8b0c4f4f3c20533e21d6a837326eb8682b (diff)
downloadmpd-f1dd9c209c3a1cf6826d3a38b60f638e0faeadab.tar.gz
mpd-f1dd9c209c3a1cf6826d3a38b60f638e0faeadab.tar.xz
mpd-f1dd9c209c3a1cf6826d3a38b60f638e0faeadab.zip
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.
Diffstat (limited to '')
-rw-r--r--src/pcm_utils.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/pcm_utils.h b/src/pcm_utils.h
index 2ecb56201..414691f5a 100644
--- a/src/pcm_utils.h
+++ b/src/pcm_utils.h
@@ -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