diff options
author | wm4 <wm4@nowhere> | 2015-03-05 11:17:22 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-03-05 11:22:15 +0100 |
commit | 2e266391559c2aa867c24593325f07effba97c64 (patch) | |
tree | b92fa5c05190a538fd04b5a0ecc32168795847c5 /libmpv/client.h | |
parent | dcabceb6268d64a16c370504de265d0dcc657301 (diff) | |
download | mpv-2e266391559c2aa867c24593325f07effba97c64.tar.bz2 mpv-2e266391559c2aa867c24593325f07effba97c64.tar.xz |
player, client API: refactor cplayer init, reduce client API differences
Move the command line parsing and some other things to the common init
routine shared between command line player and client API. This means
they're using almost exactly the same code now.
The main intended side effect is that the client API will load mpv.conf;
though still only if config loading is enabled.
(The cplayer still avoids creating an extra thread, passes a command
line, and prints an exit status to the terminal. It also has some
different defaults.)
Diffstat (limited to 'libmpv/client.h')
-rw-r--r-- | libmpv/client.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpv/client.h b/libmpv/client.h index 0607f9a562..2ace0f54cf 100644 --- a/libmpv/client.h +++ b/libmpv/client.h @@ -195,7 +195,7 @@ extern "C" { * relational operators (<, >, <=, >=). */ #define MPV_MAKE_VERSION(major, minor) (((major) << 16) | (minor) | 0UL) -#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 14) +#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 15) /** * Return the MPV_CLIENT_API_VERSION the mpv source has been compiled with. @@ -360,8 +360,10 @@ const char *mpv_client_name(mpv_handle *ctx); * equivalent to setting the --no-terminal option. * (Technically, this also suppresses C signal handling.) * - No config files will be loaded. This is roughly equivalent to using - * --no-config (but actually the code path for loading config files is - * disabled). + * --no-config. Since libmpv 1.15, you can actually re-enable this option, + * which will make libmpv load config files during mpv_initialize(). If you + * do this, you are strongly encouraged to set the "config-dir" option too. + * (Otherwise it will load the mpv command line player's config.) * - Idle mode is enabled, which means the playback core will enter idle mode * if there are no more files to play on the internal playlist, instead of * exiting. This is equivalent to the --idle option. |