player: remove deprecated vo/ao auto profiles

These were deprecated almost 2 years ago. Now they happen to be in the
way.
This commit is contained in:
wm4 2018-05-21 14:58:40 +02:00 committed by Jan Ekström
parent 45f8d767b9
commit 935846fc40
2 changed files with 2 additions and 9 deletions

View File

@ -105,6 +105,8 @@ Interface changes
internal counter that remembered the current position. internal counter that remembered the current position.
- edition and disc title switching will now fully reload playback (may have - edition and disc title switching will now fully reload playback (may have
consequences for scripts, client API, or when using file-local options) 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 --- --- mpv 0.28.0 ---
- rename --hwdec=mediacodec option to mediacodec-copy, to reflect - rename --hwdec=mediacodec option to mediacodec-copy, to reflect
conventions followed by other hardware video decoding APIs conventions followed by other hardware video decoding APIs

View File

@ -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); m_profile_t *p = m_config_get_profile0(mpctx->mconfig, t);
if (p) { if (p) {
MP_INFO(mpctx, "Auto-loading profile '%s'\n", t); 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); m_config_set_profile(mpctx->mconfig, t, FILE_LOCAL_FLAGS);
} }
} }
void mp_load_auto_profiles(struct MPContext *mpctx) void mp_load_auto_profiles(struct MPContext *mpctx)
{ {
struct MPOpts *opts = mpctx->opts;
mp_auto_load_profile(mpctx, "protocol", mp_auto_load_profile(mpctx, "protocol",
mp_split_proto(bstr0(mpctx->filename), NULL)); mp_split_proto(bstr0(mpctx->filename), NULL));
mp_auto_load_profile(mpctx, "extension", mp_auto_load_profile(mpctx, "extension",
bstr0(mp_splitext(mpctx->filename, NULL))); bstr0(mp_splitext(mpctx->filename, NULL)));
mp_load_per_file_config(mpctx); 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" #define MP_WATCH_LATER_CONF "watch_later"