mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

bugfixes:

Browse source 
Original commit message from CVS:
bugfixes:
- allow disposal of subclasses of GstSystemClock
- only create one system clock
This commit is contained in:
Benjamin Otte 2003-05-10 11:11:29 +00:00
parent 42004415b8
commit 76b9ffbdbc
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/gstsystemclock.c
View file

@ -100,9 +100,16 @@ gst_system_clock_init (GstSystemClock *clock)
static void static void
gst_system_clock_dispose (GObject *object) gst_system_clock_dispose (GObject *object)
{ {
g_warning ("disposing systemclock!"); GstClock *clock = (GstClock *) object;
/* no parent dispose here, this is bad enough already */ /* there are subclasses of GstSystemClock running around... */
if (_the_system_clock == clock) {
g_warning ("disposing systemclock!");
/* no parent dispose here, this is bad enough already */
} else {
G_OBJECT_CLASS (parent_class)->dispose (object);
}
} }
/** /**
@ -118,6 +125,12 @@ gst_system_clock_obtain (void)
GstClock *clock = _the_system_clock; GstClock *clock = _the_system_clock;
if (clock == NULL) { if (clock == NULL) {
g_mutex_lock (_gst_sysclock_mutex);
if (clock != NULL) {
g_mutex_unlock (_gst_sysclock_mutex);
goto have_clock;
}
clock = GST_CLOCK (g_object_new (GST_TYPE_SYSTEM_CLOCK, NULL)); clock = GST_CLOCK (g_object_new (GST_TYPE_SYSTEM_CLOCK, NULL));
gst_object_set_name (GST_OBJECT (clock), "GstSystemClock"); gst_object_set_name (GST_OBJECT (clock), "GstSystemClock");
@ -126,9 +139,11 @@ gst_system_clock_obtain (void)
gst_object_sink (GST_OBJECT (clock)); gst_object_sink (GST_OBJECT (clock));
_the_system_clock = clock; _the_system_clock = clock;
g_mutex_unlock (_gst_sysclock_mutex);
} }
gst_object_ref (GST_OBJECT (clock));
have_clock:
gst_object_ref (GST_OBJECT (clock));
return clock; return clock;
} }