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

This commit is contained in:
Stefan Sauer 2011-11-27 20:36:31 +01:00
parent 7eb796d447
commit 52e3861e91
4 changed files with 31 additions and 24 deletions

View file

@ -401,15 +401,13 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
static void static void
gst_bin_class_init (GstBinClass * klass) gst_bin_class_init (GstBinClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class = (GObjectClass *) klass;
GstObjectClass *gstobject_class; #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
GstElementClass *gstelement_class; GstObjectClass *gstobject_class = (GstObjectClass *) klass;
#endif
GstElementClass *gstelement_class = (GstElementClass *) klass;
GError *err; GError *err;
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
g_type_class_add_private (klass, sizeof (GstBinPrivate)); g_type_class_add_private (klass, sizeof (GstBinPrivate));
gobject_class->set_property = gst_bin_set_property; gobject_class->set_property = gst_bin_set_property;

View file

@ -192,11 +192,10 @@ gst_element_get_type (void)
static void static void
gst_element_class_init (GstElementClass * klass) gst_element_class_init (GstElementClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class = (GObjectClass *) klass;
GstObjectClass *gstobject_class; #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
GstObjectClass *gstobject_class = (GstObjectClass *) klass;
gobject_class = (GObjectClass *) klass; #endif
gstobject_class = (GstObjectClass *) klass;
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);

View file

@ -664,22 +664,28 @@ print_element_flag_info (GstElement * element)
static void static void
print_implementation_info (GstElement * element) 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 ("\n");
n_print ("Element Implementation:\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 #ifndef GST_DISABLE_LOADSAVE
n_print (" Has custom save_thyself() function: %s\n", {
GST_DEBUG_FUNCPTR_NAME (gstobject_class->save_thyself)); GstObjectClass *gstobject_class;
n_print (" Has custom restore_thyself() function: %s\n",
GST_DEBUG_FUNCPTR_NAME (gstobject_class->restore_thyself)); 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 #endif
} }

View file

@ -438,7 +438,9 @@ static gint
print_element_info (GstElementFactory * factory) print_element_info (GstElementFactory * factory)
{ {
GstElement *element; GstElement *element;
#ifndef GST_DISABLE_LOADSAVE
GstObjectClass *gstobject_class; GstObjectClass *gstobject_class;
#endif
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
GList *pads; GList *pads;
GstPad *pad; GstPad *pad;
@ -453,7 +455,9 @@ print_element_info (GstElementFactory * factory)
PUT_START_TAG (0, "element"); PUT_START_TAG (0, "element");
PUT_ESCAPED (1, "name", GST_PLUGIN_FEATURE_NAME (factory)); PUT_ESCAPED (1, "name", GST_PLUGIN_FEATURE_NAME (factory));
#ifndef GST_DISABLE_LOADSAVE
gstobject_class = GST_OBJECT_CLASS (G_OBJECT_GET_CLASS (element)); gstobject_class = GST_OBJECT_CLASS (G_OBJECT_GET_CLASS (element));
#endif
gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element)); gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
PUT_START_TAG (1, "details"); PUT_START_TAG (1, "details");