From 38e3220fd4401f797efd3a10aa1d5bb3e8925be4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 2 Jan 2009 09:50:12 +0100
Subject: oggflac: don't use gcc.h
Use G_GNUC_UNUSED instead of mpd_unused (which has already been
removed).
---
src/decoder/oggflac_plugin.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'src/decoder')
diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_plugin.c
index c2dfa3154..c5693c585 100644
--- a/src/decoder/oggflac_plugin.c
+++ b/src/decoder/oggflac_plugin.c
@@ -22,6 +22,7 @@
#include "_flac_common.h"
#include "_ogg_common.h"
+#include <glib.h>
#include <OggFLAC/seekable_stream_decoder.h>
#include <unistd.h>
@@ -34,7 +35,7 @@ static void oggflac_cleanup(FlacData * data,
OggFLAC__seekable_stream_decoder_delete(decoder);
}
-static OggFLAC__SeekableStreamDecoderReadStatus of_read_cb(mpd_unused const
+static OggFLAC__SeekableStreamDecoderReadStatus of_read_cb(G_GNUC_UNUSED const
OggFLAC__SeekableStreamDecoder
* decoder,
FLAC__byte buf[],
@@ -54,7 +55,7 @@ static OggFLAC__SeekableStreamDecoderReadStatus of_read_cb(mpd_unused const
return OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
}
-static OggFLAC__SeekableStreamDecoderSeekStatus of_seek_cb(mpd_unused const
+static OggFLAC__SeekableStreamDecoderSeekStatus of_seek_cb(G_GNUC_UNUSED const
OggFLAC__SeekableStreamDecoder
* decoder,
FLAC__uint64 offset,
@@ -68,7 +69,7 @@ static OggFLAC__SeekableStreamDecoderSeekStatus of_seek_cb(mpd_unused const
return OggFLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
}
-static OggFLAC__SeekableStreamDecoderTellStatus of_tell_cb(mpd_unused const
+static OggFLAC__SeekableStreamDecoderTellStatus of_tell_cb(G_GNUC_UNUSED const
OggFLAC__SeekableStreamDecoder
* decoder,
FLAC__uint64 *
@@ -81,7 +82,7 @@ static OggFLAC__SeekableStreamDecoderTellStatus of_tell_cb(mpd_unused const
return OggFLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
}
-static OggFLAC__SeekableStreamDecoderLengthStatus of_length_cb(mpd_unused const
+static OggFLAC__SeekableStreamDecoderLengthStatus of_length_cb(G_GNUC_UNUSED const
OggFLAC__SeekableStreamDecoder
* decoder,
FLAC__uint64 *
@@ -98,7 +99,7 @@ static OggFLAC__SeekableStreamDecoderLengthStatus of_length_cb(mpd_unused const
return OggFLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
}
-static FLAC__bool of_EOF_cb(mpd_unused const OggFLAC__SeekableStreamDecoder * decoder,
+static FLAC__bool of_EOF_cb(G_GNUC_UNUSED const OggFLAC__SeekableStreamDecoder * decoder,
void *fdata)
{
FlacData *data = (FlacData *) fdata;
@@ -108,7 +109,7 @@ static FLAC__bool of_EOF_cb(mpd_unused const OggFLAC__SeekableStreamDecoder * de
input_stream_eof(data->inStream);
}
-static void of_error_cb(mpd_unused const OggFLAC__SeekableStreamDecoder * decoder,
+static void of_error_cb(G_GNUC_UNUSED const OggFLAC__SeekableStreamDecoder * decoder,
FLAC__StreamDecoderErrorStatus status, void *fdata)
{
flac_error_common_cb("oggflac", status, (FlacData *) fdata);
@@ -145,7 +146,7 @@ static void oggflacPrintErroredState(OggFLAC__SeekableStreamDecoderState state)
}
}
-static FLAC__StreamDecoderWriteStatus oggflacWrite(mpd_unused const
+static FLAC__StreamDecoderWriteStatus oggflacWrite(G_GNUC_UNUSED const
OggFLAC__SeekableStreamDecoder
* decoder,
const FLAC__Frame * frame,
@@ -163,7 +164,7 @@ static FLAC__StreamDecoderWriteStatus oggflacWrite(mpd_unused const
}
/* used by TagDup */
-static void of_metadata_dup_cb(mpd_unused const OggFLAC__SeekableStreamDecoder * decoder,
+static void of_metadata_dup_cb(G_GNUC_UNUSED const OggFLAC__SeekableStreamDecoder * decoder,
const FLAC__StreamMetadata * block, void *vdata)
{
FlacData *data = (FlacData *) vdata;
@@ -184,7 +185,7 @@ static void of_metadata_dup_cb(mpd_unused const OggFLAC__SeekableStreamDecoder *
}
/* used by decode */
-static void of_metadata_decode_cb(mpd_unused const OggFLAC__SeekableStreamDecoder * dec,
+static void of_metadata_decode_cb(G_GNUC_UNUSED const OggFLAC__SeekableStreamDecoder * dec,
const FLAC__StreamMetadata * block,
void *vdata)
{
--
cgit v1.2.3