summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-06 20:12:12 +0200
committerwm4 <wm4@nowhere>2014-08-06 20:30:47 +0200
commit796db6617430294c3aefdf978010a074d5f912e7 (patch)
tree7bd3175a28dbb378b6ea41281e65a1c5b1f6d177
parent19fd67096bda04469124bd3d40bf437d92175462 (diff)
downloadmpv-796db6617430294c3aefdf978010a074d5f912e7.tar.bz2
mpv-796db6617430294c3aefdf978010a074d5f912e7.tar.xz
stream_dvb: fix channels.conf preference order
channels.conf was never used (even though its config path was resolved). Also remove the non-sense with the access() call. Fixes #987 (untested).
-rw-r--r--stream/stream_dvb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 87b2495a51..8695782b7d 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -750,7 +750,6 @@ dvb_config_t *dvb_get_config(stream_t *stream)
}
void *talloc_ctx = talloc_new(NULL);
- conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf");
switch(type) {
case TUNER_TER:
conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.ter");
@@ -765,9 +764,11 @@ dvb_config_t *dvb_get_config(stream_t *stream)
conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf.atsc");
break;
}
-
- if(conf_file && (access(conf_file, F_OK | R_OK) != 0))
+ if (conf_file) {
+ mp_verbose(log, "Ignoring other channels.conf files.\n");
+ } else {
conf_file = mp_find_config_file(talloc_ctx, global, "channels.conf");
+ }
list = dvb_get_channels(log, conf_file, type);
talloc_free(talloc_ctx);