diff audacious/output.c @ 1768:def887eae029 trunk

[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)

--- 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. */