# HG changeset patch
# User nenolod
# Date 1159779413 25200
# Node ID def887eae029f4c9d15b4e0462922acf451c2227
# Parent  ea802d0c9ac43240e98461ce30aed333eafe8a10
[svn] - remove some old debugging notices
- reset audio output if fmt does not match the fmt we already negotiated (for instance, LE->BE conversion requested)

diff -r ea802d0c9ac4 -r def887eae029 ChangeLog
--- a/ChangeLog	Mon Oct 02 01:52:12 2006 -0700
+++ b/ChangeLog	Mon Oct 02 01:56:53 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-02 08:52:12 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2471]
+  - remove an artifact of the bmp -> audacious transition
+  
+  trunk/rename.sh |    7 -------
+  1 file changed, 7 deletions(-)
+
+
 2006-10-02 08:46:59 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2469]
   - always zero-out stack variables, as stack memory may be dirty on x86 and friends
diff -r ea802d0c9ac4 -r def887eae029 audacious/output.c
--- a/audacious/output.c	Mon Oct 02 01:52:12 2006 -0700
+++ b/audacious/output.c	Mon Oct 02 01:56:53 2006 -0700
@@ -92,7 +92,6 @@
 #if 0
     playing = bmp_playback_get_playing();
     if (playing) {
-
         /* FIXME: we do all on our own here */
         
         guint min = 0, sec = 0, params, time, pos;
@@ -233,7 +232,7 @@
 
     /* Is our output port already open? */
     if ((op_state.rate != 0 && op_state.nch != 0) &&
-	(op_state.rate == rate && op_state.nch == nch))
+	(op_state.rate == rate && op_state.nch == nch && op_state.fmt == fmt))
     {
 	/* Yes, and it's the correct sampling rate. Reset the counter and go. */
 	op->flush(0);
@@ -282,15 +281,6 @@
     if (op == NULL)
         return;
 
-#if 0
-    g_print("Requirements to close audio output have been met:\n"
-	"ip_data.stop = %d\n"
-	"playlist_get_position_nolock() = %d\n"
-	"playlist_get_length_nolock() - 1 = %d\n",
-	ip_data.stop, playlist_get_position_nolock(),
-	playlist_get_length_nolock() - 1);
-#endif
-
     op->close_audio();
 
     /* Reset the op_state. */