RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "player: --save-position-on-quit should always work" 

This reverts commit 45c8b97efb.

Some else complained (github issue #1163).

The feature requested in #1148 will be implemented differently in
the following commit.
This commit is contained in:
wm4 2014-10-10 14:27:45 +02:00
parent 26bc6b4831
commit d4b2a96d90
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DOCS/man/options.rst
View File

@ -290,9 +290,10 @@ Program Behavior
``--save-position-on-quit``
Always save the current playback position on quit. When this file is
played again later, the player will seek to the old playback position on
start. This happens when playback is stopped in any way by the user.
For example, going to the next file in the playlist will save the position,
and resume playback at thr same position the next time the file is played.
start. This does not happen if playback of a file is stopped in any other
way than quitting. For example, going to the next file in the playlist
will not save the position, and start playback at beginning the next time
the file is played.
This behavior is disabled by default, but is always available when quitting
the player with Shift+Q.

4
player/core.h
View File

@ -41,10 +41,6 @@ enum stop_play_reason {
PT_QUIT, // stop playback, quit player
};
// stop_play_reason that is an explicit user abort.
#define PT_IS_QUIT(x) ((x) == PT_NEXT_ENTRY || (x) == PT_CURRENT_ENTRY || \
(x) == PT_STOP || (x) == PT_QUIT)
enum exit_reason {
EXIT_NONE,
EXIT_QUIT,

2
player/loadfile.c
View File

@ -1194,7 +1194,7 @@ terminate_playback:
if (mpctx->stop_play != AT_END_OF_FILE)
clear_audio_output_buffers(mpctx);
if (opts->position_save_on_quit && PT_IS_QUIT(mpctx->stop_play))
if (opts->position_save_on_quit && mpctx->stop_play == PT_QUIT)
mp_write_watch_later_conf(mpctx);
if (mpctx->step_frames)