[xine-cvs] CVS: xine-ui/src/dfb main.c,1.16,1.17

[Diego P. <dg...@us...>]

Update of /cvsroot/xine/xine-ui/src/dfb
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24153/src/dfb

Modified Files:
	main.c 
Log Message:
Also use a global __xineui_global_config_file symbol instead of the configfile attribute in the various frontends' structures.

Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/dfb/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- main.c	12 Mar 2008 11:43:43 -0000	1.16
+++ main.c	12 Mar 2008 11:52:48 -0000	1.17
@@ -210,7 +210,6 @@
 }
 
 int main(int argc, char *argv[]) {
-  char                 *configfile;
   char                 *driver_name;
   dfb_visual_info_t     visual_info;
   IDirectFBEventBuffer *input_buf;
@@ -251,10 +250,10 @@
    */
   {
     char *cfgfile = ".xine/config";
-    if (!(configfile = getenv("XINERC"))) {
-      configfile = (char *) xine_xmalloc((strlen((xine_get_homedir())) +
+    if (!(__xineui_global_config_file = getenv("XINERC"))) {
+      __xineui_global_config_file = (char *) xine_xmalloc((strlen((xine_get_homedir())) +
 					  strlen(cfgfile))+2);
-      sprintf(configfile, "%s/%s", (xine_get_homedir()), cfgfile);
+      sprintf(__xineui_global_config_file, "%s/%s", (xine_get_homedir()), cfgfile);
     }
   }
 
@@ -264,7 +263,7 @@
   }
   
   __xineui_global_xine_instance = (xine_t *) xine_new();
-  xine_config_load (dfb.xine, configfile);
+  xine_config_load (dfb.xine, __xineui_global_config_file);
   
   xine_init (__xineui_global_xine_instance,  dfbxine.ao_driver, dfbxine.vo_driver);
   
@@ -428,7 +427,7 @@
 failure:
     
   if(__xineui_global_xine_instance) 
-    xine_config_save(__xineui_global_xine_instance, configfile);
+    xine_config_save(__xineui_global_xine_instance, __xineui_global_config_file);
  
   if(__xineui_global_xine_instance)
    xine_exit(__xineui_global_xine_instance);