sbc: First attempt in fixing compiler warnings (still needs cleanup)

7 files changed, 6 insertions, 8 deletions

diff --git a/ext/sbc/gstsbcdec.c b/ext/sbc/gstsbcdec.c
index 2d16d74f8..71b87c166 100644
--- a/ext/sbc/gstsbcdec.c
+++ b/ext/sbc/gstsbcdec.c
@@ -27,6 +27,7 @@
 
 #include <string.h>
 
+#include "gstsbcutil.h"
 #include "gstsbcdec.h"
 
 GST_DEBUG_CATEGORY_STATIC (sbc_dec_debug);
diff --git a/ext/sbc/gstsbcdec.h b/ext/sbc/gstsbcdec.h
index df6879333..3fa7cd39f 100644
--- a/ext/sbc/gstsbcdec.h
+++ b/ext/sbc/gstsbcdec.h
@@ -24,7 +24,6 @@
 #include <gst/gst.h>
 
 #include "sbc.h"
-#include "gstsbcutil.h"
 
 G_BEGIN_DECLS
 
@@ -60,7 +59,7 @@ struct _GstSbcDecClass {
 	GstElementClass parent_class;
 };
 
-GType gst_sbc_dec_get_type(void);
+//GType gst_sbc_dec_get_type(void);
 
 gboolean gst_sbc_dec_plugin_init(GstPlugin *plugin);
 
diff --git a/ext/sbc/gstsbcenc.c b/ext/sbc/gstsbcenc.c
index 9a2f3e294..9ecde184e 100644
--- a/ext/sbc/gstsbcenc.c
+++ b/ext/sbc/gstsbcenc.c
@@ -27,8 +27,8 @@
 
 #include <string.h>
 
-#include "gstsbcenc.h"
 #include "gstsbcutil.h"
+#include "gstsbcenc.h"
 
 #define SBC_ENC_DEFAULT_MODE SBC_MODE_AUTO
 #define SBC_ENC_DEFAULT_BLOCKS 0
diff --git a/ext/sbc/gstsbcenc.h b/ext/sbc/gstsbcenc.h
index 17e89549a..0038f899b 100644
--- a/ext/sbc/gstsbcenc.h
+++ b/ext/sbc/gstsbcenc.h
@@ -68,7 +68,7 @@ struct _GstSbcEncClass {
 	GstElementClass parent_class;
 };
 
-GType gst_sbc_enc_get_type(void);
+//GType gst_sbc_enc_get_type(void);
 
 gboolean gst_sbc_enc_plugin_init(GstPlugin *plugin);
 
diff --git a/ext/sbc/gstsbcparse.c b/ext/sbc/gstsbcparse.c
index 0be78bdfd..80d2b7193 100644
--- a/ext/sbc/gstsbcparse.c
+++ b/ext/sbc/gstsbcparse.c
@@ -27,8 +27,8 @@
 
 #include <string.h>
 
-#include "gstsbcparse.h"
 #include "gstsbcutil.h"
+#include "gstsbcparse.h"
 
 GST_DEBUG_CATEGORY_STATIC (sbc_parse_debug);
 #define GST_CAT_DEFAULT sbc_parse_debug
diff --git a/ext/sbc/gstsbcparse.h b/ext/sbc/gstsbcparse.h
index eceeeea13..7a3f82661 100644
--- a/ext/sbc/gstsbcparse.h
+++ b/ext/sbc/gstsbcparse.h
@@ -62,7 +62,7 @@ struct _GstSbcParseClass {
 	GstElementClass parent_class;
 };
 
-GType gst_sbc_parse_get_type(void);
+//GType gst_sbc_parse_get_type(void);
 
 gboolean gst_sbc_parse_plugin_init(GstPlugin *plugin);
 
diff --git a/ext/sbc/gstsbcutil.h b/ext/sbc/gstsbcutil.h
index a3cf937c4..1f5d3270f 100644
--- a/ext/sbc/gstsbcutil.h
+++ b/ext/sbc/gstsbcutil.h
@@ -39,8 +39,6 @@ gint gst_sbc_select_subbands_from_list(const GValue *value);
 
 gint gst_sbc_select_bitpool_from_range(const GValue *value);
 
-gint gst_sbc_select_bitpool_from_range(const GValue *value);
-
 const gchar *gst_sbc_get_allocation_from_list(const GValue *value);
 
 const gchar *gst_sbc_get_mode_from_list(const GValue *value, gint channels);