diff options
| author |  wm4 <wm4@nowhere> | 2018-05-21 14:58:40 +0200 |
|---|---|---|
| committer |  Jan Ekström <jeebjp@gmail.com> | 2018-05-31 01:24:51 +0300 |
| commit | 935846fc40abdffe53366baf3a81cfb0e0fccd95 (patch) | |
| tree | 0e1b14d1d94e30bea0b90bcd2904ca1d52c0b31f | |
| parent | 45f8d767b93894d34094a6a9987cb0544141928c (diff) | |
player: remove deprecated vo/ao auto profiles
These were deprecated almost 2 years ago. Now they happen to be in the
way.
| -rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
| -rw-r--r-- | player/configfiles.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 7ef91c431e..625918bd8b 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -105,6 +105,8 @@ Interface changes internal counter that remembered the current position. - edition and disc title switching will now fully reload playback (may have consequences for scripts, client API, or when using file-local options) + - remove deprecated ao/vo auto profiles. Consider using scripts like + auto-profiles.lua instead. --- mpv 0.28.0 --- - rename --hwdec=mediacodec option to mediacodec-copy, to reflect conventions followed by other hardware video decoding APIs diff --git a/player/configfiles.c b/player/configfiles.c index 04e0ea4132..8a7e6d7111 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -140,27 +140,18 @@ static void mp_auto_load_profile(struct MPContext *mpctx, char *category, m_profile_t *p = m_config_get_profile0(mpctx->mconfig, t); if (p) { MP_INFO(mpctx, "Auto-loading profile '%s'\n", t); - if (strcmp(category, "ao") == 0 || strcmp(category, "vo") == 0) - MP_WARN(mpctx, "'%s' auto profiles are deprecated.\n", category); m_config_set_profile(mpctx->mconfig, t, FILE_LOCAL_FLAGS); } } void mp_load_auto_profiles(struct MPContext *mpctx) { - struct MPOpts *opts = mpctx->opts; - mp_auto_load_profile(mpctx, "protocol", mp_split_proto(bstr0(mpctx->filename), NULL)); mp_auto_load_profile(mpctx, "extension", bstr0(mp_splitext(mpctx->filename, NULL))); mp_load_per_file_config(mpctx); - - if (opts->vo->video_driver_list) - mp_auto_load_profile(mpctx, "vo", bstr0(opts->vo->video_driver_list[0].name)); - if (opts->audio_driver_list) - mp_auto_load_profile(mpctx, "ao", bstr0(opts->audio_driver_list[0].name)); } #define MP_WATCH_LATER_CONF "watch_later" |