Merge branch 'v0.17.x'

Conflicts: src/locate.c
2012-09-25 11:39:01 +02:00
parent 1536b5a9d6 ba6ef53ef9
commit e2a574e2a0
9 changed files with 29 additions and 28 deletions
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -487,7 +487,6 @@ decoder_task(gpointer arg)

 		switch (dc->command) {
 		case DECODE_COMMAND_START:
-			g_debug("clearing mixramp tags");
 			dc_mixramp_start(dc, NULL);
 			dc_mixramp_prev_end(dc, dc->mixramp_end);
 			dc->mixramp_end = NULL; /* Don't free, it's copied above. */