warnings: avoid set-but-unused warnings with load-save disabled

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 6a59354b011639a967910de15d0f2948e36e7053..417490e5ce7237598f9eb74b8d6bde5bca9926c0 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -401,15 +401,13 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
 static void
 gst_bin_class_init (GstBinClass * klass)
 {
-  GObjectClass *gobject_class;
-  GstObjectClass *gstobject_class;
-  GstElementClass *gstelement_class;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+  GstObjectClass *gstobject_class = (GstObjectClass *) klass;
+#endif
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
   GError *err;
 
-  gobject_class = (GObjectClass *) klass;
-  gstobject_class = (GstObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
   g_type_class_add_private (klass, sizeof (GstBinPrivate));
 
   gobject_class->set_property = gst_bin_set_property;

diff --git a/gst/gstelement.c b/gst/gstelement.c
index df22caf3aa4b2b211ed92b4168cf355ca5eb06b4..b101b6b65f5ce751ed003d5b2d56ea24566885b6 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -192,11 +192,10 @@ gst_element_get_type (void)
 static void
 gst_element_class_init (GstElementClass * klass)
 {
-  GObjectClass *gobject_class;
-  GstObjectClass *gstobject_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstobject_class = (GstObjectClass *) klass;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+  GstObjectClass *gstobject_class = (GstObjectClass *) klass;
+#endif
 
   parent_class = g_type_class_peek_parent (klass);
 

diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index e3306d1c811c22c3c0a6f670344252b27705cc38..f42b6edaf53597d87df8ff6a973d8ba975889f1e 100644 (file)
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -664,22 +664,28 @@ print_element_flag_info (GstElement * element)
 static void
 print_implementation_info (GstElement * element)
 {
-  GstObjectClass *gstobject_class;
-  GstElementClass *gstelement_class;
-
-  gstobject_class = GST_OBJECT_CLASS (G_OBJECT_GET_CLASS (element));
-  gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
-
   n_print ("\n");
   n_print ("Element Implementation:\n");
 
-  n_print ("  Has change_state() function: %s\n",
-      GST_DEBUG_FUNCPTR_NAME (gstelement_class->change_state));
+  {
+    GstElementClass *gstelement_class;
+
+    gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
+
+    n_print ("  Has change_state() function: %s\n",
+        GST_DEBUG_FUNCPTR_NAME (gstelement_class->change_state));
+  }
 #ifndef GST_DISABLE_LOADSAVE
-  n_print ("  Has custom save_thyself() function: %s\n",
-      GST_DEBUG_FUNCPTR_NAME (gstobject_class->save_thyself));
-  n_print ("  Has custom restore_thyself() function: %s\n",
-      GST_DEBUG_FUNCPTR_NAME (gstobject_class->restore_thyself));
+  {
+    GstObjectClass *gstobject_class;
+
+    gstobject_class = GST_OBJECT_CLASS (G_OBJECT_GET_CLASS (element));
+
+    n_print ("  Has custom save_thyself() function: %s\n",
+        GST_DEBUG_FUNCPTR_NAME (gstobject_class->save_thyself));
+    n_print ("  Has custom restore_thyself() function: %s\n",
+        GST_DEBUG_FUNCPTR_NAME (gstobject_class->restore_thyself));
+  }
 #endif
 }
 

diff --git a/tools/gst-xmlinspect.c b/tools/gst-xmlinspect.c
index 4e608071ffb0ff316bbb628c84f2d7c44fbde203..d1df7e1b6db40dc0c13858eb4ccd22f6abb33083 100644 (file)
--- a/tools/gst-xmlinspect.c
+++ b/tools/gst-xmlinspect.c
@@ -438,7 +438,9 @@ static gint
 print_element_info (GstElementFactory * factory)
 {
   GstElement *element;
+#ifndef GST_DISABLE_LOADSAVE
   GstObjectClass *gstobject_class;
+#endif
   GstElementClass *gstelement_class;
   GList *pads;
   GstPad *pad;
@@ -453,7 +455,9 @@ print_element_info (GstElementFactory * factory)
   PUT_START_TAG (0, "element");
   PUT_ESCAPED (1, "name", GST_PLUGIN_FEATURE_NAME (factory));
 
+#ifndef GST_DISABLE_LOADSAVE
   gstobject_class = GST_OBJECT_CLASS (G_OBJECT_GET_CLASS (element));
+#endif
   gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
 
   PUT_START_TAG (1, "details");