path: root/stream
diff options
authorwm4 <wm4@nowhere>2013-12-21 20:45:19 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:17 +0100
commitad2199128da4a689be374e92aab57ac2c9fa76b9 (patch)
treee59647846141017a5ef1da3a3b0961b95cfbc5e6 /stream
parent232b8de095b0ad493f7aa83e900e861bcb11f52a (diff)
path lookup functions: mp_msg conversions
There's a single mp_msg() in path.c, but all path lookup functions seem to depend on it, so we get a rat-tail of stuff we have to change. This is probably a good thing though, because we can have the path lookup functions also access options, so we could allow overriding the default config path, or ignore the MPV_HOME environment variable, and such things. Also take the chance to consistently add talloc_ctx parameters to the path lookup functions. Also, this change causes a big mess on configfiles.c. It's the same issue: everything suddenly needs a (different) context argument. Make it less wild by providing a mp_load_auto_profiles() function, which isolates most of it to configfiles.c.
Diffstat (limited to 'stream')
1 files changed, 0 insertions, 3 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index aabe7170a9..fb247753d7 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -740,9 +740,6 @@ dvb_config_t *dvb_get_config(stream_t *stream)
-// rebase hack
-#define mp_find_user_config_file(a,b,c) mp_find_user_config_file(c)
-#define mp_find_global_config_file(a, b, c) mp_find_global_config_file(c)
void *talloc_ctx = talloc_new(NULL);
conf_file = mp_find_user_config_file(talloc_ctx, global, "channels.conf");
switch(type) {