diff options
author | wm4 <wm4@nowhere> | 2013-04-25 20:38:22 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-04-25 20:52:20 +0200 |
commit | 3765cfcf57e0232b5e96e77d9dd628755f1c0518 (patch) | |
tree | 8644ca978ddbc535dffc1202b03d5e3ac3fc8deb /core/mp_core.h | |
parent | e1fccfdcd8a9efb2e3ce70cc4b7aba3e0eb91836 (diff) | |
download | mpv-3765cfcf57e0232b5e96e77d9dd628755f1c0518.tar.bz2 mpv-3765cfcf57e0232b5e96e77d9dd628755f1c0518.tar.xz |
core: simplify handling of --pause
Rename the struct MPOpts "start_pause" field to "pause". Store the user-
pause state in that field, so that both runtime pause toggling and the
--pause switch change the same variable. Simplify the initialization of
pause so that using --pause and changing the file while paused is
exactly the same case (changing the file while paused doesn't unpause,
this has been always this way).
Also make it a bit more consistent. Before, starting with --pause would
reset the pause state for every file, instead of following the usual
semantics for option switches (compare with behavior of --fs).
Diffstat (limited to 'core/mp_core.h')
-rw-r--r-- | core/mp_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/mp_core.h b/core/mp_core.h index 9b08492d77..9588a77b24 100644 --- a/core/mp_core.h +++ b/core/mp_core.h @@ -265,14 +265,14 @@ typedef struct MPContext { int last_dvb_step; int dvbin_reopen; - int paused; + bool paused; // step this many frames, then pause int step_frames; // Counted down each frame, stop playback if 0 is reached. (-1 = disable) int max_frames; bool playing_msg_shown; - bool paused_for_cache, paused_user; + bool paused_for_cache; // Set after showing warning about decoding being too slow for realtime // playback rate. Used to avoid showing it multiple times. |