From cd0d003197d0abd572edcc3cbef532a5e3cfc395 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jan 2013 21:40:53 +0100 Subject: filter/chain, encoder: GLib include cleanup --- src/encoder/lame_encoder.c | 7 +++++-- src/encoder/null_encoder.c | 19 ++++++++----------- src/encoder/twolame_encoder.c | 9 ++++++--- src/encoder/wave_encoder.c | 20 ++++++++------------ src/filter/chain_filter_plugin.c | 2 ++ test/dump_rva2.c | 6 ++++-- 6 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/encoder/lame_encoder.c b/src/encoder/lame_encoder.c index 3bb99ea2..53594d34 100644 --- a/src/encoder/lame_encoder.c +++ b/src/encoder/lame_encoder.c @@ -23,6 +23,9 @@ #include "audio_format.h" #include + +#include + #include #include @@ -225,7 +228,7 @@ lame_encoder_close(struct encoder *_encoder) static bool lame_encoder_write(struct encoder *_encoder, const void *data, size_t length, - G_GNUC_UNUSED GError **error) + gcc_unused GError **error) { struct lame_encoder *encoder = (struct lame_encoder *)_encoder; unsigned num_frames; @@ -283,7 +286,7 @@ lame_encoder_read(struct encoder *_encoder, void *dest, size_t length) } static const char * -lame_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder) +lame_encoder_get_mime_type(gcc_unused struct encoder *_encoder) { return "audio/mpeg"; } diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c index fa1a0a03..b973adf7 100644 --- a/src/encoder/null_encoder.c +++ b/src/encoder/null_encoder.c @@ -22,6 +22,9 @@ #include "encoder_plugin.h" #include "util/fifo_buffer.h" #include "util/growing_fifo.h" +#include "gcc.h" + +#include #include #include @@ -34,15 +37,9 @@ struct null_encoder { extern const struct encoder_plugin null_encoder_plugin; -static inline GQuark -null_encoder_quark(void) -{ - return g_quark_from_static_string("null_encoder"); -} - static struct encoder * -null_encoder_init(G_GNUC_UNUSED const struct config_param *param, - G_GNUC_UNUSED GError **error) +null_encoder_init(gcc_unused const struct config_param *param, + gcc_unused GError **error) { struct null_encoder *encoder; @@ -71,8 +68,8 @@ null_encoder_close(struct encoder *_encoder) static bool null_encoder_open(struct encoder *_encoder, - G_GNUC_UNUSED struct audio_format *audio_format, - G_GNUC_UNUSED GError **error) + gcc_unused struct audio_format *audio_format, + gcc_unused GError **error) { struct null_encoder *encoder = (struct null_encoder *)_encoder; @@ -83,7 +80,7 @@ null_encoder_open(struct encoder *_encoder, static bool null_encoder_write(struct encoder *_encoder, const void *data, size_t length, - G_GNUC_UNUSED GError **error) + gcc_unused GError **error) { struct null_encoder *encoder = (struct null_encoder *)_encoder; diff --git a/src/encoder/twolame_encoder.c b/src/encoder/twolame_encoder.c index 934b2ab2..ff184977 100644 --- a/src/encoder/twolame_encoder.c +++ b/src/encoder/twolame_encoder.c @@ -23,6 +23,9 @@ #include "audio_format.h" #include + +#include + #include #include @@ -224,7 +227,7 @@ twolame_encoder_close(struct encoder *_encoder) } static bool -twolame_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error) +twolame_encoder_flush(struct encoder *_encoder, gcc_unused GError **error) { struct twolame_encoder *encoder = (struct twolame_encoder *)_encoder; @@ -235,7 +238,7 @@ twolame_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error) static bool twolame_encoder_write(struct encoder *_encoder, const void *data, size_t length, - G_GNUC_UNUSED GError **error) + gcc_unused GError **error) { struct twolame_encoder *encoder = (struct twolame_encoder *)_encoder; unsigned num_frames; @@ -289,7 +292,7 @@ twolame_encoder_read(struct encoder *_encoder, void *dest, size_t length) } static const char * -twolame_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder) +twolame_encoder_get_mime_type(gcc_unused struct encoder *_encoder) { return "audio/mpeg"; } diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c index a6ee512d..9b3c21fc 100644 --- a/src/encoder/wave_encoder.c +++ b/src/encoder/wave_encoder.c @@ -23,6 +23,8 @@ #include "util/fifo_buffer.h" #include "util/growing_fifo.h" +#include + #include #include @@ -51,12 +53,6 @@ struct wave_header { extern const struct encoder_plugin wave_encoder_plugin; -static inline GQuark -wave_encoder_quark(void) -{ - return g_quark_from_static_string("wave_encoder"); -} - static void fill_wave_header(struct wave_header *header, int channels, int bits, int freq, int block_size) @@ -85,8 +81,8 @@ fill_wave_header(struct wave_header *header, int channels, int bits, } static struct encoder * -wave_encoder_init(G_GNUC_UNUSED const struct config_param *param, - G_GNUC_UNUSED GError **error) +wave_encoder_init(gcc_unused const struct config_param *param, + gcc_unused GError **error) { struct wave_encoder *encoder; @@ -106,8 +102,8 @@ wave_encoder_finish(struct encoder *_encoder) static bool wave_encoder_open(struct encoder *_encoder, - G_GNUC_UNUSED struct audio_format *audio_format, - G_GNUC_UNUSED GError **error) + gcc_unused struct audio_format *audio_format, + gcc_unused GError **error) { struct wave_encoder *encoder = (struct wave_encoder *)_encoder; @@ -202,7 +198,7 @@ pcm24_to_wave(uint8_t *dst8, const uint32_t *src32, size_t length) static bool wave_encoder_write(struct encoder *_encoder, const void *src, size_t length, - G_GNUC_UNUSED GError **error) + gcc_unused GError **error) { struct wave_encoder *encoder = (struct wave_encoder *)_encoder; @@ -261,7 +257,7 @@ wave_encoder_read(struct encoder *_encoder, void *dest, size_t length) } static const char * -wave_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder) +wave_encoder_get_mime_type(gcc_unused struct encoder *_encoder) { return "audio/wav"; } diff --git a/src/filter/chain_filter_plugin.c b/src/filter/chain_filter_plugin.c index 2c785a36..0788b675 100644 --- a/src/filter/chain_filter_plugin.c +++ b/src/filter/chain_filter_plugin.c @@ -25,6 +25,8 @@ #include "filter_registry.h" #include "audio_format.h" +#include + #include struct filter_chain { diff --git a/test/dump_rva2.c b/test/dump_rva2.c index bb47fc13..6e978c42 100644 --- a/test/dump_rva2.c +++ b/test/dump_rva2.c @@ -26,6 +26,8 @@ #include +#include + #ifdef HAVE_LOCALE_H #include #endif @@ -46,8 +48,8 @@ tag_new(void) } void -tag_add_item_n(G_GNUC_UNUSED struct tag *tag, G_GNUC_UNUSED enum tag_type type, - G_GNUC_UNUSED const char *value, G_GNUC_UNUSED size_t len) +tag_add_item_n(gcc_unused struct tag *tag, gcc_unused enum tag_type type, + gcc_unused const char *value, gcc_unused size_t len) { } -- cgit v1.2.3