aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-11 21:04:32 +0100
committerMax Kellermann <max@duempel.org>2009-11-11 21:09:08 +0100
commitdfc09a37c914829c150ad902fc5f18fc555e7a60 (patch)
tree1f87f6fbc2a47d805c28bdad09b5a851fdb68a2c /src
parent8588c216893d97bfa7f714c669bec93ec68a7f5d (diff)
downloadmpd-dfc09a37c914829c150ad902fc5f18fc555e7a60.tar.gz
mpd-dfc09a37c914829c150ad902fc5f18fc555e7a60.tar.xz
mpd-dfc09a37c914829c150ad902fc5f18fc555e7a60.zip
decoder/vorbis: removed the OggCallbackData typedef
Use the struct name instead.
Diffstat (limited to '')
-rwxr-xr-xsrc/decoder/vorbis_plugin.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index 3f65d17b7..25be96971 100755
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -57,17 +57,17 @@
#define OGG_DECODE_USE_BIGENDIAN 0
#endif
-typedef struct _OggCallbackData {
+struct vorbis_decoder_data {
struct decoder *decoder;
struct input_stream *input_stream;
bool seekable;
-} OggCallbackData;
+};
static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
{
+ struct vorbis_decoder_data *data = (struct vorbis_decoder_data *)vdata;
size_t ret;
- OggCallbackData *data = (OggCallbackData *) vdata;
ret = decoder_read(data->decoder, data->input_stream, ptr, size * nmemb);
@@ -78,7 +78,7 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence)
{
- const OggCallbackData *data = (const OggCallbackData *) vdata;
+ struct vorbis_decoder_data *data = (struct vorbis_decoder_data *)vdata;
return data->seekable &&
decoder_get_command(data->decoder) != DECODE_COMMAND_STOP &&
@@ -94,7 +94,8 @@ static int ogg_close_cb(G_GNUC_UNUSED void *vdata)
static long ogg_tell_cb(void *vdata)
{
- const OggCallbackData *data = (const OggCallbackData *) vdata;
+ const struct vorbis_decoder_data *data =
+ (const struct vorbis_decoder_data *)vdata;
return (long)data->input_stream->offset;
}
@@ -244,7 +245,7 @@ vorbis_stream_decode(struct decoder *decoder,
{
OggVorbis_File vf;
ov_callbacks callbacks;
- OggCallbackData data;
+ struct vorbis_decoder_data data;
struct audio_format audio_format;
int current_section;
int prev_section = -1;