mirror of https://github.com/mpv-player/mpv
Seek to -ss position without first starting audio/video from the start.
Manual seeks no longer shift -endpos position (hopefully no one considered that a "feature"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22356 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e3b1929925
commit
5074d4728f
25
mplayer.c
25
mplayer.c
|
@ -3330,6 +3330,17 @@ if(play_n_frames==0){
|
||||||
mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
|
mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (seek_to_sec) {
|
||||||
|
seek(mpctx, seek_to_sec, 1);
|
||||||
|
end_at.pos += seek_to_sec;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (end_at.type == END_AT_SIZE) {
|
||||||
|
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
|
||||||
|
end_at.type = END_AT_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
while(!mpctx->eof){
|
while(!mpctx->eof){
|
||||||
float aq_sleep_time=0;
|
float aq_sleep_time=0;
|
||||||
if(!mpctx->sh_audio && mpctx->d_audio->sh) {
|
if(!mpctx->sh_audio && mpctx->d_audio->sh) {
|
||||||
|
@ -3506,20 +3517,6 @@ if(step_sec>0) {
|
||||||
}
|
}
|
||||||
mpctx->was_paused = 0;
|
mpctx->was_paused = 0;
|
||||||
|
|
||||||
if (seek_to_sec) {
|
|
||||||
rel_seek_secs += seek_to_sec;
|
|
||||||
seek_to_sec = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (end_at.type != END_AT_NONE) {
|
|
||||||
if(end_at.type == END_AT_SIZE) {
|
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
|
|
||||||
end_at.type = END_AT_NONE;
|
|
||||||
} else {
|
|
||||||
end_at.pos += rel_seek_secs;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Looping. */
|
/* Looping. */
|
||||||
if(mpctx->eof==1 && loop_times>=0) {
|
if(mpctx->eof==1 && loop_times>=0) {
|
||||||
int l = loop_times;
|
int l = loop_times;
|
||||||
|
|
Loading…
Reference in New Issue