From 0873492be62531247088e02c1ec1ae27830cf285 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 20 Sep 2007 07:42:35 +0000 Subject: [PATCH] gst/gstbin.h: Move priv to the right place. Original commit message from CVS: * gst/gstbin.h: Move priv to the right place. * gst/gstsystemclock.c: Add FIXME: and improve log. * tests/check/Makefile.am: * tests/examples/manual/Makefile.am: Work with all types of registries. --- ChangeLog | 12 ++++++++++++ gst/gstbin.h | 2 +- gst/gstsystemclock.c | 7 ++++++- tests/check/Makefile.am | 2 +- tests/examples/manual/Makefile.am | 4 ++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e467ae690f..09b3ab0c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-09-20 Stefan Kost + + * gst/gstbin.h: + Move priv to the right place. + + * gst/gstsystemclock.c: + Add FIXME: and improve log. + + * tests/check/Makefile.am: + * tests/examples/manual/Makefile.am: + Work with all types of registries. + 2007-09-19 Wim Taymans * libs/gst/base/gstbasesrc.c: (gst_base_src_send_event): diff --git a/gst/gstbin.h b/gst/gstbin.h index 1a2714deea..5f024ad38a 100644 --- a/gst/gstbin.h +++ b/gst/gstbin.h @@ -114,9 +114,9 @@ struct _GstBin { GstClock *provided_clock; GstElement *clock_provider; + /*< private >*/ GstBinPrivate *priv; - /*< private >*/ gpointer _gst_reserved[GST_PADDING - 1]; }; diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index aef71b8d02..c20013110e 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -372,6 +372,11 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock, *jitter = GST_CLOCK_DIFF (entryt, now); } diff = entryt - now; + /* FIXME: should that be not just: + * target = GST_CLOCK_GET_CLASS (clock)->get_internal_time (clock) + diff; + * or even + * target = real + diff; + */ target = gst_system_clock_get_internal_time (clock) + diff; GST_CAT_DEBUG (GST_CAT_CLOCK, "entry %p" @@ -379,7 +384,7 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock, " entry %" GST_TIME_FORMAT " now %" GST_TIME_FORMAT " real %" GST_TIME_FORMAT - " diff %" G_GINT64_FORMAT, + " diff (entry-now) %" G_GINT64_FORMAT, entry, GST_TIME_ARGS (target), GST_TIME_ARGS (entryt), GST_TIME_ARGS (now), GST_TIME_ARGS (real), diff); diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 900398ade5..6915058301 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -20,7 +20,7 @@ install-pluginLTLIBRARIES: # the core dumps of some machines have PIDs appended, test registry and # profiling data -CLEANFILES = core core.* test-registry.reg *.gcno *.gcda +CLEANFILES = core core.* test-registry.* *.gcno *.gcda SUPPRESSIONS = $(top_srcdir)/common/gst.supp diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am index 31963d27d9..80c4848125 100644 --- a/tests/examples/manual/Makefile.am +++ b/tests/examples/manual/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = $(GST_OBJ_CFLAGS) # gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS) # gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS) -CHECK_REGISTRY = $(top_builddir)/tests/examples/manual/test-registry.xml +CHECK_REGISTRY = $(top_builddir)/tests/examples/manual/test-registry.reg REGISTRY_ENVIRONMENT = \ GST_REGISTRY=$(CHECK_REGISTRY) @@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = \ GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_PATH=$(top_builddir)/plugins -CLEANFILES = core core.* test-registry.xml *.gcno *.gcda +CLEANFILES = core core.* test-registry.* *.gcno *.gcda EXTRA_DIST = extract.pl