mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Port to the new GMutex API

Browse source
This commit is contained in:
Thibault Saunier 2012-04-20 14:18:18 -04:00
parent ed2c218056
commit 4be360c4e5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ges/ges-timeline.c
View file

@ -48,7 +48,7 @@ static void track_duration_cb (GstElement * track,
G_DEFINE_TYPE (GESTimeline, ges_timeline, GST_TYPE_BIN); G_DEFINE_TYPE (GESTimeline, ges_timeline, GST_TYPE_BIN);
#define GES_TIMELINE_PENDINGOBJS_GET_LOCK(timeline) \ #define GES_TIMELINE_PENDINGOBJS_GET_LOCK(timeline) \
(GES_TIMELINE(timeline)->priv->pendingobjects_lock) (&GES_TIMELINE(timeline)->priv->pendingobjects_lock)
#define GES_TIMELINE_PENDINGOBJS_LOCK(timeline) \ #define GES_TIMELINE_PENDINGOBJS_LOCK(timeline) \
(g_mutex_lock(GES_TIMELINE_PENDINGOBJS_GET_LOCK (timeline))) (g_mutex_lock(GES_TIMELINE_PENDINGOBJS_GET_LOCK (timeline)))
#define GES_TIMELINE_PENDINGOBJS_UNLOCK(timeline) \ #define GES_TIMELINE_PENDINGOBJS_UNLOCK(timeline) \
@ -66,7 +66,7 @@ struct _GESTimelinePrivate
GstDiscoverer *discoverer; GstDiscoverer *discoverer;
GList *pendingobjects; GList *pendingobjects;
/* lock to avoid discovery of objects that will be removed */ /* lock to avoid discovery of objects that will be removed */
GMutex *pendingobjects_lock; GMutex pendingobjects_lock;
/* Whether we are changing state asynchronously or not */ /* Whether we are changing state asynchronously or not */
gboolean async_pending; gboolean async_pending;
@ -174,7 +174,7 @@ ges_timeline_finalize (GObject * object)
{ {
GESTimeline *timeline = GES_TIMELINE (object); GESTimeline *timeline = GES_TIMELINE (object);
g_mutex_free (timeline->priv->pendingobjects_lock); g_mutex_clear (&timeline->priv->pendingobjects_lock);
G_OBJECT_CLASS (ges_timeline_parent_class)->finalize (object); G_OBJECT_CLASS (ges_timeline_parent_class)->finalize (object);
} }
@ -284,7 +284,7 @@ ges_timeline_init (GESTimeline * self)
self->priv->tracks = NULL; self->priv->tracks = NULL;
self->priv->duration = 0; self->priv->duration = 0;
self->priv->pendingobjects_lock = g_mutex_new (); g_mutex_init (&self->priv->pendingobjects_lock);
/* New discoverer with a 15s timeout */ /* New discoverer with a 15s timeout */
self->priv->discoverer = gst_discoverer_new (15 * GST_SECOND, NULL); self->priv->discoverer = gst_discoverer_new (15 * GST_SECOND, NULL);
g_signal_connect (self->priv->discoverer, "finished", g_signal_connect (self->priv->discoverer, "finished",