From f8666a569f7b321c1ec6fd7f33b6e6d5f3a89581 Mon Sep 17 00:00:00 2001
From: Richard Boulton <richard@tartarus.org>
Date: Mon, 18 Sep 2000 22:19:57 +0000
Subject: [PATCH] Fix compile problem due to DEBUG being redefined in
 libs/getbits/gstgetbits.h.  Also fix several small typos in the d...

Original commit message from CVS:
Fix compile problem due to DEBUG being redefined in
libs/getbits/gstgetbits.h.  Also fix several small typos in the docs and
examples.
---
 autogen.sh                   | 2 +-
 docs/manual/helloworld2.sgml | 8 ++++----
 gstplay/gstplay.glade        | 2 +-
 libs/getbits/Makefile.am     | 2 +-
 libs/getbits/gstgetbits.h    | 4 +++-
 test/wave.c                  | 1 -
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6898683..391b8f1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -45,9 +45,9 @@ fi
 
 libtoolize --copy --force
 aclocal $ACLOCAL_FLAGS
-automake --add-missing
 autoheader
 autoconf
+automake --add-missing
 
 if [ "x$1" = "x--autogen-recurse" ];then
   exit	# the rest will happen later
diff --git a/docs/manual/helloworld2.sgml b/docs/manual/helloworld2.sgml
index b1d1782..2d382b6 100644
--- a/docs/manual/helloworld2.sgml
+++ b/docs/manual/helloworld2.sgml
@@ -15,8 +15,8 @@
     <title>Autoplugging helloworld</title>
     <para> 
       We will create a second version of the helloworld application using
-      autoplugging. Its source code is considerably more easy to write and
-      can also handle much more data types.
+      autoplugging. Its source code is considerably easier to write and
+      it can also handle many more data types.
     </para>
 
     <programlisting>
@@ -91,7 +91,7 @@ int main(int argc,char *argv[])
     </programlisting>
 
     <para>
-      first of all, we do not use any mpg123 or mp3parse element in this example.
+      First of all, we do not use any mpg123 or mp3parse element in this example.
       In fact, we only specify a source element and a sink element and add them
       to a pipeline.
     </para>
@@ -149,7 +149,7 @@ int main(int argc,char *argv[])
     </para>
 
     <para>
-      I you really want, you can use the GSteamer components to do the 
+      If you really want, you can use the GSteamer components to do the 
       autoplugging yourself. 
     </para>
 
diff --git a/gstplay/gstplay.glade b/gstplay/gstplay.glade
index 91a729f..f0248a6 100644
--- a/gstplay/gstplay.glade
+++ b/gstplay/gstplay.glade
@@ -396,7 +396,7 @@
 Wim Taymans, plugin hacker
 Richard Boulton, makefile hacker
 </authors>
-  <comments>A generice media player for the gstreamer streaming media framework.</comments>
+  <comments>A generic media player for the gstreamer streaming media framework.</comments>
 </widget>
 
 <widget>
diff --git a/libs/getbits/Makefile.am b/libs/getbits/Makefile.am
index 1a687b1..49fcfbb 100644
--- a/libs/getbits/Makefile.am
+++ b/libs/getbits/Makefile.am
@@ -9,7 +9,7 @@ GSTARCH_SRCS =
 endif
 
 libgstgetbits_la_SOURCES = gstgetbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
-EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s gstgetbits_generic.c
+EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
 
 libgstgetbitsincludedir = $(includedir)/gst/libs/gstgetbits
 libgstgetbitsinclude_HEADERS = gstgetbits.h
diff --git a/libs/getbits/gstgetbits.h b/libs/getbits/gstgetbits.h
index b3ea9a4..e1292f9 100644
--- a/libs/getbits/gstgetbits.h
+++ b/libs/getbits/gstgetbits.h
@@ -17,12 +17,14 @@
 #endif /* HAVE_LIBSSE */
 
 // FIXME - let configure set DEBUG_ENABLED.
-//#define DEBUG_ENABLED
+/* debugging */
+#ifndef DEBUG
 #ifdef DEBUG_ENABLED
 #define DEBUG(format, args...) g_print("DEBUG:(%d) " format, getpid() , ##args)
 #else
 #define DEBUG(format, args...)
 #endif
+#endif
 
 
 #ifdef WORDS_BIGENDIAN
diff --git a/test/wave.c b/test/wave.c
index 0123150..c92dea1 100644
--- a/test/wave.c
+++ b/test/wave.c
@@ -42,7 +42,6 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(wave,"sink"));
 
   appwindow = gnome_app_new("wave","Wave");
-  drawingarea = gtk_drawing_area_new();
   gnome_app_set_contents(GNOME_APP(appwindow),gst_util_get_widget_arg(GTK_OBJECT(wave),"widget"));
   gtk_widget_show_all(appwindow);
 
-- 
2.7.4