diff options
| author | wm4 <wm4@nowhere> | 2014-10-10 14:27:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-10-10 14:27:45 +0200 |
| commit | d4b2a96d90249dd435679a6f24af2248b1f8dd0b (patch) | |
| tree | f1d198d129b5e8ab2a29d55941da88813bcefd3b /player | |
| parent | 26bc6b48313dd0470a3998dace217148fc314271 (diff) | |
| download | mpv-d4b2a96d90249dd435679a6f24af2248b1f8dd0b.tar.bz2 mpv-d4b2a96d90249dd435679a6f24af2248b1f8dd0b.tar.xz | |
Revert "player: --save-position-on-quit should always work"
This reverts commit 45c8b97efbaff7a5031b008223eeed56f7b0607a.
Some else complained (github issue #1163).
The feature requested in #1148 will be implemented differently in
the following commit.
Diffstat (limited to 'player')
| -rw-r--r-- | player/core.h | 4 | ||||
| -rw-r--r-- | player/loadfile.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/player/core.h b/player/core.h index 31e2657e93..f16cca166d 100644 --- a/player/core.h +++ b/player/core.h @@ -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, diff --git a/player/loadfile.c b/player/loadfile.c index bcaebf14a4..ac1d765619 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -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) |