diff options
author | rr- <rr-@sakuya.pl> | 2017-05-30 17:07:59 +0200 |
---|---|---|
committer | Ricardo Constantino <wiiaboo@gmail.com> | 2017-05-31 13:10:34 +0100 |
commit | 1a25f8c9fb92debf8729a12325f065998b07e94a (patch) | |
tree | d6aa60e82cf01566bb0eadc60adbee46760ca500 /player/external_files.c | |
parent | 969c25d2f7be931374f061b351f33ebaa429ab2d (diff) | |
download | mpv-1a25f8c9fb92debf8729a12325f065998b07e94a.tar.bz2 mpv-1a25f8c9fb92debf8729a12325f065998b07e94a.tar.xz |
external_files: parse ~ in --{sub,audio}-paths
Diffstat (limited to 'player/external_files.c')
-rw-r--r-- | player/external_files.c | 10 |
1 files changed, 7 insertions, 3 deletions
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 |