diff options
Diffstat (limited to 'xine_frontend.c')
| -rw-r--r-- | xine_frontend.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xine_frontend.c b/xine_frontend.c index 482d4566..acdd0d7f 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.92 2008-12-18 14:12:43 phintuka Exp $ + * $Id: xine_frontend.c,v 1.93 2008-12-19 16:01:55 rofafor Exp $ * */ @@ -530,7 +530,8 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver, const char *audio_port, const char *video_driver, int pes_buffers, - const char *static_post_plugins) + const char *static_post_plugins, + const char *config_file) { fe_t *this = (fe_t*)this_gen; post_plugins_t *posts = NULL; @@ -569,7 +570,9 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver, free(this->configfile); this->configfile = NULL; - if(asprintf(&this->configfile, "%s%s", xine_get_homedir(), + if (config_file) + this->configfile = strdup(config_file); + else if(asprintf(&this->configfile, "%s%s", xine_get_homedir(), "/.xine/config_xineliboutput") < 0) return 0; |