aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-22 00:27:34 +0200
committerMax Kellermann <max@duempel.org>2011-09-22 00:27:34 +0200
commit7e219c362cf8bca80f60a79b77d95a228ff8ffcb (patch)
treed2c44d848c59f074bd1f78dc94732404326d711e /src/player_thread.c
parent203f48d1fd490fa136df36b96d75d279e3c17047 (diff)
parent525a791987c66ed2f8b1ca9e5357836f536fdb8b (diff)
downloadmpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.tar.gz
mpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.tar.xz
mpd-7e219c362cf8bca80f60a79b77d95a228ff8ffcb.zip
Merge branch 'v0.16.x'
Conflicts: src/player_thread.c
Diffstat (limited to 'src/player_thread.c')
-rw-r--r--src/player_thread.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index 58682f2ca..7696c22c0 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -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;
}