# HG changeset patch
# User Andrew O. Shadoura <bugzilla@tut.by>
# Date 1219058278 -10800
# Node ID d354afe9df0ddcf132dd123aee3a67c08044f91a
# Parent  082f79c0563d862517c2f0502e7c1ca013d22465# Parent  223822ba79f27096fff6859c354cd2c12664cbbf
Automated merge with ssh://chrome@hg.atheme.org//hg/audacious-plugins

diff -r 223822ba79f2 -r d354afe9df0d src/icecast/icecast.c
--- a/src/icecast/icecast.c	Sat Aug 16 21:46:08 2008 +0300
+++ b/src/icecast/icecast.c	Mon Aug 18 14:17:58 2008 +0300
@@ -164,7 +164,6 @@
 static void ice_init(void)
 {
     ConfigDb *db;
-    g_debug("ICE_INIT");
     if (initialized==TRUE) return;
     shout_init();
     g_message("Using libshout %s", shout_version(NULL, NULL, NULL));
@@ -385,7 +384,6 @@
 
     rv = (plugin.open)();
 
-    g_debug("ICE_OPEN[%d:%d:%d]", fmt, rate, nch);
     return rv;
 }
 
@@ -424,28 +422,23 @@
     if (!length) return length;
     ret = shout_send(shout, ptr, length);
     shout_sync(shout);
-    g_debug("ice_write[%d:%d]", ret, length);
     return 0;
 }
 
 static gint ice_write_output(void *ptr, gint length)
 {
     if ((!shout) || (!length)) return 0;
-    /*g_debug("outputlength=%d, length=%d...", outputlength, length);*/
     if ((outputlength > bufferflush) || ((outputlength+length) > buffersize))
     {
-        /*g_debug("flushing");*/
         outputlength = ice_real_write(outputbuffer, outputlength);
     }
     {
         if (length > buffersize)
         {
-            /*g_debug("data too long, flushing");*/
             ice_real_write(ptr, length);
         }
         else
         {
-            /*g_debug("adding");*/
             memcpy(&(outputbuffer[outputlength]), ptr, length);
             outputlength += length;
         }
@@ -466,7 +459,6 @@
     shout = NULL;
     ice_tid = 0;
     ep_playing = FALSE;
-    g_debug("ICE_REAL_CLOSE");
     return FALSE;
 }
 
@@ -476,7 +468,6 @@
     if (ice_tid)
         g_source_remove(ice_tid);
     ice_tid = g_timeout_add_seconds(ice_close_timeout, ice_real_close, NULL);
-    g_debug("ICE_CLOSE: starting timer");
 }
 
 static void ice_flush(gint time)