From: Wim Taymans Date: Wed, 23 Feb 2011 13:12:22 +0000 (+0100) Subject: pbutils: use GObject as the base class X-Git-Tag: 1.19.3~511^2~7804 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b967bf531b2773d02c7fd9f3dbbc5f6a409cf0f7;p=platform%2Fupstream%2Fgstreamer.git pbutils: use GObject as the base class We can't subclass miniobject so use GObject as the base class, --- diff --git a/gst-libs/gst/pbutils/encoding-profile.c b/gst-libs/gst/pbutils/encoding-profile.c index b1c8051..431f6d4 100644 --- a/gst-libs/gst/pbutils/encoding-profile.c +++ b/gst-libs/gst/pbutils/encoding-profile.c @@ -133,7 +133,7 @@ struct _GstEncodingProfile { - GstMiniObject parent; + GObject parent; /*< public > */ gchar *name; @@ -165,8 +165,7 @@ gst_encoding_profile_get_type (void) static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { - GType g_define_type_id = - g_type_register_static_simple (GST_TYPE_MINI_OBJECT, + GType g_define_type_id = g_type_register_static_simple (G_TYPE_OBJECT, g_intern_static_string ("GstEncodingProfile"), sizeof (GstEncodingProfileClass), (GClassInitFunc) gst_encoding_profile_class_intern_init, @@ -194,8 +193,9 @@ gst_encoding_profile_get_type (void) } static void -gst_encoding_profile_finalize (GstEncodingProfile * prof) +gst_encoding_profile_finalize (GObject * object) { + GstEncodingProfile *prof = (GstEncodingProfile *) object; if (prof->name) g_free (prof->name); if (prof->format) @@ -209,10 +209,9 @@ gst_encoding_profile_finalize (GstEncodingProfile * prof) } static void -gst_encoding_profile_class_init (GstMiniObjectClass * klass) +gst_encoding_profile_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_encoding_profile_finalize; + klass->finalize = gst_encoding_profile_finalize; } /** @@ -432,20 +431,21 @@ gst_encoding_container_profile_init (GstEncodingContainerProfile * prof) } static void -gst_encoding_container_profile_finalize (GstEncodingContainerProfile * prof) +gst_encoding_container_profile_finalize (GObject * object) { + GstEncodingContainerProfile *prof = (GstEncodingContainerProfile *) object; + g_list_foreach (prof->encodingprofiles, (GFunc) gst_mini_object_unref, NULL); g_list_free (prof->encodingprofiles); - GST_MINI_OBJECT_CLASS (gst_encoding_container_profile_parent_class)->finalize - ((GstMiniObject *) prof); + G_OBJECT_CLASS (gst_encoding_container_profile_parent_class)->finalize + ((GObject *) prof); } static void -gst_encoding_container_profile_class_init (GstMiniObjectClass * klass) +gst_encoding_container_profile_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_encoding_container_profile_finalize; + klass->finalize = gst_encoding_container_profile_finalize; } const GList * @@ -475,7 +475,7 @@ gst_encoding_video_profile_init (GstEncodingVideoProfile * prof) } static void -gst_encoding_video_profile_class_init (GstMiniObjectClass * klass) +gst_encoding_video_profile_class_init (GObjectClass * klass) { } @@ -562,7 +562,7 @@ gst_encoding_audio_profile_init (GstEncodingAudioProfile * prof) } static void -gst_encoding_audio_profile_class_init (GstMiniObjectClass * klass) +gst_encoding_audio_profile_class_init (GObjectClass * klass) { } @@ -688,7 +688,7 @@ common_creation (GType objtype, GstCaps * format, const gchar * preset, { GstEncodingProfile *prof; - prof = (GstEncodingProfile *) gst_mini_object_new (objtype); + prof = (GstEncodingProfile *) g_object_new (objtype, NULL); if (name) prof->name = g_strdup (name); @@ -947,7 +947,7 @@ string_to_profile_transform (const GValue * src_value, GValue * dest_value) profile = combo_search (profilename); if (profile) - gst_value_take_mini_object (dest_value, (GstMiniObject *) profile); + g_value_take_object (dest_value, (GObject *) profile); } static gboolean @@ -958,7 +958,7 @@ gst_encoding_profile_deserialize_valfunc (GValue * value, const gchar * s) profile = combo_search (s); if (profile) { - gst_value_take_mini_object (value, (GstMiniObject *) profile); + g_value_take_object (value, (GObject *) profile); return TRUE; } diff --git a/gst-libs/gst/pbutils/encoding-profile.h b/gst-libs/gst/pbutils/encoding-profile.h index 86becca..d019546 100644 --- a/gst-libs/gst/pbutils/encoding-profile.h +++ b/gst-libs/gst/pbutils/encoding-profile.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS #define GST_IS_ENCODING_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_PROFILE)) typedef struct _GstEncodingProfile GstEncodingProfile; -typedef GstMiniObjectClass GstEncodingProfileClass; +typedef GObjectClass GstEncodingProfileClass; GType gst_encoding_profile_get_type (void); @@ -115,7 +115,7 @@ GType gst_encoding_audio_profile_get_type (void); * * Since: 0.10.32 */ -#define gst_encoding_profile_unref(profile) (gst_mini_object_unref ((GstMiniObject*) profile)) +#define gst_encoding_profile_unref(profile) (g_object_unref ((GObject*) profile)) /** * gst_encoding_profile_ref: @@ -125,7 +125,7 @@ GType gst_encoding_audio_profile_get_type (void); * * Since: 0.10.32 */ -#define gst_encoding_profile_ref(profile) (gst_mini_object_ref ((GstMiniObject*) profile)) +#define gst_encoding_profile_ref(profile) (g_object_ref ((GObject*) profile)) const gchar * gst_encoding_profile_get_name(GstEncodingProfile *profile); const gchar * gst_encoding_profile_get_description(GstEncodingProfile *profile); diff --git a/gst-libs/gst/pbutils/encoding-target.c b/gst-libs/gst/pbutils/encoding-target.c index b7e7ad5..f2f3f8d 100644 --- a/gst-libs/gst/pbutils/encoding-target.c +++ b/gst-libs/gst/pbutils/encoding-target.c @@ -74,7 +74,7 @@ struct _GstEncodingTarget { - GstMiniObject parent; + GObject parent; gchar *name; gchar *category; @@ -85,7 +85,7 @@ struct _GstEncodingTarget gchar *keyfile; }; -G_DEFINE_TYPE (GstEncodingTarget, gst_encoding_target, GST_TYPE_MINI_OBJECT); +G_DEFINE_TYPE (GstEncodingTarget, gst_encoding_target, G_TYPE_OBJECT); static void gst_encoding_target_init (GstEncodingTarget * target) @@ -94,8 +94,10 @@ gst_encoding_target_init (GstEncodingTarget * target) } static void -gst_encoding_target_finalize (GstEncodingTarget * target) +gst_encoding_target_finalize (GObject * object) { + GstEncodingTarget *target = (GstEncodingTarget *) object; + GST_DEBUG ("Finalizing"); if (target->name) @@ -110,10 +112,9 @@ gst_encoding_target_finalize (GstEncodingTarget * target) } static void -gst_encoding_target_class_init (GstMiniObjectClass * klass) +gst_encoding_target_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_encoding_target_finalize; + klass->finalize = gst_encoding_target_finalize; } /** @@ -281,7 +282,7 @@ gst_encoding_target_new (const gchar * name, const gchar * category, if (!validate_name (category)) goto invalid_category; - res = (GstEncodingTarget *) gst_mini_object_new (GST_TYPE_ENCODING_TARGET); + res = (GstEncodingTarget *) g_object_new (GST_TYPE_ENCODING_TARGET, NULL); res->name = g_strdup (name); res->category = g_strdup (category); res->description = g_strdup (description); diff --git a/gst-libs/gst/pbutils/encoding-target.h b/gst-libs/gst/pbutils/encoding-target.h index 70c049d..4dcf598 100644 --- a/gst-libs/gst/pbutils/encoding-target.h +++ b/gst-libs/gst/pbutils/encoding-target.h @@ -89,7 +89,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_TARGET)) typedef struct _GstEncodingTarget GstEncodingTarget; -typedef GstMiniObjectClass GstEncodingTargetClass; +typedef GObjectClass GstEncodingTargetClass; GType gst_encoding_target_get_type (void); @@ -102,7 +102,7 @@ GType gst_encoding_target_get_type (void); * Since: 0.10.32 */ #define gst_encoding_target_unref(target) \ - (gst_mini_object_unref ((GstMiniObject*) target)) + (g_object_unref ((GObject*) target)) /** * gst_encoding_target_ref: @@ -113,7 +113,7 @@ GType gst_encoding_target_get_type (void); * Since: 0.10.32 */ #define gst_encoding_target_ref(target) \ - (gst_mini_object_ref ((GstMiniObject*) target)) + (g_object_ref ((GObject*) target)) GstEncodingTarget * gst_encoding_target_new (const gchar *name, const gchar *category, diff --git a/gst-libs/gst/pbutils/gstdiscoverer-types.c b/gst-libs/gst/pbutils/gstdiscoverer-types.c index 2edf8e9..124328e 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer-types.c +++ b/gst-libs/gst/pbutils/gstdiscoverer-types.c @@ -42,7 +42,7 @@ static GstDiscovererVideoInfo /* Per-stream information */ G_DEFINE_TYPE (GstDiscovererStreamInfo, gst_discoverer_stream_info, - GST_TYPE_MINI_OBJECT); + G_TYPE_OBJECT); static void gst_discoverer_stream_info_init (GstDiscovererStreamInfo * info) @@ -51,10 +51,12 @@ gst_discoverer_stream_info_init (GstDiscovererStreamInfo * info) } static void -gst_discoverer_stream_info_finalize (GstDiscovererStreamInfo * info) +gst_discoverer_stream_info_finalize (GObject * object) { + GstDiscovererStreamInfo *info = (GstDiscovererStreamInfo *) object; + if (info->next) - gst_mini_object_unref ((GstMiniObject *) info->next); + g_object_unref ((GObject *) info->next); if (info->caps) gst_caps_unref (info->caps); @@ -66,25 +68,17 @@ gst_discoverer_stream_info_finalize (GstDiscovererStreamInfo * info) gst_structure_free (info->misc); } -static GstDiscovererStreamInfo * -gst_discoverer_stream_info_copy (GstDiscovererStreamInfo * info) -{ - return gst_discoverer_info_copy_int (info, NULL); -} - static void -gst_discoverer_stream_info_class_init (GstMiniObjectClass * klass) +gst_discoverer_stream_info_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_discoverer_stream_info_finalize; - klass->copy = (GstMiniObjectCopyFunction) gst_discoverer_stream_info_copy; + klass->finalize = gst_discoverer_stream_info_finalize; } static GstDiscovererStreamInfo * gst_discoverer_stream_info_new (void) { return (GstDiscovererStreamInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_STREAM_INFO); + g_object_new (GST_TYPE_DISCOVERER_STREAM_INFO, NULL); } static GstDiscovererStreamInfo * @@ -147,28 +141,28 @@ static GstDiscovererContainerInfo * gst_discoverer_container_info_new (void) { return (GstDiscovererContainerInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_CONTAINER_INFO); + g_object_new (GST_TYPE_DISCOVERER_CONTAINER_INFO, NULL); } static void -gst_discoverer_container_info_finalize (GstDiscovererContainerInfo * info) +gst_discoverer_container_info_finalize (GObject * object) { + GstDiscovererContainerInfo *info = (GstDiscovererContainerInfo *) object; GList *tmp; for (tmp = ((GstDiscovererContainerInfo *) info)->streams; tmp; tmp = tmp->next) - gst_mini_object_unref ((GstMiniObject *) tmp->data); + g_object_unref ((GObject *) tmp->data); gst_discoverer_stream_info_list_free (info->streams); - gst_discoverer_stream_info_finalize ((GstDiscovererStreamInfo *) info); + gst_discoverer_stream_info_finalize ((GObject *) info); } static void -gst_discoverer_container_info_class_init (GstMiniObjectClass * klass) +gst_discoverer_container_info_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_discoverer_container_info_finalize; + klass->finalize = gst_discoverer_container_info_finalize; } static GstDiscovererContainerInfo * @@ -214,7 +208,7 @@ static GstDiscovererAudioInfo * gst_discoverer_audio_info_new (void) { return (GstDiscovererAudioInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_AUDIO_INFO); + g_object_new (GST_TYPE_DISCOVERER_AUDIO_INFO, NULL); } static GstDiscovererAudioInfo * @@ -238,7 +232,7 @@ G_DEFINE_TYPE (GstDiscovererVideoInfo, gst_discoverer_video_info, GST_TYPE_DISCOVERER_STREAM_INFO); static void -gst_discoverer_video_info_class_init (GstMiniObjectClass * klass) +gst_discoverer_video_info_class_init (GObjectClass * klass) { /* Nothing to initialize */ } @@ -253,7 +247,7 @@ static GstDiscovererVideoInfo * gst_discoverer_video_info_new (void) { return (GstDiscovererVideoInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_VIDEO_INFO); + g_object_new (GST_TYPE_DISCOVERER_VIDEO_INFO, NULL); } static GstDiscovererVideoInfo * @@ -279,7 +273,7 @@ gst_discoverer_video_info_copy_int (GstDiscovererVideoInfo * ptr) } /* Global stream information */ -G_DEFINE_TYPE (GstDiscovererInfo, gst_discoverer_info, GST_TYPE_MINI_OBJECT); +G_DEFINE_TYPE (GstDiscovererInfo, gst_discoverer_info, G_TYPE_OBJECT); static void gst_discoverer_info_init (GstDiscovererInfo * info) @@ -288,12 +282,13 @@ gst_discoverer_info_init (GstDiscovererInfo * info) } static void -gst_discoverer_info_finalize (GstDiscovererInfo * info) +gst_discoverer_info_finalize (GObject * object) { + GstDiscovererInfo *info = (GstDiscovererInfo *) object; g_free (info->uri); if (info->stream_info) - gst_mini_object_unref ((GstMiniObject *) info->stream_info); + g_object_unref ((GObject *) info->stream_info); if (info->misc) gst_structure_free (info->misc); @@ -307,7 +302,7 @@ gst_discoverer_info_finalize (GstDiscovererInfo * info) static GstDiscovererInfo * gst_discoverer_info_new (void) { - return (GstDiscovererInfo *) gst_mini_object_new (GST_TYPE_DISCOVERER_INFO); + return (GstDiscovererInfo *) g_object_new (GST_TYPE_DISCOVERER_INFO, NULL); } GstDiscovererInfo * @@ -350,11 +345,9 @@ gst_discoverer_info_copy (GstDiscovererInfo * ptr) } static void -gst_discoverer_info_class_init (GstMiniObjectClass * klass) +gst_discoverer_info_class_init (GObjectClass * klass) { - klass->finalize = - (GstMiniObjectFinalizeFunction) gst_discoverer_info_finalize; - klass->copy = (GstMiniObjectCopyFunction) gst_discoverer_info_copy; + klass->finalize = gst_discoverer_info_finalize; } /** diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 4a7d72d..a989bc4 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -597,7 +597,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st, return parent; else return (GstDiscovererStreamInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_STREAM_INFO); + g_object_new (GST_TYPE_DISCOVERER_STREAM_INFO, NULL); } gst_structure_id_get (st, _CAPS_QUARK, GST_TYPE_CAPS, &caps, NULL); @@ -611,7 +611,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st, info = (GstDiscovererAudioInfo *) parent; else { info = (GstDiscovererAudioInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_AUDIO_INFO); + g_object_new (GST_TYPE_DISCOVERER_AUDIO_INFO, NULL); info->parent.caps = caps; } @@ -652,7 +652,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st, info = (GstDiscovererVideoInfo *) parent; else { info = (GstDiscovererVideoInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_VIDEO_INFO); + g_object_new (GST_TYPE_DISCOVERER_VIDEO_INFO, NULL); info->parent.caps = caps; } @@ -703,7 +703,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st, info = parent; else { info = (GstDiscovererStreamInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_STREAM_INFO); + g_object_new (GST_TYPE_DISCOVERER_STREAM_INFO, NULL); info->caps = caps; } @@ -866,7 +866,7 @@ parse_stream_topology (GstDiscoverer * dc, const GstStructure * topology, GST_DEBUG ("next is a list of %d entries", len); cont = (GstDiscovererContainerInfo *) - gst_mini_object_new (GST_TYPE_DISCOVERER_CONTAINER_INFO); + g_object_new (GST_TYPE_DISCOVERER_CONTAINER_INFO, NULL); cont->parent.caps = caps; res = (GstDiscovererStreamInfo *) cont; @@ -1143,7 +1143,7 @@ _setup_locked (GstDiscoverer * dc) /* Pop URI off the pending URI list */ dc->priv->current_info = - (GstDiscovererInfo *) gst_mini_object_new (GST_TYPE_DISCOVERER_INFO); + (GstDiscovererInfo *) g_object_new (GST_TYPE_DISCOVERER_INFO, NULL); dc->priv->current_info->uri = (gchar *) dc->priv->pending_uris->data; dc->priv->pending_uris = g_list_delete_link (dc->priv->pending_uris, dc->priv->pending_uris); diff --git a/gst-libs/gst/pbutils/gstdiscoverer.h b/gst-libs/gst/pbutils/gstdiscoverer.h index 671dbaa..5225738 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.h +++ b/gst-libs/gst/pbutils/gstdiscoverer.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define GST_IS_DISCOVERER_STREAM_INFO(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_STREAM_INFO)) typedef struct _GstDiscovererStreamInfo GstDiscovererStreamInfo; -typedef GstMiniObjectClass GstDiscovererStreamInfoClass; +typedef GObjectClass GstDiscovererStreamInfoClass; GType gst_discoverer_stream_info_get_type (void); /** @@ -56,8 +56,8 @@ GType gst_discoverer_stream_info_get_type (void); * * Since: 0.10.31 */ -#define gst_discoverer_stream_info_ref(info) ((GstDiscovererStreamInfo*) gst_mini_object_ref((GstMiniObject*) info)) -#define gst_discoverer_stream_info_unref(info) (gst_mini_object_unref((GstMiniObject*) info)) +#define gst_discoverer_stream_info_ref(info) ((GstDiscovererStreamInfo*) g_object_ref((GObject*) info)) +#define gst_discoverer_stream_info_unref(info) (g_object_unref((GObject*) info)) GstDiscovererStreamInfo* gst_discoverer_stream_info_get_previous(GstDiscovererStreamInfo* info); GstDiscovererStreamInfo* gst_discoverer_stream_info_get_next(GstDiscovererStreamInfo* info); @@ -80,7 +80,7 @@ const gchar * gst_discoverer_stream_info_get_stream_type_nick(GstDisc #define GST_IS_DISCOVERER_CONTAINER_INFO(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_CONTAINER_INFO)) typedef struct _GstDiscovererContainerInfo GstDiscovererContainerInfo; -typedef GstMiniObjectClass GstDiscovererContainerInfoClass; +typedef GObjectClass GstDiscovererContainerInfoClass; GType gst_discoverer_container_info_get_type (void); @@ -101,7 +101,7 @@ GList *gst_discoverer_container_info_get_streams(GstDiscovererContainerInfo *inf #define GST_IS_DISCOVERER_AUDIO_INFO(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_AUDIO_INFO)) typedef struct _GstDiscovererAudioInfo GstDiscovererAudioInfo; -typedef GstMiniObjectClass GstDiscovererAudioInfoClass; +typedef GObjectClass GstDiscovererAudioInfoClass; GType gst_discoverer_audio_info_get_type (void); @@ -125,7 +125,7 @@ guint gst_discoverer_audio_info_get_max_bitrate(const GstDiscovererAudioInfo* in #define GST_IS_DISCOVERER_VIDEO_INFO(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_VIDEO_INFO)) typedef struct _GstDiscovererVideoInfo GstDiscovererVideoInfo; -typedef GstMiniObjectClass GstDiscovererVideoInfoClass; +typedef GObjectClass GstDiscovererVideoInfoClass; GType gst_discoverer_video_info_get_type (void); guint gst_discoverer_video_info_get_width(const GstDiscovererVideoInfo* info); @@ -178,11 +178,11 @@ typedef struct _GstDiscovererInfo GstDiscovererInfo; (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_INFO, GstDiscovererInfo)) #define GST_IS_DISCOVERER_INFO(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_INFO)) -typedef GstMiniObjectClass GstDiscovererInfoClass; +typedef GObjectClass GstDiscovererInfoClass; GType gst_discoverer_info_get_type (void); -#define gst_discoverer_info_unref(info) (gst_mini_object_unref((GstMiniObject*)info)) -#define gst_discoverer_info_ref(info) (gst_mini_object_ref((GstMiniObject*)info)) +#define gst_discoverer_info_unref(info) (g_object_unref((GObject*)info)) +#define gst_discoverer_info_ref(info) (g_object_ref((Gbject*)info)) GstDiscovererInfo* gst_discoverer_info_copy (GstDiscovererInfo * ptr); diff --git a/gst-libs/gst/pbutils/pbutils-private.h b/gst-libs/gst/pbutils/pbutils-private.h index 5031df0..2d7fcd8 100644 --- a/gst-libs/gst/pbutils/pbutils-private.h +++ b/gst-libs/gst/pbutils/pbutils-private.h @@ -19,7 +19,7 @@ */ struct _GstDiscovererStreamInfo { - GstMiniObject parent; + GObject parent; GstDiscovererStreamInfo *previous; /* NULL for starting points */ GstDiscovererStreamInfo *next; /* NULL for containers */ @@ -65,7 +65,7 @@ struct _GstDiscovererVideoInfo { }; struct _GstDiscovererInfo { - GstMiniObject parent; + GObject parent; gchar *uri; GstDiscovererResult result;