From e9370329dd317230bb2832b2f5f73434f2074e87 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 16 May 2008 17:50:20 +0000
Subject: Fix some compiler warnings.

Original commit message from CVS:
* ext/wavpack/gstwavpackstreamreader.c:
* tests/examples/spectrum/demo-audiotest.c:
* tests/examples/spectrum/demo-osssrc.c:
Fix some compiler warnings.
---
 ChangeLog                                | 7 +++++++
 common                                   | 2 +-
 ext/wavpack/gstwavpackstreamreader.c     | 2 +-
 tests/examples/spectrum/demo-audiotest.c | 2 ++
 tests/examples/spectrum/demo-osssrc.c    | 3 +++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8c5c239..eb5b5450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-16  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* ext/wavpack/gstwavpackstreamreader.c:
+	* tests/examples/spectrum/demo-audiotest.c:
+	* tests/examples/spectrum/demo-osssrc.c:
+	Fix some compiler warnings.
+
 2008-05-14  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_process):
diff --git a/common b/common
index 0823ac6b..3b363108 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0823ac6b46b7332109bbc5f1ef40e24e648fae51
+Subproject commit 3b3631082d04b426f450810e8836de94e9c5d60a
diff --git a/ext/wavpack/gstwavpackstreamreader.c b/ext/wavpack/gstwavpackstreamreader.c
index 868f7bfa..6fda41c1 100644
--- a/ext/wavpack/gstwavpackstreamreader.c
+++ b/ext/wavpack/gstwavpackstreamreader.c
@@ -43,7 +43,7 @@ gst_wavpack_stream_reader_read_bytes (void *id, void *data, int32_t bcount)
     rid->position += to_read;
     return to_read;
   } else {
-    GST_WARNING ("Couldn't read %d bytes");
+    GST_WARNING ("Couldn't read %d bytes", bcount);
     return 0;
   }
 }
diff --git a/tests/examples/spectrum/demo-audiotest.c b/tests/examples/spectrum/demo-audiotest.c
index bc2e9abc..a8d76c16 100644
--- a/tests/examples/spectrum/demo-audiotest.c
+++ b/tests/examples/spectrum/demo-audiotest.c
@@ -28,7 +28,9 @@
 #include <gst/gst.h>
 #include <gtk/gtk.h>
 
+#ifndef DEFAULT_AUDIOSINK
 #define DEFAULT_AUDIOSINK "autoaudiosink"
+#endif
 
 static GtkWidget *drawingarea = NULL;
 static guint spect_height = 64;
diff --git a/tests/examples/spectrum/demo-osssrc.c b/tests/examples/spectrum/demo-osssrc.c
index eb28cff7..6b831f17 100644
--- a/tests/examples/spectrum/demo-osssrc.c
+++ b/tests/examples/spectrum/demo-osssrc.c
@@ -27,7 +27,10 @@
 #include <gst/gst.h>
 #include <gtk/gtk.h>
 
+#ifndef DEFAULT_AUDIOSRC
 #define DEFAULT_AUDIOSRC "alsasrc"
+#endif
+
 static guint spect_height = 64;
 static guint spect_bands = 256;
 static gfloat height_scale = 1.0;
-- 
cgit