oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

remove debug code, and preivous commit fixes a segfault due to a doble free on an error trying to decode mp3's

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1314 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-06-03 02:58:41 +00:00
parent 15c61f6eb0
commit c453f7dc52
2 changed files with 1 additions and 8 deletions

4
src/decode.c

@ -311,9 +311,7 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
ret = DECODE_ERROR_UNKTYPE; ret = DECODE_ERROR_UNKTYPE;
if(isRemoteUrl(pc->utf8url)) { if(isRemoteUrl(pc->utf8url)) {
if(inStream.mime) { plugin = getInputPluginFromMimeType(inStream.mime);
plugin = getInputPluginFromMimeType(inStream.mime);
}
if(plugin == NULL) { if(plugin == NULL) {
plugin = getInputPluginFromSuffix( plugin = getInputPluginFromSuffix(
getSuffix(dc->utf8url)); getSuffix(dc->utf8url));

5
src/playlist.c

@ -825,21 +825,16 @@ void playPlaylistIfPlayerStopped() {
if(error==PLAYER_ERROR_NOERROR) playlist_errorCount = 0; if(error==PLAYER_ERROR_NOERROR) playlist_errorCount = 0;
else playlist_errorCount++; else playlist_errorCount++;
printf("HERE 1\n");
if(playlist_state==PLAYLIST_STATE_PLAY && ( if(playlist_state==PLAYLIST_STATE_PLAY && (
(playlist_stopOnError && (playlist_stopOnError &&
error!=PLAYER_ERROR_NOERROR) || error!=PLAYER_ERROR_NOERROR) ||
error==PLAYER_ERROR_AUDIO || error==PLAYER_ERROR_AUDIO ||
error==PLAYER_ERROR_SYSTEM || error==PLAYER_ERROR_SYSTEM ||
playlist_errorCount>=playlist.length)) { playlist_errorCount>=playlist.length)) {
printf("HERE 1-1\n");
printf("playlist_stopOnError: %i\n", playlist_stopOnError);
stopPlaylist(stderr); stopPlaylist(stderr);
printf("HERE 1-2\n");
} }
else if(playlist_noGoToNext) currentSongInPlaylist(stderr); else if(playlist_noGoToNext) currentSongInPlaylist(stderr);
else nextSongInPlaylist(stderr); else nextSongInPlaylist(stderr);
printf("HERE 2\n");
} }
} }