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

player_thread: pause when output fails while seeking

Browse Source 
When no audio outputs could be opened while seeking, leave MPD seeked
at that position and pause playback.  The user may continue from this
point at any time, as soon as the audio outputs are fixed.  The old
behaviour triggered an assertion failure: the failure wasn't passed
properly to the do_play() function, which attempted to play audio
chunks.
This commit is contained in:
Max Kellermann 2009-04-25 11:36:45 +02:00
parent 5ce625ea97
commit 70faf59275
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/player_thread.c
View File

@ -197,6 +197,11 @@ player_check_decoder_startup(struct player *player)
all chunks yet - wait for that */
return true;
pc.total_time = dc.total_time;
pc.audio_format = dc.in_audio_format;
player->play_audio_format = dc.out_audio_format;
player->size_to_time =
audioFormatSizeToTime(&dc.out_audio_format);
player->decoder_starting = false;
if (!player->paused &&
@ -210,14 +215,13 @@ player_check_decoder_startup(struct player *player)
assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_AUDIO;
return false;
}
pc.total_time = dc.total_time;
pc.audio_format = dc.in_audio_format;
player->play_audio_format = dc.out_audio_format;
player->size_to_time =
audioFormatSizeToTime(&dc.out_audio_format);
/* pause: the user may resume playback as soon
as an audio output becomes available */
pc.state = PLAYER_STATE_PAUSE;
player->paused = true;
return true;
}
return true;
} else {