Commit 0873492b authored by Stefan Kost's avatar Stefan Kost
Browse files

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.
parent 85177c05
2007-09-20 Stefan Kost <ensonic@users.sf.net>
* 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 <wim.taymans@gmail.com> 2007-09-19 Wim Taymans <wim.taymans@gmail.com>
   
* libs/gst/base/gstbasesrc.c: (gst_base_src_send_event): * libs/gst/base/gstbasesrc.c: (gst_base_src_send_event):
......
...@@ -114,9 +114,9 @@ struct _GstBin { ...@@ -114,9 +114,9 @@ struct _GstBin {
GstClock *provided_clock; GstClock *provided_clock;
GstElement *clock_provider; GstElement *clock_provider;
/*< private >*/
GstBinPrivate *priv; GstBinPrivate *priv;
/*< private >*/
gpointer _gst_reserved[GST_PADDING - 1]; gpointer _gst_reserved[GST_PADDING - 1];
}; };
......
...@@ -372,6 +372,11 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock, ...@@ -372,6 +372,11 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
*jitter = GST_CLOCK_DIFF (entryt, now); *jitter = GST_CLOCK_DIFF (entryt, now);
} }
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; target = gst_system_clock_get_internal_time (clock) + diff;
GST_CAT_DEBUG (GST_CAT_CLOCK, "entry %p" GST_CAT_DEBUG (GST_CAT_CLOCK, "entry %p"
...@@ -379,7 +384,7 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock, ...@@ -379,7 +384,7 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
" entry %" GST_TIME_FORMAT " entry %" GST_TIME_FORMAT
" now %" GST_TIME_FORMAT " now %" GST_TIME_FORMAT
" real %" GST_TIME_FORMAT " real %" GST_TIME_FORMAT
" diff %" G_GINT64_FORMAT, " diff (entry-now) %" G_GINT64_FORMAT,
entry, entry,
GST_TIME_ARGS (target), GST_TIME_ARGS (target),
GST_TIME_ARGS (entryt), GST_TIME_ARGS (now), GST_TIME_ARGS (real), diff); GST_TIME_ARGS (entryt), GST_TIME_ARGS (now), GST_TIME_ARGS (real), diff);
......
...@@ -20,7 +20,7 @@ install-pluginLTLIBRARIES: ...@@ -20,7 +20,7 @@ install-pluginLTLIBRARIES:
# the core dumps of some machines have PIDs appended, test registry and # the core dumps of some machines have PIDs appended, test registry and
# profiling data # profiling data
CLEANFILES = core core.* test-registry.reg *.gcno *.gcda CLEANFILES = core core.* test-registry.* *.gcno *.gcda
SUPPRESSIONS = $(top_srcdir)/common/gst.supp SUPPRESSIONS = $(top_srcdir)/common/gst.supp
......
...@@ -15,7 +15,7 @@ INCLUDES = $(GST_OBJ_CFLAGS) ...@@ -15,7 +15,7 @@ INCLUDES = $(GST_OBJ_CFLAGS)
# gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS) # gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
# gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS) # 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 = \ REGISTRY_ENVIRONMENT = \
GST_REGISTRY=$(CHECK_REGISTRY) GST_REGISTRY=$(CHECK_REGISTRY)
...@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = \ ...@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = \
GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/plugins 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 EXTRA_DIST = extract.pl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment