From c453f7dc52fcfd9233e857a690bf375330d6cfe0 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Thu, 3 Jun 2004 02:58:41 +0000
Subject: remove debug code, and preivous commit fixes a segfault due to a
doble free on an error trying to decode mp3's
git-svn-id: https://svn.musicpd.org/mpd/trunk@1314 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
src/decode.c | 4 +---
src/playlist.c | 5 -----
2 files changed, 1 insertion(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/decode.c b/src/decode.c
index bb043d6b2..f19301c66 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -311,9 +311,7 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
ret = DECODE_ERROR_UNKTYPE;
if(isRemoteUrl(pc->utf8url)) {
- if(inStream.mime) {
- plugin = getInputPluginFromMimeType(inStream.mime);
- }
+ plugin = getInputPluginFromMimeType(inStream.mime);
if(plugin == NULL) {
plugin = getInputPluginFromSuffix(
getSuffix(dc->utf8url));
diff --git a/src/playlist.c b/src/playlist.c
index 1dea4b7ce..75b812338 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -825,21 +825,16 @@ void playPlaylistIfPlayerStopped() {
if(error==PLAYER_ERROR_NOERROR) playlist_errorCount = 0;
else playlist_errorCount++;
- printf("HERE 1\n");
if(playlist_state==PLAYLIST_STATE_PLAY && (
(playlist_stopOnError &&
error!=PLAYER_ERROR_NOERROR) ||
error==PLAYER_ERROR_AUDIO ||
error==PLAYER_ERROR_SYSTEM ||
playlist_errorCount>=playlist.length)) {
- printf("HERE 1-1\n");
- printf("playlist_stopOnError: %i\n", playlist_stopOnError);
stopPlaylist(stderr);
- printf("HERE 1-2\n");
}
else if(playlist_noGoToNext) currentSongInPlaylist(stderr);
else nextSongInPlaylist(stderr);
- printf("HERE 2\n");
}
}
--
cgit v1.2.3