[Toxine-cvs] CVS: toxine/src main.c,1.25,1.26 xine_commands.c,1.42,1.43

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17686

Modified Files:
	main.c xine_commands.c 
Log Message:
xine_new isn't called implicitly at startup

Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- main.c	8 Apr 2004 15:35:36 -0000	1.25
+++ main.c	8 Apr 2004 16:28:03 -0000	1.26
@@ -279,11 +279,6 @@
 
   }
   
-  tox->xine                = xine_new();
-  tox->xine_state          |= XINE_NEW;
-
-  toxine_config_load(tox);
-
   tox->running             = 1;
   tox->playlist.mmk        = NULL;
   tox->playlist.thread_num = 0;;

Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xine_commands.c	7 Apr 2004 18:21:07 -0000	1.42
+++ xine_commands.c	8 Apr 2004 16:28:03 -0000	1.43
@@ -446,9 +446,7 @@
   tox->xine_state |= XINE_NEW;
   //  toxine_set_last_int_result(tox, (int)tox->xine);
 
-  pinfo("xine_config_load():\n");
-  xine_config_load(tox->xine, tox->configfile);
-  pinfo(".\n");
+  _xine_config_load(NULL, tox, NULL);
 }
 
 void _xine_stream_new(commands_t *command, toxine_t *tox, void *data) {