aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-14 04:25:24 +0000
committerEric Wong <normalperson@yhbt.net>2007-01-14 04:25:24 +0000
commit2c01b285c1232dc1127359bed0c49fd969aaf79f (patch)
treef95b814c3209e5e5e729d05b8190e49b1d9857c3 /src/inputPlugins
parentd41de57bfede8c21e8f5f34ea63ecf3839754fad (diff)
downloadmpd-2c01b285c1232dc1127359bed0c49fd969aaf79f.tar.gz
mpd-2c01b285c1232dc1127359bed0c49fd969aaf79f.tar.xz
mpd-2c01b285c1232dc1127359bed0c49fd969aaf79f.zip
flac: workaround for type inconsistency between new/old read callback
size_t (1.1.3) makes a lot more sense, but older flac used unsigned here... git-svn-id: https://svn.musicpd.org/mpd/trunk@5258 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins')
-rw-r--r--src/inputPlugins/_flac_common.h2
-rw-r--r--src/inputPlugins/flac_plugin.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index 8b53a42df..9e851ad9d 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -51,6 +51,7 @@
# define flac_decoder_eof FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
+typedef unsigned flac_read_status_size_t;
# define flac_read_status FLAC__SeekableStreamDecoderReadStatus
# define flac_read_status_continue \
FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
@@ -112,6 +113,7 @@
# define flac_decoder_eof FLAC__STREAM_DECODER_END_OF_STREAM
+typedef size_t flac_read_status_size_t;
# define flac_read_status FLAC__StreamDecoderReadStatus
# define flac_read_status_continue \
FLAC__STREAM_DECODER_READ_STATUS_CONTINUE
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 627bca6f6..b48e5e73f 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -37,7 +37,7 @@
static flac_read_status flacRead(const flac_decoder * flacDec,
FLAC__byte buf[],
- unsigned *bytes,
+ flac_read_status_size_t *bytes,
void *fdata)
{
FlacData *data = (FlacData *) fdata;