6 files changed, 20 insertions, 26 deletions
diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx
index dabfb0ae6..b232d6568 100644
--- a/src/filter/ChainFilterPlugin.cxx
+++ b/src/filter/ChainFilterPlugin.cxx
@@ -54,8 +54,8 @@ filter_quark(void)
 }
 
 static struct filter *
-chain_filter_init(G_GNUC_UNUSED const struct config_param *param,
-		  G_GNUC_UNUSED GError **error_r)
+chain_filter_init(gcc_unused const struct config_param *param,
+		  gcc_unused GError **error_r)
 {
 	ChainFilter *chain = new ChainFilter();
 
diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/NormalizeFilterPlugin.cxx
index 0dc36c5bc..af7a5efbd 100644
--- a/src/filter/NormalizeFilterPlugin.cxx
+++ b/src/filter/NormalizeFilterPlugin.cxx
@@ -36,15 +36,9 @@ struct normalize_filter {
 	struct pcm_buffer buffer;
 };
 
-static inline GQuark
-normalize_quark(void)
-{
-	return g_quark_from_static_string("normalize");
-}
-
 static struct filter *
-normalize_filter_init(G_GNUC_UNUSED const struct config_param *param,
-		      G_GNUC_UNUSED GError **error_r)
+normalize_filter_init(gcc_unused const struct config_param *param,
+		      gcc_unused GError **error_r)
 {
 	struct normalize_filter *filter = g_new(struct normalize_filter, 1);
 
@@ -62,7 +56,7 @@ normalize_filter_finish(struct filter *filter)
 static const struct audio_format *
 normalize_filter_open(struct filter *_filter,
 		      struct audio_format *audio_format,
-		      G_GNUC_UNUSED GError **error_r)
+		      gcc_unused GError **error_r)
 {
 	struct normalize_filter *filter = (struct normalize_filter *)_filter;
 
@@ -87,7 +81,7 @@ normalize_filter_close(struct filter *_filter)
 static const void *
 normalize_filter_filter(struct filter *_filter,
 			const void *src, size_t src_size, size_t *dest_size_r,
-			G_GNUC_UNUSED GError **error_r)
+			gcc_unused GError **error_r)
 {
 	struct normalize_filter *filter = (struct normalize_filter *)_filter;
 
diff --git a/src/filter/NullFilterPlugin.cxx b/src/filter/NullFilterPlugin.cxx
index 9c1a9c959..83082de55 100644
--- a/src/filter/NullFilterPlugin.cxx
+++ b/src/filter/NullFilterPlugin.cxx
@@ -28,17 +28,17 @@
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
+#include "gcc.h"
 
 #include <glib.h>
-#include <assert.h>
 
 struct null_filter {
 	struct filter filter;
 };
 
 static struct filter *
-null_filter_init(G_GNUC_UNUSED const struct config_param *param,
-		 G_GNUC_UNUSED GError **error_r)
+null_filter_init(gcc_unused const struct config_param *param,
+		 gcc_unused GError **error_r)
 {
 	struct null_filter *filter = g_new(struct null_filter, 1);
 
@@ -56,7 +56,7 @@ null_filter_finish(struct filter *_filter)
 
 static const struct audio_format *
 null_filter_open(struct filter *_filter, struct audio_format *audio_format,
-		 G_GNUC_UNUSED GError **error_r)
+		 gcc_unused GError **error_r)
 {
 	struct null_filter *filter = (struct null_filter *)_filter;
 	(void)filter;
@@ -74,7 +74,7 @@ null_filter_close(struct filter *_filter)
 static const void *
 null_filter_filter(struct filter *_filter,
 		   const void *src, size_t src_size,
-		   size_t *dest_size_r, G_GNUC_UNUSED GError **error_r)
+		   size_t *dest_size_r, gcc_unused GError **error_r)
 {
 	struct null_filter *filter = (struct null_filter *)_filter;
 	(void)filter;
diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx
index 856213530..59756a619 100644
--- a/src/filter/ReplayGainFilterPlugin.cxx
+++ b/src/filter/ReplayGainFilterPlugin.cxx
@@ -114,8 +114,8 @@ replay_gain_filter_update(struct replay_gain_filter *filter)
 }
 
 static struct filter *
-replay_gain_filter_init(G_GNUC_UNUSED const struct config_param *param,
-			G_GNUC_UNUSED GError **error_r)
+replay_gain_filter_init(gcc_unused const struct config_param *param,
+			gcc_unused GError **error_r)
 {
 	struct replay_gain_filter *filter = g_new(struct replay_gain_filter, 1);
 
@@ -138,7 +138,7 @@ replay_gain_filter_finish(struct filter *filter)
 static const struct audio_format *
 replay_gain_filter_open(struct filter *_filter,
 			struct audio_format *audio_format,
-			G_GNUC_UNUSED GError **error_r)
+			gcc_unused GError **error_r)
 {
 	struct replay_gain_filter *filter =
 		(struct replay_gain_filter *)_filter;
diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx
index 35f8c5c76..dd24bde9a 100644
--- a/src/filter/RouteFilterPlugin.cxx
+++ b/src/filter/RouteFilterPlugin.cxx
@@ -228,7 +228,7 @@ route_filter_parse(const struct config_param *param,
 
 static struct filter *
 route_filter_init(const struct config_param *param,
-		 G_GNUC_UNUSED GError **error_r)
+		  gcc_unused GError **error_r)
 {
 	struct route_filter *filter = g_new(struct route_filter, 1);
 	filter_init(&filter->base, &route_filter_plugin);
@@ -250,7 +250,7 @@ route_filter_finish(struct filter *_filter)
 
 static const struct audio_format *
 route_filter_open(struct filter *_filter, struct audio_format *audio_format,
-		  G_GNUC_UNUSED GError **error_r)
+		  gcc_unused GError **error_r)
 {
 	struct route_filter *filter = (struct route_filter *)_filter;
 
@@ -285,7 +285,7 @@ route_filter_close(struct filter *_filter)
 static const void *
 route_filter_filter(struct filter *_filter,
 		   const void *src, size_t src_size,
-		   size_t *dest_size_r, G_GNUC_UNUSED GError **error_r)
+		   size_t *dest_size_r, gcc_unused GError **error_r)
 {
 	struct route_filter *filter = (struct route_filter *)_filter;
 
diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx
index f1a1f4784..86c99b83a 100644
--- a/src/filter/VolumeFilterPlugin.cxx
+++ b/src/filter/VolumeFilterPlugin.cxx
@@ -50,8 +50,8 @@ volume_quark(void)
 }
 
 static struct filter *
-volume_filter_init(G_GNUC_UNUSED const struct config_param *param,
-		   G_GNUC_UNUSED GError **error_r)
+volume_filter_init(gcc_unused const struct config_param *param,
+		   gcc_unused GError **error_r)
 {
 	struct volume_filter *filter = g_new(struct volume_filter, 1);
 
@@ -69,7 +69,7 @@ volume_filter_finish(struct filter *filter)
 
 static const struct audio_format *
 volume_filter_open(struct filter *_filter, struct audio_format *audio_format,
-		   G_GNUC_UNUSED GError **error_r)
+		   gcc_unused GError **error_r)
 {
 	struct volume_filter *filter = (struct volume_filter *)_filter;