mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

liveadder: don't use deprecated GLib threading API

Browse source
This commit is contained in:
Tim-Philipp Müller 2013-02-09 19:53:51 +00:00
parent 68a34d2a60
commit eef2324e4d
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/liveadder/liveadder.c
View file

@ -44,7 +44,6 @@
#include "liveadder.h" #include "liveadder.h"
#include <gst/glib-compat-private.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <string.h> #include <string.h>
@ -206,7 +205,7 @@ gst_live_adder_init (GstLiveAdder * adder)
adder->padcount = 0; adder->padcount = 0;
adder->func = NULL; adder->func = NULL;
adder->not_empty_cond = g_cond_new (); g_cond_init (&adder->not_empty_cond);
adder->next_timestamp = GST_CLOCK_TIME_NONE; adder->next_timestamp = GST_CLOCK_TIME_NONE;
@ -221,7 +220,7 @@ gst_live_adder_finalize (GObject * object)
{ {
GstLiveAdder *adder = GST_LIVE_ADDER (object); GstLiveAdder *adder = GST_LIVE_ADDER (object);
g_cond_free (adder->not_empty_cond); g_cond_clear (&adder->not_empty_cond);
g_queue_foreach (adder->buffers, (GFunc) gst_mini_object_unref, NULL); g_queue_foreach (adder->buffers, (GFunc) gst_mini_object_unref, NULL);
while (g_queue_pop_head (adder->buffers)) { while (g_queue_pop_head (adder->buffers)) {
@ -467,7 +466,7 @@ gst_live_adder_flush_start (GstLiveAdder * adder)
if (adder->clock_id) if (adder->clock_id)
gst_clock_id_unschedule (adder->clock_id); gst_clock_id_unschedule (adder->clock_id);
g_cond_broadcast (adder->not_empty_cond); g_cond_broadcast (&adder->not_empty_cond);
GST_OBJECT_UNLOCK (adder); GST_OBJECT_UNLOCK (adder);
} }
@ -571,7 +570,7 @@ gst_live_adder_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
if (ret && !padprivate->eos) { if (ret && !padprivate->eos) {
GST_DEBUG_OBJECT (adder, "queuing EOS"); GST_DEBUG_OBJECT (adder, "queuing EOS");
padprivate->eos = TRUE; padprivate->eos = TRUE;
g_cond_broadcast (adder->not_empty_cond); g_cond_broadcast (&adder->not_empty_cond);
} else if (padprivate->eos) { } else if (padprivate->eos) {
GST_DEBUG_OBJECT (adder, "dropping EOS, we are already EOS"); GST_DEBUG_OBJECT (adder, "dropping EOS, we are already EOS");
} else { } else {
@ -1126,7 +1125,7 @@ gst_live_live_adder_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
skip += mix_duration; skip += mix_duration;
} }
g_cond_broadcast (adder->not_empty_cond); g_cond_broadcast (&adder->not_empty_cond);
if (skip == GST_BUFFER_DURATION (buffer)) { if (skip == GST_BUFFER_DURATION (buffer)) {
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
@ -1216,7 +1215,7 @@ again:
break; break;
if (check_eos_locked (adder)) if (check_eos_locked (adder))
goto eos; goto eos;
g_cond_wait (adder->not_empty_cond, GST_OBJECT_GET_LOCK (adder)); g_cond_wait (&adder->not_empty_cond, GST_OBJECT_GET_LOCK (adder));
} }
buffer_timestamp = GST_BUFFER_TIMESTAMP (g_queue_peek_head (adder->buffers)); buffer_timestamp = GST_BUFFER_TIMESTAMP (g_queue_peek_head (adder->buffers));

2
gst/liveadder/liveadder.h
View file

@ -62,7 +62,7 @@ struct _GstLiveAdder
/* the queue is ordered head to tail */ /* the queue is ordered head to tail */
GQueue *buffers; GQueue *buffers;
GCond *not_empty_cond; GCond not_empty_cond;
GstClockTime next_timestamp; GstClockTime next_timestamp;