Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic xdg directory implementation

Browse Source 
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>
This commit is contained in:
Kenneth Zhou
2014-06-18 19:55:40 -04:00
committed by wm4
parent 8bb7d427e2
commit cb250d490c
11 changed files with 214 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
stream/stream_dvb.c
View File

@@ -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);