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

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	src/player_thread.c
This commit is contained in:
Max Kellermann
2011-09-22 00:27:34 +02:00
parent 203f48d1fd 525a791987
commit 7e219c362c
7 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/player_thread.c
View File

@@ -894,16 +894,6 @@ static void do_play(struct player_control *pc, struct decoder_control *dc)
if (!player_check_decoder_startup(&player))
break;
/* seek to the beginning of the range */
const struct song *song = decoder_current_song(dc);
if (song != NULL && song->start_ms > 0 &&
/* we must not send a seek command until
the decoder is initialized
completely */
!player.decoder_starting &&
!dc_seek(dc, song->start_ms / 1000.0))
player_dc_stop(&player);
player_lock(pc);
continue;
}