[gst-cvs] ensonic gstreamer: gstreamer/ gstreamer/gst/ gstreamer/tests/check/ gstreamer/tests/examples/manual/

[<en...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     ensonic
Date:           Thu Sep 20 2007  07:42:51 UTC

Log message:
	* 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.

Modified files:
    .               : ChangeLog
    gst             : gstbin.h gstsystemclock.c
    tests/check     : Makefile.am
    tests/examples/manual: Makefile.am

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3423&r2=1.3424
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.h.diff?r1=1.97&r2=1.98
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstsystemclock.c.diff?r1=1.47&r2=1.48
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tests/check/Makefile.am.diff?r1=1.126&r2=1.127
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tests/examples/manual/Makefile.am.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3423
retrieving revision 1.3424
diff -u -d -r1.3423 -r1.3424
--- ChangeLog	19 Sep 2007 20:39:51 -0000	1.3423
+++ ChangeLog	20 Sep 2007 07:42:31 -0000	1.3424
@@ -1,3 +1,15 @@
+2007-09-20  Stefan Kost  <en...@us...>
+
+	* 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...@gm...>
 
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_send_event):
Index: gstbin.h
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- gstbin.h	18 Jun 2007 15:12:28 -0000	1.97
+++ gstbin.h	20 Sep 2007 07:42:33 -0000	1.98
@@ -114,9 +114,9 @@
   GstClock	*provided_clock;
   GstElement    *clock_provider;
+  /*< private >*/
   GstBinPrivate *priv;
-  /*< private >*/
   gpointer _gst_reserved[GST_PADDING - 1];
 };
Index: gstsystemclock.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstsystemclock.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gstsystemclock.c	22 Mar 2007 11:58:07 -0000	1.47
+++ gstsystemclock.c	20 Sep 2007 07:42:33 -0000	1.48
@@ -372,6 +372,11 @@
     *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 @@
       " 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);
Index: Makefile.am
RCS file: /cvs/gstreamer/gstreamer/tests/check/Makefile.am,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- Makefile.am	3 Jul 2007 16:26:29 -0000	1.126
+++ Makefile.am	20 Sep 2007 07:42:34 -0000	1.127
@@ -20,7 +20,7 @@
 # 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
RCS file: /cvs/gstreamer/gstreamer/tests/examples/manual/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	28 Sep 2006 15:27:12 -0000	1.3
+++ Makefile.am	20 Sep 2007 07:42:35 -0000	1.4
@@ -15,7 +15,7 @@
 # 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 @@
         GST_PLUGIN_SYSTEM_PATH=                                 \
         GST_PLUGIN_PATH=$(top_builddir)/plugins
-CLEANFILES = core core.* test-registry.xml *.gcno *.gcda
 EXTRA_DIST = extract.pl