diff options
| author | Kenneth Zhou <knthzh@gmail.com> | 2014-06-18 19:55:40 -0400 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-26 19:37:25 +0200 |
| commit | cb250d490c14872f03bb0320179e48d05fe2539d (patch) | |
| tree | dd27e22fcbb6e306175d041eb2b2c714b7079645 /stream | |
| parent | 8bb7d427e2180067f13f8dc5c5105029e9e00be7 (diff) | |
| download | mpv-cb250d490c14872f03bb0320179e48d05fe2539d.tar.bz2 mpv-cb250d490c14872f03bb0320179e48d05fe2539d.tar.xz | |
Basic xdg directory implementation
Search $XDG_CONFIG_HOME and $XDG_CONFIG_DIRS for config files.
This also negates the need to have separate user and global variants of
mp_find_config_file()
Closes #864, #109.
Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_dvb.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 1462d568e7..d6ebddb944 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -750,29 +750,24 @@ dvb_config_t *dvb_get_config(stream_t *stream) } void *talloc_ctx = talloc_new(NULL); - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf"); + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf"); switch(type) { case TUNER_TER: - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf.ter"); + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.ter"); break; case TUNER_CBL: - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf.cbl"); + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.cbl"); break; case TUNER_SAT: - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf.sat"); + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.sat"); break; case TUNER_ATSC: - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf.atsc"); + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.atsc"); break; } - if(conf_file && (access(conf_file, F_OK | R_OK) != 0)) { - conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf"); - - if(conf_file && (access(conf_file, F_OK | R_OK) != 0)) { - conf_file = mp_find_global_config_file(talloc_ctx, global, "channels.conf"); - } - } + if(conf_file && (access(conf_file, F_OK | R_OK) != 0)) + conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf"); list = dvb_get_channels(log, conf_file, type); talloc_free(talloc_ctx); |