From dc3d1df8eccd432e0e35627541d65adaa1be0e6e Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 11 May 2006 18:10:34 +0000 Subject: [PATCH] G_OBJECT_CLASS macro usage batch cleanup, fixes #337747 for core Original commit message from CVS: * gst/gstclock.c: (gst_clock_class_init): * gst/gstindex.c: (gst_index_class_init): * gst/gstobject.c: (gst_object_class_init): * gst/gstpad.c: (gst_pad_class_init): * gst/gstpipeline.c: (gst_pipeline_class_init): * libs/gst/base/gstbasesink.c: (gst_base_sink_class_init): * libs/gst/base/gstbasesrc.c: (gst_base_src_class_init): * libs/gst/base/gstbasetransform.c: (gst_base_transform_class_init): * libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_class_init): * libs/gst/net/gstnettimeprovider.c: (gst_net_time_provider_class_init): * plugins/elements/gstcapsfilter.c: (gst_capsfilter_class_init): * plugins/elements/gstfakesink.c: (gst_fake_sink_class_init): * plugins/elements/gstfakesrc.c: (gst_fake_src_class_init): * plugins/elements/gstfdsink.c: (gst_fd_sink_class_init): * plugins/elements/gstfdsrc.c: (gst_fd_src_class_init): * plugins/elements/gstfilesink.c: (gst_file_sink_class_init): * plugins/elements/gstfilesrc.c: (gst_file_src_class_init): * plugins/elements/gstidentity.c: (gst_identity_class_init): * plugins/elements/gsttee.c: (gst_tee_class_init): * tests/old/examples/plugins/example.c: (gst_example_class_init): * tests/old/testsuite/threads/signals.c: (gst_test_class_init): G_OBJECT_CLASS macro usage batch cleanup, fixes #337747 for core --- ChangeLog | 28 ++++++++++++++++++++++++++ gst/gstclock.c | 15 +++++++------- gst/gstindex.c | 6 ++---- gst/gstobject.c | 4 ++-- gst/gstpad.c | 12 +++++------ gst/gstpipeline.c | 4 ++-- libs/gst/base/gstbasesink.c | 14 ++++++------- libs/gst/base/gstbasesrc.c | 10 ++++----- libs/gst/base/gstbasetransform.c | 2 +- libs/gst/net/gstnetclientclock.c | 4 ++-- libs/gst/net/gstnettimeprovider.c | 4 ++-- plugins/elements/gstcapsfilter.c | 6 +++--- plugins/elements/gstfakesink.c | 20 +++++++++--------- plugins/elements/gstfakesrc.c | 38 +++++++++++++++++------------------ plugins/elements/gstfdsink.c | 2 +- plugins/elements/gstfdsrc.c | 6 +++--- plugins/elements/gstfilesink.c | 2 +- plugins/elements/gstfilesrc.c | 16 +++++++-------- plugins/elements/gstidentity.c | 20 +++++++++--------- plugins/elements/gsttee.c | 14 ++++++------- tests/old/examples/plugins/example.c | 6 +++--- tests/old/testsuite/threads/signals.c | 6 +++--- 22 files changed, 130 insertions(+), 109 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2694189..8f51afc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2006-05-11 Stefan Kost + + * gst/gstclock.c: (gst_clock_class_init): + * gst/gstindex.c: (gst_index_class_init): + * gst/gstobject.c: (gst_object_class_init): + * gst/gstpad.c: (gst_pad_class_init): + * gst/gstpipeline.c: (gst_pipeline_class_init): + * libs/gst/base/gstbasesink.c: (gst_base_sink_class_init): + * libs/gst/base/gstbasesrc.c: (gst_base_src_class_init): + * libs/gst/base/gstbasetransform.c: + (gst_base_transform_class_init): + * libs/gst/net/gstnetclientclock.c: + (gst_net_client_clock_class_init): + * libs/gst/net/gstnettimeprovider.c: + (gst_net_time_provider_class_init): + * plugins/elements/gstcapsfilter.c: (gst_capsfilter_class_init): + * plugins/elements/gstfakesink.c: (gst_fake_sink_class_init): + * plugins/elements/gstfakesrc.c: (gst_fake_src_class_init): + * plugins/elements/gstfdsink.c: (gst_fd_sink_class_init): + * plugins/elements/gstfdsrc.c: (gst_fd_src_class_init): + * plugins/elements/gstfilesink.c: (gst_file_sink_class_init): + * plugins/elements/gstfilesrc.c: (gst_file_src_class_init): + * plugins/elements/gstidentity.c: (gst_identity_class_init): + * plugins/elements/gsttee.c: (gst_tee_class_init): + * tests/old/examples/plugins/example.c: (gst_example_class_init): + * tests/old/testsuite/threads/signals.c: (gst_test_class_init): + G_OBJECT_CLASS macro usage batch cleanup, fixes #337747 for core + 2006-05-11 Wim Taymans * gst/gstbuffer.c: (_gst_buffer_initialize): diff --git a/gst/gstclock.c b/gst/gstclock.c index 52cdcf2..e8846ca 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -560,8 +560,8 @@ gst_clock_class_init (GstClockClass * klass) GObjectClass *gobject_class; GstObjectClass *gstobject_class; - gobject_class = (GObjectClass *) klass; - gstobject_class = (GstObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstobject_class = GST_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -578,20 +578,19 @@ gst_clock_class_init (GstClockClass * klass) gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_clock_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_clock_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_STATS, + g_object_class_install_property (gobject_class, PROP_STATS, g_param_spec_boolean ("stats", "Stats", "Enable clock stats (unimplemented)", DEFAULT_STATS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_WINDOW_SIZE, + g_object_class_install_property (gobject_class, PROP_WINDOW_SIZE, g_param_spec_int ("window-size", "Window size", "The size of the window used to calculate rate and offset", 2, 1024, DEFAULT_WINDOW_SIZE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), - PROP_WINDOW_THRESHOLD, g_param_spec_int ("window-threshold", - "Window threshold", + g_object_class_install_property (gobject_class, PROP_WINDOW_THRESHOLD, + g_param_spec_int ("window-threshold", "Window threshold", "The threshold to start calculating rate and offset", 2, 1024, DEFAULT_WINDOW_THRESHOLD, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TIMEOUT, + g_object_class_install_property (gobject_class, PROP_TIMEOUT, g_param_spec_uint64 ("timeout", "Timeout", "The amount of time, in nanoseconds, to sample master and slave clocks", 0, G_MAXUINT64, DEFAULT_TIMEOUT, G_PARAM_READWRITE)); diff --git a/gst/gstindex.c b/gst/gstindex.c index af06e96..821be16 100644 --- a/gst/gstindex.c +++ b/gst/gstindex.c @@ -152,10 +152,8 @@ static void gst_index_class_init (GstIndexClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -174,7 +172,7 @@ gst_index_class_init (GstIndexClass * klass) gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_index_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_index_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RESOLVER, + g_object_class_install_property (gobject_class, ARG_RESOLVER, g_param_spec_enum ("resolver", "Resolver", "Select a predefined object to string mapper", GST_TYPE_INDEX_RESOLVER, GST_INDEX_RESOLVER_PATH, G_PARAM_READWRITE)); diff --git a/gst/gstobject.c b/gst/gstobject.c index 8f1dd17..beb005a 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -192,7 +192,7 @@ gst_object_class_init (GstObjectClass * klass) { GObjectClass *gobject_class; - gobject_class = (GObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -203,7 +203,7 @@ gst_object_class_init (GstObjectClass * klass) gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_object_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_object_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NAME, + g_object_class_install_property (gobject_class, ARG_NAME, g_param_spec_string ("name", "Name", "The name of the object", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); diff --git a/gst/gstpad.c b/gst/gstpad.c index 526e298..86e7d89 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -236,12 +236,10 @@ static void gst_pad_class_init (GstPadClass * klass) { GObjectClass *gobject_class; - - GstObjectClass *gstobject_class; - gobject_class = (GObjectClass *) klass; - gstobject_class = (GstObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstobject_class = GST_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -303,14 +301,14 @@ gst_pad_class_init (GstPadClass * klass) NULL, gst_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, GST_TYPE_MINI_OBJECT); - g_object_class_install_property (G_OBJECT_CLASS (klass), PAD_PROP_CAPS, + g_object_class_install_property (gobject_class, PAD_PROP_CAPS, g_param_spec_boxed ("caps", "Caps", "The capabilities of the pad", GST_TYPE_CAPS, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PAD_PROP_DIRECTION, + g_object_class_install_property (gobject_class, PAD_PROP_DIRECTION, g_param_spec_enum ("direction", "Direction", "The direction of the pad", GST_TYPE_PAD_DIRECTION, GST_PAD_UNKNOWN, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PAD_PROP_TEMPLATE, + g_object_class_install_property (gobject_class, PAD_PROP_TEMPLATE, g_param_spec_object ("template", "Template", "The GstPadTemplate of this pad", GST_TYPE_PAD_TEMPLATE, G_PARAM_READWRITE)); diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c index 0d238ca..43ff757 100644 --- a/gst/gstpipeline.c +++ b/gst/gstpipeline.c @@ -204,7 +204,7 @@ gst_pipeline_class_init (gpointer g_class, gpointer class_data) * * Since: 0.10.5 **/ - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DELAY, + g_object_class_install_property (gobject_class, PROP_DELAY, g_param_spec_uint64 ("delay", "Delay", "Expected delay needed for elements " "to spin up to PLAYING in nanoseconds", 0, G_MAXUINT64, DEFAULT_DELAY, @@ -219,7 +219,7 @@ gst_pipeline_class_init (gpointer g_class, gpointer class_data) * * Since: 0.10.4 **/ - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_AUTO_FLUSH_BUS, + g_object_class_install_property (gobject_class, PROP_AUTO_FLUSH_BUS, g_param_spec_boolean ("auto-flush-bus", "Auto Flush Bus", "Whether to automatically flush the pipeline's bus when going " "from READY into NULL state", DEFAULT_AUTO_FLUSH_BUS, diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 65aa70e..85d4975 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -302,8 +302,8 @@ gst_base_sink_class_init (GstBaseSinkClass * klass) GObjectClass *gobject_class; GstElementClass *gstelement_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); g_type_class_add_private (klass, sizeof (GstBaseSinkPrivate)); @@ -315,24 +315,22 @@ gst_base_sink_class_init (GstBaseSinkClass * klass) /* FIXME, this next value should be configured using an event from the * upstream element, ie, the BUFFER_SIZE event. */ - g_object_class_install_property (G_OBJECT_CLASS (klass), - PROP_PREROLL_QUEUE_LEN, + g_object_class_install_property (gobject_class, PROP_PREROLL_QUEUE_LEN, g_param_spec_uint ("preroll-queue-len", "Preroll queue length", "Number of buffers to queue during preroll", 0, G_MAXUINT, DEFAULT_PREROLL_QUEUE_LEN, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC, + g_object_class_install_property (gobject_class, PROP_SYNC, g_param_spec_boolean ("sync", "Sync", "Sync on the clock", DEFAULT_SYNC, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), - PROP_MAX_LATENESS, + g_object_class_install_property (gobject_class, PROP_MAX_LATENESS, g_param_spec_int64 ("max-lateness", "Max Lateness", "Maximum number of nanoseconds that a buffer can be late before it " "is dropped (-1 unlimited)", -1, G_MAXINT64, DEFAULT_MAX_LATENESS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_QOS, + g_object_class_install_property (gobject_class, PROP_QOS, g_param_spec_boolean ("qos", "Qos", "Generate QoS events upstream", DEFAULT_QOS, G_PARAM_READWRITE)); diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index cea4b25..ffabd8d 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -302,8 +302,8 @@ gst_base_src_class_init (GstBaseSrcClass * klass) GObjectClass *gobject_class; GstElementClass *gstelement_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); g_type_class_add_private (klass, sizeof (GstBaseSrcPrivate)); @@ -313,15 +313,15 @@ gst_base_src_class_init (GstBaseSrcClass * klass) gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_base_src_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_base_src_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE, + g_object_class_install_property (gobject_class, PROP_BLOCKSIZE, g_param_spec_ulong ("blocksize", "Block size", "Size in bytes to read per buffer", 1, G_MAXULONG, DEFAULT_BLOCKSIZE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_NUM_BUFFERS, + g_object_class_install_property (gobject_class, PROP_NUM_BUFFERS, g_param_spec_int ("num-buffers", "num-buffers", "Number of buffers to output before sending EOS", -1, G_MAXINT, DEFAULT_NUM_BUFFERS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TYPEFIND, + g_object_class_install_property (gobject_class, PROP_TYPEFIND, g_param_spec_boolean ("typefind", "Typefind", "Run typefind before negotiating", DEFAULT_TYPEFIND, G_PARAM_READWRITE)); diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index 9c157f4..5f88251 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -334,7 +334,7 @@ gst_base_transform_class_init (GstBaseTransformClass * klass) gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_base_transform_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_QOS, + g_object_class_install_property (gobject_class, PROP_QOS, g_param_spec_boolean ("qos", "QoS", "handle QoS messages", DEFAULT_PROP_QOS, G_PARAM_READWRITE)); diff --git a/libs/gst/net/gstnetclientclock.c b/libs/gst/net/gstnetclientclock.c index 78bf15f..f7a16c4 100644 --- a/libs/gst/net/gstnetclientclock.c +++ b/libs/gst/net/gstnetclientclock.c @@ -121,7 +121,7 @@ gst_net_client_clock_class_init (GstNetClientClockClass * klass) { GObjectClass *gobject_class; - gobject_class = (GObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gst_net_client_clock_finalize; gobject_class->get_property = gst_net_client_clock_get_property; @@ -131,7 +131,7 @@ gst_net_client_clock_class_init (GstNetClientClockClass * klass) g_param_spec_string ("address", "address", "The address of the machine providing a time server, " "as a dotted quad (x.x.x.x)", DEFAULT_ADDRESS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PORT, + g_object_class_install_property (gobject_class, PROP_PORT, g_param_spec_int ("port", "port", "The port on which the remote server is listening", 0, G_MAXUINT16, DEFAULT_PORT, G_PARAM_READWRITE)); diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c index f0c4175..e398787 100644 --- a/libs/gst/net/gstnettimeprovider.c +++ b/libs/gst/net/gstnettimeprovider.c @@ -114,13 +114,13 @@ gst_net_time_provider_class_init (GstNetTimeProviderClass * klass) { GObjectClass *gobject_class; - gobject_class = (GObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gst_net_time_provider_finalize; gobject_class->set_property = gst_net_time_provider_set_property; gobject_class->get_property = gst_net_time_provider_get_property; - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PORT, + g_object_class_install_property (gobject_class, PROP_PORT, g_param_spec_int ("port", "port", "The port to receive the packets from, 0=allocate", 0, G_MAXUINT16, DEFAULT_PORT, G_PARAM_READWRITE)); diff --git a/plugins/elements/gstcapsfilter.c b/plugins/elements/gstcapsfilter.c index 33c503c..f8ce429 100644 --- a/plugins/elements/gstcapsfilter.c +++ b/plugins/elements/gstcapsfilter.c @@ -124,17 +124,17 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass) GObjectClass *gobject_class; GstBaseTransformClass *trans_class; - gobject_class = (GObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); gobject_class->set_property = gst_capsfilter_set_property; gobject_class->get_property = gst_capsfilter_get_property; gobject_class->dispose = gst_capsfilter_dispose; - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILTER_CAPS, + g_object_class_install_property (gobject_class, PROP_FILTER_CAPS, g_param_spec_boxed ("caps", _("Filter caps"), _("Restrict the possible allowed capabilities (NULL means ANY)"), GST_TYPE_CAPS, G_PARAM_READWRITE)); - trans_class = (GstBaseTransformClass *) klass; + trans_class = GST_BASE_TRANSFORM_CLASS (klass); trans_class->transform_caps = gst_capsfilter_transform_caps; trans_class->transform_ip = gst_capsfilter_transform_ip; trans_class->prepare_output_buffer = gst_capsfilter_prepare_buf; diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 1b8e5ea..d0cdc41 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -149,38 +149,38 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass) GstElementClass *gstelement_class; GstBaseSinkClass *gstbase_sink_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - gstbase_sink_class = (GstBaseSinkClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); + gstbase_sink_class = GST_BASE_SINK_CLASS (klass); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fake_sink_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fake_sink_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_STATE_ERROR, + g_object_class_install_property (gobject_class, PROP_STATE_ERROR, g_param_spec_enum ("state_error", "State Error", "Generate a state change error", GST_TYPE_FAKE_SINK_STATE_ERROR, DEFAULT_STATE_ERROR, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LAST_MESSAGE, + g_object_class_install_property (gobject_class, PROP_LAST_MESSAGE, g_param_spec_string ("last_message", "Last Message", "The message describing current status", DEFAULT_LAST_MESSAGE, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIGNAL_HANDOFFS, + g_object_class_install_property (gobject_class, PROP_SIGNAL_HANDOFFS, g_param_spec_boolean ("signal-handoffs", "Signal handoffs", "Send a signal before unreffing the buffer", DEFAULT_SIGNAL_HANDOFFS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SILENT, + g_object_class_install_property (gobject_class, PROP_SILENT, g_param_spec_boolean ("silent", "Silent", "Don't produce last_message events", DEFAULT_SILENT, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DUMP, + g_object_class_install_property (gobject_class, PROP_DUMP, g_param_spec_boolean ("dump", "Dump", "Dump received bytes to stdout", DEFAULT_DUMP, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), + g_object_class_install_property (gobject_class, PROP_CAN_ACTIVATE_PUSH, g_param_spec_boolean ("can-activate-push", "Can activate push", "Can activate in push mode", DEFAULT_CAN_ACTIVATE_PUSH, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), + g_object_class_install_property (gobject_class, PROP_CAN_ACTIVATE_PULL, g_param_spec_boolean ("can-activate-pull", "Can activate pull", "Can activate in pull mode", DEFAULT_CAN_ACTIVATE_PULL, diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index b2792df..ea192c4 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -251,9 +251,9 @@ gst_fake_src_class_init (GstFakeSrcClass * klass) GstElementClass *gstelement_class; GstBaseSrcClass *gstbase_src_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - gstbase_src_class = (GstBaseSrcClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); + gstbase_src_class = GST_BASE_SRC_CLASS (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_fake_src_finalize); @@ -263,66 +263,66 @@ gst_fake_src_class_init (GstFakeSrcClass * klass) /* FIXME: this is not implemented; would make sense once basesrc and fakesrc support multiple pads - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_OUTPUT, + g_object_class_install_property (gobject_class, PROP_OUTPUT, g_param_spec_enum ("output", "output", "Output method (currently unused)", GST_TYPE_FAKE_SRC_OUTPUT, DEFAULT_OUTPUT, G_PARAM_READWRITE)); */ - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DATA, + g_object_class_install_property (gobject_class, PROP_DATA, g_param_spec_enum ("data", "data", "Data allocation method", GST_TYPE_FAKE_SRC_DATA, DEFAULT_DATA, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIZETYPE, g_param_spec_enum ("sizetype", "sizetype", "How to determine buffer sizes", GST_TYPE_FAKE_SRC_SIZETYPE, DEFAULT_SIZETYPE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIZEMIN, + g_object_class_install_property (gobject_class, PROP_SIZEMIN, g_param_spec_int ("sizemin", "sizemin", "Minimum buffer size", 0, G_MAXINT, DEFAULT_SIZEMIN, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIZEMAX, + g_object_class_install_property (gobject_class, PROP_SIZEMAX, g_param_spec_int ("sizemax", "sizemax", "Maximum buffer size", 0, G_MAXINT, DEFAULT_SIZEMAX, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PARENTSIZE, + g_object_class_install_property (gobject_class, PROP_PARENTSIZE, g_param_spec_int ("parentsize", "parentsize", "Size of parent buffer for sub-buffered allocation", 0, G_MAXINT, DEFAULT_PARENTSIZE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FILLTYPE, + g_object_class_install_property (gobject_class, PROP_FILLTYPE, g_param_spec_enum ("filltype", "filltype", "How to fill the buffer, if at all", GST_TYPE_FAKE_SRC_FILLTYPE, DEFAULT_FILLTYPE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DATARATE, + g_object_class_install_property (gobject_class, PROP_DATARATE, g_param_spec_int ("datarate", "Datarate", "Timestamps buffers with number of bytes per second (0 = none)", 0, G_MAXINT, DEFAULT_DATARATE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC, + g_object_class_install_property (gobject_class, PROP_SYNC, g_param_spec_boolean ("sync", "Sync", "Sync to the clock to the datarate", DEFAULT_SYNC, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PATTERN, + g_object_class_install_property (gobject_class, PROP_PATTERN, g_param_spec_string ("pattern", "pattern", "pattern", DEFAULT_PATTERN, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LAST_MESSAGE, + g_object_class_install_property (gobject_class, PROP_LAST_MESSAGE, g_param_spec_string ("last-message", "last-message", "The last status message", NULL, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SILENT, + g_object_class_install_property (gobject_class, PROP_SILENT, g_param_spec_boolean ("silent", "Silent", "Don't produce last_message events", DEFAULT_SILENT, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIGNAL_HANDOFFS, + g_object_class_install_property (gobject_class, PROP_SIGNAL_HANDOFFS, g_param_spec_boolean ("signal-handoffs", "Signal handoffs", "Send a signal before pushing the buffer", DEFAULT_SIGNAL_HANDOFFS, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DUMP, + g_object_class_install_property (gobject_class, PROP_DUMP, g_param_spec_boolean ("dump", "Dump", "Dump produced bytes to stdout", DEFAULT_DUMP, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), + g_object_class_install_property (gobject_class, PROP_CAN_ACTIVATE_PUSH, g_param_spec_boolean ("can-activate-push", "Can activate push", "Can activate in push mode", DEFAULT_CAN_ACTIVATE_PUSH, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (G_OBJECT_CLASS (klass), + g_object_class_install_property (gobject_class, PROP_CAN_ACTIVATE_PULL, g_param_spec_boolean ("can-activate-pull", "Can activate pull", "Can activate in pull mode", DEFAULT_CAN_ACTIVATE_PULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_IS_LIVE, + g_object_class_install_property (gobject_class, PROP_IS_LIVE, g_param_spec_boolean ("is-live", "Is this a live source", "True if the element cannot produce data in PAUSED", FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c index b5eb634..1a8e660 100644 --- a/plugins/elements/gstfdsink.c +++ b/plugins/elements/gstfdsink.c @@ -172,7 +172,7 @@ gst_fd_sink_class_init (GstFdSinkClass * klass) gstbasesink_class->unlock = GST_DEBUG_FUNCPTR (gst_fd_sink_unlock); gstbasesink_class->event = NULL; - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FD, + g_object_class_install_property (gobject_class, ARG_FD, g_param_spec_int ("fd", "fd", "An open file descriptor to write to", 0, G_MAXINT, 1, G_PARAM_READWRITE)); } diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c index d090dc3..ebe2d68 100644 --- a/plugins/elements/gstfdsrc.c +++ b/plugins/elements/gstfdsrc.c @@ -144,8 +144,8 @@ gst_fd_src_class_init (GstFdSrcClass * klass) gobject_class = G_OBJECT_CLASS (klass); gstelement_class = GST_ELEMENT_CLASS (klass); - gstbasesrc_class = (GstBaseSrcClass *) klass; - gstpush_src_class = (GstPushSrcClass *) klass; + gstbasesrc_class = GST_BASE_SRC_CLASS (klass); + gstpush_src_class = GST_PUSH_SRC_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -153,7 +153,7 @@ gst_fd_src_class_init (GstFdSrcClass * klass) gobject_class->get_property = gst_fd_src_get_property; gobject_class->dispose = gst_fd_src_dispose; - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FD, + g_object_class_install_property (gobject_class, PROP_FD, g_param_spec_int ("fd", "fd", "An open file descriptor to read from", 0, G_MAXINT, 0, G_PARAM_READWRITE)); diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index e1e86f6..fd9f484 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -123,7 +123,7 @@ gst_file_sink_class_init (GstFileSinkClass * klass) gobject_class->set_property = gst_file_sink_set_property; gobject_class->get_property = gst_file_sink_get_property; - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION, + g_object_class_install_property (gobject_class, ARG_LOCATION, g_param_spec_string ("location", "File Location", "Location of the file to write", NULL, G_PARAM_READWRITE)); diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 2cdd289..aa5f3e4 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -195,29 +195,29 @@ gst_file_src_class_init (GstFileSrcClass * klass) GstElementClass *gstelement_class; GstBaseSrcClass *gstbasesrc_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - gstbasesrc_class = (GstBaseSrcClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); + gstbasesrc_class = GST_BASE_SRC_CLASS (klass); gobject_class->set_property = gst_file_src_set_property; gobject_class->get_property = gst_file_src_get_property; - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FD, + g_object_class_install_property (gobject_class, ARG_FD, g_param_spec_int ("fd", "File-descriptor", "File-descriptor for the file being mmap()d", 0, G_MAXINT, 0, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION, + g_object_class_install_property (gobject_class, ARG_LOCATION, g_param_spec_string ("location", "File Location", "Location of the file to read", NULL, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MMAPSIZE, + g_object_class_install_property (gobject_class, ARG_MMAPSIZE, g_param_spec_ulong ("mmapsize", "mmap() Block Size", "Size in bytes of mmap()d regions", 0, G_MAXULONG, DEFAULT_MMAPSIZE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TOUCH, + g_object_class_install_property (gobject_class, ARG_TOUCH, g_param_spec_boolean ("touch", "Touch read data", "Touch data to force disk read", DEFAULT_TOUCH, G_PARAM_READWRITE)); - gobject_class->finalize = gst_file_src_finalize; + gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_file_src_finalize); gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_file_src_start); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_file_src_stop); diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index 58833c1..afc4de7 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -173,38 +173,38 @@ gst_identity_class_init (GstIdentityClass * klass) gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_identity_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_identity_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SLEEP_TIME, + g_object_class_install_property (gobject_class, PROP_SLEEP_TIME, g_param_spec_uint ("sleep-time", "Sleep time", "Microseconds to sleep between processing", 0, G_MAXUINT, DEFAULT_SLEEP_TIME, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_ERROR_AFTER, + g_object_class_install_property (gobject_class, PROP_ERROR_AFTER, g_param_spec_int ("error_after", "Error After", "Error after N buffers", G_MININT, G_MAXINT, DEFAULT_ERROR_AFTER, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), + g_object_class_install_property (gobject_class, PROP_DROP_PROBABILITY, g_param_spec_float ("drop_probability", "Drop Probability", "The Probability a buffer is dropped", 0.0, 1.0, DEFAULT_DROP_PROBABILITY, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DATARATE, + g_object_class_install_property (gobject_class, PROP_DATARATE, g_param_spec_int ("datarate", "Datarate", "(Re)timestamps buffers with number of bytes per second (0 = inactive)", 0, G_MAXINT, DEFAULT_DATARATE, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SILENT, + g_object_class_install_property (gobject_class, PROP_SILENT, g_param_spec_boolean ("silent", "silent", "silent", DEFAULT_SILENT, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SINGLE_SEGMENT, + g_object_class_install_property (gobject_class, PROP_SINGLE_SEGMENT, g_param_spec_boolean ("single-segment", "Single Segment", "Timestamp buffers and eat newsegments so as to appear as one segment", DEFAULT_SINGLE_SEGMENT, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LAST_MESSAGE, + g_object_class_install_property (gobject_class, PROP_LAST_MESSAGE, g_param_spec_string ("last-message", "last-message", "last-message", NULL, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DUMP, + g_object_class_install_property (gobject_class, PROP_DUMP, g_param_spec_boolean ("dump", "Dump", "Dump buffer contents", DEFAULT_DUMP, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC, + g_object_class_install_property (gobject_class, PROP_SYNC, g_param_spec_boolean ("sync", "Synchronize", "Synchronize to pipeline clock", DEFAULT_SYNC, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_CHECK_PERFECT, + g_object_class_install_property (gobject_class, PROP_CHECK_PERFECT, g_param_spec_boolean ("check-perfect", "Check For Perfect Stream", "Verify that the stream is time- and data-contiguous", DEFAULT_CHECK_PERFECT, G_PARAM_READWRITE)); diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index 3317a1e..8b9ba0f 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -118,26 +118,26 @@ gst_tee_class_init (GstTeeClass * klass) GObjectClass *gobject_class; GstElementClass *gstelement_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tee_finalize); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_tee_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_tee_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_NUM_SRC_PADS, + g_object_class_install_property (gobject_class, PROP_NUM_SRC_PADS, g_param_spec_int ("num-src-pads", "num-src-pads", "num-src-pads", 0, G_MAXINT, 0, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_HAS_SINK_LOOP, + g_object_class_install_property (gobject_class, PROP_HAS_SINK_LOOP, g_param_spec_boolean ("has-sink-loop", "has-sink-loop", "has-sink-loop", FALSE, G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_HAS_CHAIN, + g_object_class_install_property (gobject_class, PROP_HAS_CHAIN, g_param_spec_boolean ("has-chain", "has-chain", "has-chain", TRUE, G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SILENT, + g_object_class_install_property (gobject_class, PROP_SILENT, g_param_spec_boolean ("silent", "silent", "silent", TRUE, G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LAST_MESSAGE, + g_object_class_install_property (gobject_class, PROP_LAST_MESSAGE, g_param_spec_string ("last_message", "last_message", "last_message", NULL, G_PARAM_READABLE)); diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c index 511cd81..c65960d 100644 --- a/tests/old/examples/plugins/example.c +++ b/tests/old/examples/plugins/example.c @@ -144,8 +144,8 @@ gst_example_class_init (GstExampleClass * klass) /* Since the example class contains the parent classes, you can simply * cast the pointer to get access to the parent classes. */ - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstelement_class = GST_ELEMENT_CLASS (klass); /* The parent class is needed for class method overrides. */ parent_class = g_type_class_peek_parent (klass); @@ -153,7 +153,7 @@ gst_example_class_init (GstExampleClass * klass) /* Here we add an argument to the object. This argument is an integer, * and can be both read and written. */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ACTIVE, g_param_spec_int ("active", "active", "active", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_ACTIVE, g_param_spec_int ("active", "active", "active", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ /* Here we add a signal to the object. This is a very useless signal * called asdf. The signal will also pass a pointer to the listeners diff --git a/tests/old/testsuite/threads/signals.c b/tests/old/testsuite/threads/signals.c index b8cd067..bb69eba 100644 --- a/tests/old/testsuite/threads/signals.c +++ b/tests/old/testsuite/threads/signals.c @@ -87,8 +87,8 @@ gst_test_class_init (GstTestClass * klass) GObjectClass *gobject_class; GstObjectClass *gstobject_class; - gobject_class = (GObjectClass *) klass; - gstobject_class = (GstObjectClass *) klass; + gobject_class = G_OBJECT_CLASS (klass); + gstobject_class = GST_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); @@ -108,7 +108,7 @@ gst_test_class_init (GstTestClass * klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstTestClass, test_signal2), NULL, NULL, gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TEST_PROP, + g_object_class_install_property (gobject_class, ARG_TEST_PROP, g_param_spec_int ("test-prop", "Test Prop", "Test property", 0, 1, 0, G_PARAM_READWRITE)); -- 2.7.4