mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 14:52:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

clock: Fix deprecation handling of the GstClock clock field

Browse source
This commit is contained in:
Sebastian Dröge 2018-11-03 18:29:03 +02:00
parent 36ab067905
commit f34472822c
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstclock.c
View file

@ -249,8 +249,12 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
"created entry %p, time %" GST_TIME_FORMAT, entry, GST_TIME_ARGS (time));
entry->refcount = 1;
#ifndef GST_REMOVE_DEPRECATED
#ifndef GST_DISABLE_DEPRECATED
entry->clock = clock;
#else
entry->_clock = clock;
#endif
#endif
g_weak_ref_init (&entry->ABI.clock, clock);
entry->type = type;

4
gst/gstclock.h
View file

@ -392,8 +392,12 @@ typedef enum {
struct _GstClockEntry {
gint refcount;
/*< protected >*/
#ifndef GST_REMOVE_DEPRECATED
#ifndef GST_DISABLE_DEPRECATED
GstClock *clock;
#else
gpointer _clock;
#endif
#endif
GstClockEntryType type;
GstClockTime time;