changeset 2925:1197c13e4217

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

--- a/src/icecast/icecast.c	Sun Aug 17 14:15:47 2008 +0300
+++ b/src/icecast/icecast.c	Mon Aug 18 21:50:42 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)

--- a/src/scrobbler/scrobbler.c	Sun Aug 17 14:15:47 2008 +0300
+++ b/src/scrobbler/scrobbler.c	Mon Aug 18 21:50:42 2008 +0300
@@ -479,12 +479,12 @@
     auth_tmp = g_strdup_printf("%s%ld", sc_password, ts);
     auth = (char *)md5_string(auth_tmp, strlen(auth_tmp));
     g_free(auth_tmp);
-    hexify(auth, strlen(auth));
+    hexify(auth, 16);
     auth_tmp = g_strdup(sc_response_hash);
 
     g_snprintf(buf, sizeof(buf), "%s/?hs=true&p=%s&c=%s&v=%s&u=%s&t=%ld&a=%s",
             SCROBBLER_HS_URL, SCROBBLER_VERSION,
-            SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, sc_username, time(NULL),
+            SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, sc_username, ts,
             auth_tmp);
     g_free(auth_tmp);