registry: remove padding and signal vfuncs

And fix signal GTypes and marshaller. No one will ever
need to subclass our registry, so just remove the padding
and the signal vfuncs.

diff --git a/gst/gstmarshal.list b/gst/gstmarshal.list
index b9fc164..3889568 100644 (file)
--- a/gst/gstmarshal.list
+++ b/gst/gstmarshal.list
@@ -4,7 +4,6 @@ VOID:INT
 VOID:STRING
 VOID:BOXED
 VOID:BOXED,OBJECT
-VOID:POINTER
 VOID:POINTER,OBJECT
 VOID:OBJECT
 VOID:OBJECT,OBJECT

diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 2b6799d..b378e6a 100644 (file)
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -229,8 +229,8 @@ gst_registry_class_init (GstRegistryClass * klass)
    */
   gst_registry_signals[PLUGIN_ADDED] =
       g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRegistryClass, plugin_added), NULL,
-      NULL, gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT,
+      G_TYPE_NONE, 1, GST_TYPE_PLUGIN);
 
   /**
    * GstRegistry::feature-added:
@@ -242,8 +242,8 @@ gst_registry_class_init (GstRegistryClass * klass)
    */
   gst_registry_signals[FEATURE_ADDED] =
       g_signal_new ("feature-added", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRegistryClass, feature_added),
-      NULL, NULL, gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT,
+      G_TYPE_NONE, 1, GST_TYPE_PLUGIN_FEATURE);
 
   gobject_class->finalize = gst_registry_finalize;
 }

diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index d091d4f..bcbe282 100644 (file)
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -51,23 +51,12 @@ struct _GstRegistry {
 
   /*< private >*/
   GstRegistryPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstRegistryClass {
   GstObjectClass        parent_class;
-
-  /* signals */
-  void                  (*plugin_added)         (GstRegistry *registry, GstPlugin *plugin);
-  void                  (*feature_added)        (GstRegistry *registry, GstPluginFeature *feature);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
 };
 
-
-/* normal GObject stuff */
 GType                   gst_registry_get_type           (void);
 
 GstRegistry *           gst_registry_get_default        (void);