mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsink: make the lock recursive for now

Browse source 
Fixes #583255
This commit is contained in:
Wim Taymans 2009-09-28 22:06:11 +02:00 committed by Wim Taymans
parent f18ed7abf9
commit a8d7e6a490
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/playback/gstplaysink.c
View file

@ -116,15 +116,15 @@ typedef struct
GstElement *sink; /* custom sink to receive subpicture buffers */ GstElement *sink; /* custom sink to receive subpicture buffers */
} GstPlaySubpChain; } GstPlaySubpChain;
#define GST_PLAY_SINK_GET_LOCK(playsink) (((GstPlaySink *)playsink)->lock) #define GST_PLAY_SINK_GET_LOCK(playsink) (&((GstPlaySink *)playsink)->lock)
#define GST_PLAY_SINK_LOCK(playsink) g_mutex_lock (GST_PLAY_SINK_GET_LOCK (playsink)) #define GST_PLAY_SINK_LOCK(playsink) g_static_rec_mutex_lock (GST_PLAY_SINK_GET_LOCK (playsink))
#define GST_PLAY_SINK_UNLOCK(playsink) g_mutex_unlock (GST_PLAY_SINK_GET_LOCK (playsink)) #define GST_PLAY_SINK_UNLOCK(playsink) g_static_rec_mutex_unlock (GST_PLAY_SINK_GET_LOCK (playsink))
struct _GstPlaySink struct _GstPlaySink
{ {
GstBin bin; GstBin bin;
GMutex *lock; GStaticRecMutex lock;
gboolean async_pending; gboolean async_pending;
gboolean need_async_start; gboolean need_async_start;
@ -354,7 +354,7 @@ gst_play_sink_init (GstPlaySink * playsink)
playsink->font_desc = NULL; playsink->font_desc = NULL;
playsink->flags = DEFAULT_FLAGS; playsink->flags = DEFAULT_FLAGS;
playsink->lock = g_mutex_new (); g_static_rec_mutex_init (&playsink->lock);
playsink->need_async_start = TRUE; playsink->need_async_start = TRUE;
GST_OBJECT_FLAG_SET (playsink, GST_ELEMENT_IS_SINK); GST_OBJECT_FLAG_SET (playsink, GST_ELEMENT_IS_SINK);
} }
@ -438,7 +438,7 @@ gst_play_sink_finalize (GObject * object)
playsink = GST_PLAY_SINK (object); playsink = GST_PLAY_SINK (object);
g_mutex_free (playsink->lock); g_static_rec_mutex_free (&playsink->lock);
G_OBJECT_CLASS (gst_play_sink_parent_class)->finalize (object); G_OBJECT_CLASS (gst_play_sink_parent_class)->finalize (object);
} }