From 896daf08f6209c97baa0665e5420e517fc13f0f1 Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Sun, 17 Jun 2001 08:55:53 +0000 Subject: [PATCH] Mostly went around converting G_OBJECT_TYPE(klass) to G_TYPE_FROM_CLASS(klass) Original commit message from CVS: Mostly went around converting G_OBJECT_TYPE(klass) to G_TYPE_FROM_CLASS(klass) --- gst/autoplug/gstautoplugcache.c | 24 ++++++++++++------------ gst/gstobject.c | 4 ++-- gst/gstobject.h | 2 +- gst/gsttypefind.c | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gst/autoplug/gstautoplugcache.c b/gst/autoplug/gstautoplugcache.c index a6e8556f8e..213632698a 100644 --- a/gst/autoplug/gstautoplugcache.c +++ b/gst/autoplug/gstautoplugcache.c @@ -132,19 +132,9 @@ gst_autoplugcache_class_init (GstAutoplugCacheClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - gst_autoplugcache_signals[FIRST_BUFFER] = - g_signal_newc ("first_buffer", G_OBJECT_TYPE(gobject_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstAutoplugCacheClass, first_buffer), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, - G_TYPE_POINTER); - gst_autoplugcache_signals[CACHE_EMPTY] = - g_signal_newc ("cache_empty", G_OBJECT_TYPE(gobject_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstAutoplugCacheClass, cache_empty), NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BUFFER_COUNT, - g_param_spec_enum("buffer_count","buffer_count","buffer_count", - G_TYPE_INT,0,G_PARAM_READABLE)); // CHECKME! + g_param_spec_int("buffer_count","buffer_count","buffer_count", + 0,G_MAXINT,0,G_PARAM_READABLE)); // CHECKME! g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CAPS_PROXY, g_param_spec_boolean("caps_proxy","caps_proxy","caps_proxy", FALSE,G_PARAM_READWRITE)); // CHECKME! @@ -152,6 +142,16 @@ gst_autoplugcache_class_init (GstAutoplugCacheClass *klass) g_param_spec_boolean("reset","reset","reset", FALSE,G_PARAM_WRITABLE)); // CHECKME! + gst_autoplugcache_signals[FIRST_BUFFER] = + g_signal_newc ("first_buffer", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GstAutoplugCacheClass, first_buffer), NULL, NULL, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + G_TYPE_POINTER); + gst_autoplugcache_signals[CACHE_EMPTY] = + g_signal_newc ("cache_empty", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GstAutoplugCacheClass, cache_empty), NULL, NULL, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gobject_class->set_property = gst_autoplugcache_set_property; gobject_class->get_property = gst_autoplugcache_get_property; diff --git a/gst/gstobject.c b/gst/gstobject.c index a63ee79b8e..6c4b462c24 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -99,8 +99,8 @@ gst_object_class_init (GstObjectClass *klass) gst_object_signals[OBJECT_SAVED] = g_signal_newc("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstObjectClass, object_saved), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT,G_TYPE_NONE,1, - G_TYPE_OBJECT); + g_cclosure_marshal_VOID__POINTER,G_TYPE_NONE,1, + G_TYPE_POINTER); klass->path_string_separator = "/"; // FIXME!!! diff --git a/gst/gstobject.h b/gst/gstobject.h index 578e11b272..6a4c7eb3eb 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -33,7 +33,7 @@ #include #include #else -#include +#include #endif #include diff --git a/gst/gsttypefind.c b/gst/gsttypefind.c index 79c9b402dc..b95ad17960 100644 --- a/gst/gsttypefind.c +++ b/gst/gsttypefind.c @@ -99,8 +99,9 @@ gst_typefind_class_init (GstTypeFindClass *klass) gst_typefind_signals[HAVE_TYPE] = g_signal_newc ("have_type", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstTypeFindClass, have_type), NULL, NULL, - g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_POINTER); + G_STRUCT_OFFSET (GstTypeFindClass, have_type), NULL, NULL, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + G_TYPE_POINTER); gobject_class->set_property = gst_typefind_set_property; gobject_class->get_property = gst_typefind_get_property;