From fab9febdc3a863c157a56cc4de2418cbb9665844 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 9 Dec 2012 15:05:21 +0100 Subject: path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file. --- stream/stream_cddb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'stream/stream_cddb.c') diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 2fc4335b68..f0f8f67155 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -717,6 +717,7 @@ int cddb_resolve(const char *dev, char **xmcd_file) char cddb_cache_dir[] = DEFAULT_CACHE_DIR; char *home_dir = NULL; cddb_data_t cddb_data; + void *talloc_ctx = talloc_new(NULL); if (cdtoc_last_track <= 0) { cdtoc_last_track = read_toc(dev); @@ -747,7 +748,8 @@ int cddb_resolve(const char *dev, char **xmcd_file) home_dir = getenv("HOMEPATH"); // Last resort, store the cddb cache in the mplayer directory if (home_dir == NULL) - home_dir = (char *)get_path(""); + home_dir = (char *)talloc_steal(talloc_ctx, + mp_find_user_config_file("")); #endif if (home_dir == NULL) { cddb_data.cache_dir = NULL; @@ -756,10 +758,12 @@ int cddb_resolve(const char *dev, char **xmcd_file) cddb_data.cache_dir = malloc(len); if (cddb_data.cache_dir == NULL) { mp_tmsg(MSGT_DEMUX, MSGL_ERR, "Memory allocation failed.\n"); + talloc_free(talloc_ctx); return -1; } snprintf(cddb_data.cache_dir, len, "%s%s", home_dir, cddb_cache_dir); } + talloc_free(talloc_ctx); // Check for a cached file if (cddb_read_cache(&cddb_data) < 0) { -- cgit v1.2.3