Commit 61edf2c0 authored by Erik Walthinsen's avatar Erik Walthinsen
Browse files

bunch of changes to the loadsave/registry #ifdefs, they aren't totally correct yet

Original commit message from CVS:
bunch of changes to the loadsave/registry #ifdefs, they aren't totally correct yet
parent eb94357e
......@@ -170,7 +170,7 @@ gst_autoplug_to_renderers (GstAutoplug *autoplug, GstCaps *srccaps, GstElement *
static void gst_autoplugfactory_class_init (GstAutoplugFactoryClass *klass);
static void gst_autoplugfactory_init (GstAutoplugFactory *factory);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_REGISTRY
static xmlNodePtr gst_autoplugfactory_save_thyself (GstObject *object, xmlNodePtr parent);
static void gst_autoplugfactory_restore_thyself (GstObject *object, xmlNodePtr parent);
#endif
......@@ -214,7 +214,7 @@ gst_autoplugfactory_class_init (GstAutoplugFactoryClass *klass)
factory_parent_class = g_type_class_ref (GST_TYPE_PLUGIN_FEATURE);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_REGISTRY
gstobject_class->save_thyself = GST_DEBUG_FUNCPTR (gst_autoplugfactory_save_thyself);
gstobject_class->restore_thyself = GST_DEBUG_FUNCPTR (gst_autoplugfactory_restore_thyself);
#endif
......@@ -366,7 +366,7 @@ gst_autoplugfactory_make (const gchar *name)
return gst_autoplugfactory_create (factory);;
}
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_REGISTRY
static xmlNodePtr
gst_autoplugfactory_save_thyself (GstObject *object, xmlNodePtr parent)
{
......@@ -413,4 +413,4 @@ gst_autoplugfactory_restore_thyself (GstObject *object, xmlNodePtr parent)
children = children->next;
}
}
#endif
#endif /* GST_DISABLE_REGISTRY */
......@@ -112,18 +112,18 @@ gst_bin_class_init (GstBinClass *klass)
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
GST_TYPE_ELEMENT);
klass->change_state_type = gst_bin_change_state_type;
klass->iterate = gst_bin_iterate_func;
klass->change_state_type = GST_DEBUG_FUNCPTR (gst_bin_change_state_type);
klass->iterate = GST_DEBUG_FUNCPTR (gst_bin_iterate_func);
#ifndef GST_DISABLE_LOADSAVE
gstobject_class->save_thyself = gst_bin_save_thyself;
gstobject_class->restore_thyself = gst_bin_restore_thyself;
gstobject_class->save_thyself = GST_DEBUG_FUNCPTR (gst_bin_save_thyself);
gstobject_class->restore_thyself = GST_DEBUG_FUNCPTR (gst_bin_restore_thyself);
#endif
gstelement_class->change_state = gst_bin_change_state;
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_bin_change_state);
// FIXME
// gobject_class->destroy = gst_bin_real_destroy;
// gobject_class->destroy = GST_DEBUG_FUNCPTR (gst_bin_real_destroy);
}
static void
......@@ -647,7 +647,7 @@ gst_bin_restore_thyself (GstObject *object,
field = field->next;
}
}
#endif // GST_DISABLE_LOADSAVE
#endif /* GST_DISABLE_LOADSAVE */
/**
......
......@@ -545,7 +545,7 @@ gst_caps_check_compatibility (GstCaps *fromcaps, GstCaps *tocaps)
return FALSE;
}
#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
/**
* gst_caps_save_thyself:
* @caps: a capabilty to save
......@@ -629,4 +629,4 @@ gst_caps_load_thyself (xmlNodePtr parent)
return result;
}
#endif /* (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) */
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
......@@ -1203,7 +1203,7 @@ gst_element_restore_thyself (xmlNodePtr self, GstObject *parent)
return element;
}
#endif // GST_DISABLE_LOADSAVE
#endif /* GST_DISABLE_LOADSAVE */
/**
* gst_element_set_sched:
......
......@@ -31,7 +31,7 @@ static void gst_elementfactory_init (GstElementFactory *factory);
#ifndef GST_DISABLE_REGISTRY
static void gst_elementfactory_restore_thyself (GstObject *object, xmlNodePtr parent);
static xmlNodePtr gst_elementfactory_save_thyself (GstObject *object, xmlNodePtr parent);
#endif /* GST_DISABLE_REGISTRY */
#endif
static void gst_elementfactory_unload_thyself (GstPluginFeature *feature);
......@@ -80,7 +80,7 @@ gst_elementfactory_class_init (GstElementFactoryClass *klass)
#ifndef GST_DISABLE_REGISTRY
gstobject_class->save_thyself = GST_DEBUG_FUNCPTR (gst_elementfactory_save_thyself);
gstobject_class->restore_thyself = GST_DEBUG_FUNCPTR (gst_elementfactory_restore_thyself);
#endif /* GST_DISABLE_REGISTRY */
#endif
gstpluginfeature_class->unload_thyself = GST_DEBUG_FUNCPTR (gst_elementfactory_unload_thyself);
......
......@@ -27,7 +27,7 @@
/* Object signals and args */
enum {
PARENT_SET,
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
OBJECT_SAVED,
#endif
LAST_SIGNAL
......@@ -98,7 +98,7 @@ gst_object_class_init (GstObjectClass *klass)
G_STRUCT_OFFSET (GstObjectClass, parent_set), NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,G_TYPE_NONE,1,
G_TYPE_OBJECT);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
gst_object_signals[OBJECT_SAVED] =
g_signal_new("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstObjectClass, object_saved), NULL, NULL,
......@@ -456,7 +456,7 @@ gst_object_check_uniqueness (GList *list, const gchar *name)
}
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
/**
* gst_object_save_thyself:
* @object: GstObject to save
......@@ -506,7 +506,7 @@ gst_object_restore_thyself (GstObject *object, xmlNodePtr parent)
if (oclass->restore_thyself)
oclass->restore_thyself (object, parent);
}
#endif // GST_DISABLE_LOADSAVE
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
/**
* gst_object_get_path_string:
......@@ -587,9 +587,9 @@ struct _GstSignalObjectClass {
GObjectClass parent_class;
/* signals */
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
void (*object_loaded) (GstSignalObject *object, GstObject *new, xmlNodePtr self);
#endif /* GST_DISABLE_LOADSAVE */
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
};
static GType
......@@ -623,7 +623,7 @@ gst_signal_object_class_init (GstSignalObjectClass *klass)
parent_class = g_type_class_ref (G_TYPE_OBJECT);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
gst_signal_object_signals[SO_OBJECT_LOADED] =
g_signal_new("object_loaded", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstObjectClass, parent_set), NULL, NULL,
......@@ -657,7 +657,7 @@ gst_class_signal_connect (GstObjectClass *klass,
return g_signal_connect (klass->signal_object, name, func, func_data);
}
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
/**
* gst_class_signal_emit_by_name:
* @object: the object that sends the signal
......@@ -678,4 +678,4 @@ gst_class_signal_emit_by_name (GstObject *object,
g_signal_emit_by_name (oclass->signal_object, name, object, self);
}
#endif // GST_DISABLE_LOADSAVE
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
......@@ -102,14 +102,14 @@ struct _GstObjectClass {
/* signals */
void (*parent_set) (GstObject *object, GstObject *parent);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
void (*object_saved) (GstObject *object, xmlNodePtr parent);
#endif
/* functions go here */
void (*destroy) (GstObject *object);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
xmlNodePtr (*save_thyself) (GstObject *object, xmlNodePtr parent);
void (*restore_thyself) (GstObject *object, xmlNodePtr self);
#endif
......@@ -147,7 +147,7 @@ void gst_object_unparent (GstObject *object);
gboolean gst_object_check_uniqueness (GList *list, const gchar *name);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
xmlNodePtr gst_object_save_thyself (GstObject *object, xmlNodePtr parent);
void gst_object_restore_thyself (GstObject *object, xmlNodePtr parent);
#else
......@@ -170,7 +170,7 @@ guint gst_class_signal_connect (GstObjectClass *klass,
gpointer func,
gpointer func_data);
#ifndef GST_DISABLE_LOADSAVE
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
void gst_class_signal_emit_by_name (GstObject *object,
const gchar *name,
xmlNodePtr self);
......
......@@ -1399,7 +1399,7 @@ gst_pad_ghost_save_thyself (GstPad *pad,
return self;
}
#endif // GST_DISABLE_LOADSAVE
#endif /* GST_DISABLE_LOADSAVE */
#ifndef gst_pad_push
/**
......
......@@ -105,7 +105,7 @@ _gst_plugin_initialize (void)
gst_plugin_load_thyself (doc->xmlRootNode);
xmlFreeDoc (doc);
#endif // GST_DISABLE_REGISTRY
#endif /* GST_DISABLE_REGISTRY */
}
void
......@@ -845,7 +845,7 @@ gst_plugin_load_thyself (xmlNodePtr parent)
}
GST_INFO (GST_CAT_PLUGIN_LOADING, "added %d features ", featurecount);
}
#endif // GST_DISABLE_REGISTRY
#endif /* GST_DISABLE_REGISTRY */
/**
......
......@@ -986,7 +986,7 @@ end:
return compatible;
}
#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
static xmlNodePtr
gst_props_save_thyself_func (GstPropsEntry *entry, xmlNodePtr parent)
{
......@@ -1241,5 +1241,5 @@ gst_props_load_thyself (xmlNodePtr parent)
return props;
}
#endif /* (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) */
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
......@@ -124,16 +124,16 @@ gst_thread_class_init (GstThreadClass *klass)
// gobject_class->destroy = gst_thread_real_destroy;
#ifndef GST_DISABLE_LOADSAVE
gstobject_class->save_thyself = gst_thread_save_thyself;
gstobject_class->restore_thyself = gst_thread_restore_thyself;
gstobject_class->save_thyself = GST_DEBUG_FUNCPTR (gst_thread_save_thyself);
gstobject_class->restore_thyself = GST_DEBUG_FUNCPTR gst_thread_restore_thyself);
#endif
gstelement_class->change_state = gst_thread_change_state;
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_thread_change_state);
// gstbin_class->schedule = gst_thread_schedule_dummy;
gobject_class->set_property = gst_thread_set_property;
gobject_class->get_property = gst_thread_get_property;
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_thread_set_property);
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_thread_get_property);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment