From 1a25f8c9fb92debf8729a12325f065998b07e94a Mon Sep 17 00:00:00 2001 From: rr- Date: Tue, 30 May 2017 17:07:59 +0200 Subject: external_files: parse ~ in --{sub,audio}-paths --- player/external_files.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'player') diff --git a/player/external_files.c b/player/external_files.c index dc5883814a..131e526f10 100644 --- a/player/external_files.c +++ b/player/external_files.c @@ -261,9 +261,13 @@ static void load_paths(struct mpv_global *global, struct subfn **slist, char *cfg_path, int type) { for (int i = 0; paths && paths[i]; i++) { - char *path = mp_path_join_bstr(*slist, mp_dirname(fname), - bstr0(paths[i])); - append_dir_subtitles(global, slist, nsubs, bstr0(path), fname, 0, type); + char *expanded_path = mp_get_user_path(NULL, global, paths[i]); + char *path = mp_path_join_bstr( + *slist, mp_dirname(fname), + bstr0(expanded_path ? expanded_path : paths[i])); + append_dir_subtitles(global, slist, nsubs, bstr0(path), + fname, 0, type); + talloc_free(expanded_path); } // Load subtitles in ~/.mpv/sub (or similar) limiting sub fuzziness -- cgit v1.2.3