[Toxine-cvs] CVS: toxine/src commands.c,1.73,1.74 xine_commands.c,1.46,1.47

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

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

Modified Files:
	commands.c xine_commands.c 
Log Message:
fix double xine_open() bug.

Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- commands.c	27 May 2004 21:23:42 -0000	1.73
+++ commands.c	30 May 2004 19:25:23 -0000	1.74
@@ -443,12 +443,16 @@
   __playmrloop:
     toxine_set_current_mrl_from_cur(tox);
     error_code_clear(tox);
+
+    pinfo("xine_open(%s):", tox->current_mrl);
     if(xine_open(tox->stream, tox->current_mrl)) {
       tox->xine_state |= XINE_OPEN;
       _xine_play(NULL, tox, (void *)NO_ARGS);
     }
     else
       error_code_set(tox, TOX_ERR_XINE_OPEN);
+    
+    pinfo(".\n");
   }
   else {
     if(tox->playlist.loop && tox->playlist.num) {
@@ -1281,6 +1285,7 @@
     return;
   }
   
+  pinfo("xine_open(%s):", tox->current_mrl);
   if(xine_open(tox->stream, tox->current_mrl)) {
     tox->xine_state |= XINE_OPEN;
     _xine_play(command, tox, (void *)NO_ARGS);
@@ -1288,6 +1293,7 @@
   else
     error_code_set(tox, TOX_ERR_XINE_OPEN);
 
+  pinfo(".\n");
 }
 
 /*

Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xine_commands.c	27 May 2004 00:27:39 -0000	1.46
+++ xine_commands.c	30 May 2004 19:25:23 -0000	1.47
@@ -610,6 +610,8 @@
 	  pthread_create(&tox->playlist.end_thread, &pth_attrs, toxine_end_thread,(void *)tox);
 	}
       }
+
+      need_open = 0;
     }
   }
   else {