[Swfdec-commits] 2 commits - doc/Makefile.am test/sound

[Benjamin Otte]

 doc/Makefile.am         |    3 ++-
 test/sound/downsample.c |   12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 15b71e8c41ee617c0b7003efcc1a8e35e6da4022
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Dec 28 20:23:54 2008 +0100

    fix downsample file to a) work and b) not emit warnings

diff --git a/test/sound/downsample.c b/test/sound/downsample.c
index f8619cd..3f7692f 100644
--- a/test/sound/downsample.c
+++ b/test/sound/downsample.c
@@ -82,22 +82,20 @@ cut_silence (char *data, guint length, guint steps)
 {
   guint i, new;
 
-  new = length * steps;
-  while (new > 0) {
+  for (new = length; new > 0; new--) {
     for (i = 0; i < steps; i++) {
-      if (data[new - 1 - i] != 0)
+      if (data[new * steps - 1 - i] != 0)
 	goto out;
     }
-    new -= steps;
   }
 
 out:
-  if (new / steps < length) {
-    g_print ("Info: Cut %u zero sample(s) at end of file\n", length - new / steps);
+  if (new < length) {
+    g_print ("Info: Cut %u zero sample(s) at end of file\n", length - new);
   } else {
     g_print ("Info: No zero samples cut at end of file\n");
   }
-  return length;
+  return length - new;
 }
 
 int
commit d279c9d1b5de636f577ffd08860e2dfd9d111cc1
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Dec 28 19:59:48 2008 +0100

    fix build for --disable-gtk-doc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7e2f9e8..8ede8bd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -222,8 +222,9 @@ include $(top_srcdir)/gtk-doc.make
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += 
 
+if ENABLE_GTK_DOC
 # Comment this out if you want your docs-status tested during 'make check'
 check-local:
 	(cd $(srcdir) \
 	 && $(GTKDOC_CHECK))
-
+endif