mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
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)
This commit is contained in:
parent
faa9499048
commit
896daf08f6
4 changed files with 18 additions and 17 deletions
|
@ -132,19 +132,9 @@ gst_autoplugcache_class_init (GstAutoplugCacheClass *klass)
|
||||||
|
|
||||||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
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_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BUFFER_COUNT,
|
||||||
g_param_spec_enum("buffer_count","buffer_count","buffer_count",
|
g_param_spec_int("buffer_count","buffer_count","buffer_count",
|
||||||
G_TYPE_INT,0,G_PARAM_READABLE)); // CHECKME!
|
0,G_MAXINT,0,G_PARAM_READABLE)); // CHECKME!
|
||||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CAPS_PROXY,
|
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CAPS_PROXY,
|
||||||
g_param_spec_boolean("caps_proxy","caps_proxy","caps_proxy",
|
g_param_spec_boolean("caps_proxy","caps_proxy","caps_proxy",
|
||||||
FALSE,G_PARAM_READWRITE)); // CHECKME!
|
FALSE,G_PARAM_READWRITE)); // CHECKME!
|
||||||
|
@ -152,6 +142,16 @@ gst_autoplugcache_class_init (GstAutoplugCacheClass *klass)
|
||||||
g_param_spec_boolean("reset","reset","reset",
|
g_param_spec_boolean("reset","reset","reset",
|
||||||
FALSE,G_PARAM_WRITABLE)); // CHECKME!
|
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->set_property = gst_autoplugcache_set_property;
|
||||||
gobject_class->get_property = gst_autoplugcache_get_property;
|
gobject_class->get_property = gst_autoplugcache_get_property;
|
||||||
|
|
||||||
|
|
|
@ -99,8 +99,8 @@ gst_object_class_init (GstObjectClass *klass)
|
||||||
gst_object_signals[OBJECT_SAVED] =
|
gst_object_signals[OBJECT_SAVED] =
|
||||||
g_signal_newc("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
|
g_signal_newc("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
|
||||||
G_STRUCT_OFFSET (GstObjectClass, object_saved), NULL, NULL,
|
G_STRUCT_OFFSET (GstObjectClass, object_saved), NULL, NULL,
|
||||||
g_cclosure_marshal_VOID__OBJECT,G_TYPE_NONE,1,
|
g_cclosure_marshal_VOID__POINTER,G_TYPE_NONE,1,
|
||||||
G_TYPE_OBJECT);
|
G_TYPE_POINTER);
|
||||||
|
|
||||||
klass->path_string_separator = "/";
|
klass->path_string_separator = "/";
|
||||||
// FIXME!!!
|
// FIXME!!!
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <gst/gstmarshal.h>
|
#include <gst/gstmarshal.h>
|
||||||
#else
|
#else
|
||||||
#include <gobject2gtk.h>
|
#include <gst/gobject2gtk.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gst/gsttrace.h>
|
#include <gst/gsttrace.h>
|
||||||
|
|
|
@ -99,8 +99,9 @@ gst_typefind_class_init (GstTypeFindClass *klass)
|
||||||
|
|
||||||
gst_typefind_signals[HAVE_TYPE] =
|
gst_typefind_signals[HAVE_TYPE] =
|
||||||
g_signal_newc ("have_type", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
|
g_signal_newc ("have_type", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
|
||||||
G_STRUCT_OFFSET (GstTypeFindClass, have_type), NULL, NULL,
|
G_STRUCT_OFFSET (GstTypeFindClass, have_type), NULL, NULL,
|
||||||
g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_POINTER);
|
g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
|
||||||
|
G_TYPE_POINTER);
|
||||||
|
|
||||||
gobject_class->set_property = gst_typefind_set_property;
|
gobject_class->set_property = gst_typefind_set_property;
|
||||||
gobject_class->get_property = gst_typefind_get_property;
|
gobject_class->get_property = gst_typefind_get_property;
|
||||||
|
|
Loading…
Reference in a new issue