From ad2199128da4a689be374e92aab57ac2c9fa76b9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:45:19 +0100 Subject: 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. --- player/core.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'player/core.h') diff --git a/player/core.h b/player/core.h index 4aafc53d5b..ad3d121aa7 100644 --- a/player/core.h +++ b/player/core.h @@ -348,17 +348,12 @@ void clear_audio_decode_buffers(struct MPContext *mpctx); // configfiles.c bool mp_parse_cfgfiles(struct MPContext *mpctx); -char *mp_get_playback_resume_config_filename(const char *fname, - struct MPOpts *opts); -void mp_load_per_protocol_config(struct m_config *conf, const char * const file); -void mp_load_per_extension_config(struct m_config *conf, const char * const file); -void mp_load_per_output_config(struct m_config *conf, char *cfg, char *out); -void mp_load_per_file_config(struct m_config *conf, const char * const file, - bool search_file_dir); -void mp_load_playback_resume(struct m_config *conf, const char *file); +void mp_load_auto_profiles(struct MPContext *mpctx); +void mp_load_per_file_config(struct MPContext *mpctx); +void mp_load_playback_resume(struct MPContext *mpctx, const char *file); void mp_write_watch_later_conf(struct MPContext *mpctx); -struct playlist_entry *mp_resume_playlist(struct playlist *playlist, - struct MPOpts *opts); +struct playlist_entry *mp_check_playlist_resume(struct MPContext *mpctx, + struct playlist *playlist); // dvdnav.c void mp_nav_init(struct MPContext *mpctx); -- cgit v1.2.3