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.
This commit is contained in:
Tim-Philipp Müller 2011-12-30 19:37:31 +00:00
parent 65975daec9
commit 7f1103544d
3 changed files with 4 additions and 16 deletions

View file

@ -4,7 +4,6 @@ VOID:INT
VOID:STRING VOID:STRING
VOID:BOXED VOID:BOXED
VOID:BOXED,OBJECT VOID:BOXED,OBJECT
VOID:POINTER
VOID:POINTER,OBJECT VOID:POINTER,OBJECT
VOID:OBJECT VOID:OBJECT
VOID:OBJECT,OBJECT VOID:OBJECT,OBJECT

View file

@ -229,8 +229,8 @@ gst_registry_class_init (GstRegistryClass * klass)
*/ */
gst_registry_signals[PLUGIN_ADDED] = gst_registry_signals[PLUGIN_ADDED] =
g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRegistryClass, plugin_added), NULL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT,
NULL, gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); G_TYPE_NONE, 1, GST_TYPE_PLUGIN);
/** /**
* GstRegistry::feature-added: * GstRegistry::feature-added:
@ -242,8 +242,8 @@ gst_registry_class_init (GstRegistryClass * klass)
*/ */
gst_registry_signals[FEATURE_ADDED] = gst_registry_signals[FEATURE_ADDED] =
g_signal_new ("feature-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("feature-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRegistryClass, feature_added), G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT,
NULL, NULL, gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); G_TYPE_NONE, 1, GST_TYPE_PLUGIN_FEATURE);
gobject_class->finalize = gst_registry_finalize; gobject_class->finalize = gst_registry_finalize;
} }

View file

@ -51,23 +51,12 @@ struct _GstRegistry {
/*< private >*/ /*< private >*/
GstRegistryPrivate *priv; GstRegistryPrivate *priv;
gpointer _gst_reserved[GST_PADDING];
}; };
struct _GstRegistryClass { struct _GstRegistryClass {
GstObjectClass parent_class; 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); GType gst_registry_get_type (void);
GstRegistry * gst_registry_get_default (void); GstRegistry * gst_registry_get_default (void);