diff options
author | wm4 <wm4@nowhere> | 2015-02-15 14:28:49 +0100 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-16 18:16:28 +0900 |
commit | 21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e (patch) | |
tree | e4bdb1ae8c196a5b916ccb277ad0784af2ca3069 /options/path.h | |
parent | 6dc2a23cda5d6b06918d2f6ddd6ba600d5ee79a2 (diff) | |
download | mpv-21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e.tar.bz2 mpv-21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e.tar.xz |
player: undeprecate 'config' files
Actually, it's pretty simple to look for multiple filenames at once,
since mp_find_all_config_files() is already a bit "special" anyway.
See #1569. Reverts most of commit db167cd4 (keeps osx-bundle.conf).
(cherry picked from commit a27aa68dd33c613218d261b14ef1cf763abc1c33)
Diffstat (limited to 'options/path.h')
-rw-r--r-- | options/path.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/path.h b/options/path.h index 6e64cd1d3c..44c3489396 100644 --- a/options/path.h +++ b/options/path.h @@ -33,7 +33,8 @@ char *mp_find_config_file(void *talloc_ctx, struct mpv_global *global, const char *filename); // Find all instances of the given config file. Paths are returned in order -// from lowest to highest priority. +// from lowest to highest priority. filename can contain multiple names +// separated with '|', with the first having highest priority. char **mp_find_all_config_files(void *talloc_ctx, struct mpv_global *global, const char *filename); |