Fix some unused-but-set-variable warnings with gcc 4.6

2 files changed, 5 insertions, 103 deletions

diff --git a/gst/debugutils/gstchecksumsink.c b/gst/debugutils/gstchecksumsink.c
index 7e6cb5ed4..bf9fba6f2 100644
--- a/gst/debugutils/gstchecksumsink.c
+++ b/gst/debugutils/gstchecksumsink.c
@@ -25,13 +25,6 @@
 #include <gst/base/gstbasesink.h>
 #include "gstchecksumsink.h"
 
-/* prototypes */
-
-
-static void gst_checksum_sink_set_property (GObject * object,
-    guint property_id, const GValue * value, GParamSpec * pspec);
-static void gst_checksum_sink_get_property (GObject * object,
-    guint property_id, GValue * value, GParamSpec * pspec);
 static void gst_checksum_sink_dispose (GObject * object);
 static void gst_checksum_sink_finalize (GObject * object);
 
@@ -40,14 +33,6 @@ static gboolean gst_checksum_sink_stop (GstBaseSink * sink);
 static GstFlowReturn
 gst_checksum_sink_render (GstBaseSink * sink, GstBuffer * buffer);
 
-enum
-{
-  PROP_0,
-  PROP_SYNC
-};
-
-/* pad templates */
-
 static GstStaticPadTemplate gst_checksum_sink_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -86,8 +71,6 @@ gst_checksum_sink_class_init (GstChecksumSinkClass * klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstBaseSinkClass *base_sink_class = GST_BASE_SINK_CLASS (klass);
 
-  gobject_class->set_property = gst_checksum_sink_set_property;
-  gobject_class->get_property = gst_checksum_sink_get_property;
   gobject_class->dispose = gst_checksum_sink_dispose;
   gobject_class->finalize = gst_checksum_sink_finalize;
   base_sink_class->start = GST_DEBUG_FUNCPTR (gst_checksum_sink_start);
@@ -100,80 +83,29 @@ gst_checksum_sink_init (GstChecksumSink * checksumsink,
     GstChecksumSinkClass * checksumsink_class)
 {
   gst_base_sink_set_sync (GST_BASE_SINK (checksumsink), FALSE);
-
-}
-
-void
-gst_checksum_sink_set_property (GObject * object, guint property_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstChecksumSink *checksumsink;
-
-  g_return_if_fail (GST_IS_CHECKSUM_SINK (object));
-  checksumsink = GST_CHECKSUM_SINK (object);
-
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-void
-gst_checksum_sink_get_property (GObject * object, guint property_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstChecksumSink *checksumsink;
-
-  g_return_if_fail (GST_IS_CHECKSUM_SINK (object));
-  checksumsink = GST_CHECKSUM_SINK (object);
-
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
 }
 
 void
 gst_checksum_sink_dispose (GObject * object)
 {
-  GstChecksumSink *checksumsink;
-
-  g_return_if_fail (GST_IS_CHECKSUM_SINK (object));
-  checksumsink = GST_CHECKSUM_SINK (object);
-
-  /* clean up as possible.  may be called multiple times */
-
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 void
 gst_checksum_sink_finalize (GObject * object)
 {
-  GstChecksumSink *checksumsink;
-
-  g_return_if_fail (GST_IS_CHECKSUM_SINK (object));
-  checksumsink = GST_CHECKSUM_SINK (object);
-
-  /* clean up object here */
-
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-
-
 static gboolean
 gst_checksum_sink_start (GstBaseSink * sink)
 {
-
   return TRUE;
 }
 
 static gboolean
 gst_checksum_sink_stop (GstBaseSink * sink)
 {
-
   return TRUE;
 }
 
diff --git a/gst/debugutils/gstchopmydata.c b/gst/debugutils/gstchopmydata.c
index 22eb2ca49..0d50571d6 100644
--- a/gst/debugutils/gstchopmydata.c
+++ b/gst/debugutils/gstchopmydata.c
@@ -55,8 +55,6 @@ static void gst_chop_my_data_set_property (GObject * object,
     guint property_id, const GValue * value, GParamSpec * pspec);
 static void gst_chop_my_data_get_property (GObject * object,
     guint property_id, GValue * value, GParamSpec * pspec);
-static void gst_chop_my_data_dispose (GObject * object);
-static void gst_chop_my_data_finalize (GObject * object);
 
 static GstStateChangeReturn
 gst_chop_my_data_change_state (GstElement * element, GstStateChange transition);
@@ -117,8 +115,6 @@ gst_chop_my_data_class_init (GstChopMyDataClass * klass)
 
   gobject_class->set_property = gst_chop_my_data_set_property;
   gobject_class->get_property = gst_chop_my_data_get_property;
-  gobject_class->dispose = gst_chop_my_data_dispose;
-  gobject_class->finalize = gst_chop_my_data_finalize;
   element_class->change_state =
       GST_DEBUG_FUNCPTR (gst_chop_my_data_change_state);
 
@@ -215,32 +211,6 @@ gst_chop_my_data_get_property (GObject * object, guint property_id,
   }
 }
 
-void
-gst_chop_my_data_dispose (GObject * object)
-{
-  GstChopMyData *chopmydata;
-
-  g_return_if_fail (GST_IS_CHOP_MY_DATA (object));
-  chopmydata = GST_CHOP_MY_DATA (object);
-
-  /* clean up as possible.  may be called multiple times */
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-void
-gst_chop_my_data_finalize (GObject * object)
-{
-  GstChopMyData *chopmydata;
-
-  g_return_if_fail (GST_IS_CHOP_MY_DATA (object));
-  chopmydata = GST_CHOP_MY_DATA (object);
-
-  /* clean up object here */
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
 static GstStateChangeReturn
 gst_chop_my_data_change_state (GstElement * element, GstStateChange transition)
 {
@@ -358,7 +328,6 @@ gst_chop_my_data_chain (GstPad * pad, GstBuffer * buffer)
 static gboolean
 gst_chop_my_data_sink_event (GstPad * pad, GstEvent * event)
 {
-  GstFlowReturn ret = GST_FLOW_OK;
   gboolean res;
   GstChopMyData *chopmydata;
 
@@ -368,7 +337,8 @@ gst_chop_my_data_sink_event (GstPad * pad, GstEvent * event)
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_FLUSH_START:
-      ret = gst_chop_my_data_process (chopmydata, TRUE);
+      /* FIXME: I don't think it should be doing this in FLUSH_START */
+      gst_chop_my_data_process (chopmydata, TRUE);
       res = gst_pad_push_event (chopmydata->srcpad, event);
       break;
     case GST_EVENT_FLUSH_STOP:
@@ -378,7 +348,7 @@ gst_chop_my_data_sink_event (GstPad * pad, GstEvent * event)
       res = gst_pad_push_event (chopmydata->srcpad, event);
       break;
     case GST_EVENT_EOS:
-      ret = gst_chop_my_data_process (chopmydata, TRUE);
+      gst_chop_my_data_process (chopmydata, TRUE);
       res = gst_pad_push_event (chopmydata->srcpad, event);
       break;
     default:
@@ -387,7 +357,7 @@ gst_chop_my_data_sink_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (chopmydata);
-  return TRUE;
+  return res;
 }
 
 static gboolean
@@ -410,5 +380,5 @@ gst_chop_my_data_src_event (GstPad * pad, GstEvent * event)
   }
 
   gst_object_unref (chopmydata);
-  return TRUE;
+  return res;
 }