[Toxine-cvs] CVS: toxine/src commands.c,1.54,1.55 loader.c,1.8,1.9 playlist.c,1.10,1.11 xine_commands.c,1.39,1.40

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

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5632/src

Modified Files:
	commands.c loader.c playlist.c xine_commands.c 
Log Message:
small fix

Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- commands.c	22 May 2003 20:50:34 -0000	1.54
+++ commands.c	15 Oct 2003 14:44:52 -0000	1.55
@@ -969,6 +969,15 @@
   if(sigaction(SIGALRM, &action, NULL) != 0)
     fprintf(stderr, "sigaction(SIGALRM) failed: %s\n", strerror(errno));
 
+  if(argc) {
+    int i;
+
+    tox->playlist.cur = 0;
+    
+    for(i = 0; i < argc; i++)
+      playlist_add_entry(tox, argv[i], argv[i], 0, -1);
+  }
+
   toxine_load_vo_plugins(tox);
 
   if(tox->autoinit) {
@@ -1324,7 +1333,14 @@
 
   if(tox->command.num_args)
     toxine_set_current_mrl(tox, (toxine_get_arg(tox, 1)));
-
+  else if(!tox->current_mrl)
+    toxine_set_current_mrl_from_cur(tox);
+  
+  if(!tox->current_mrl) {
+    perr("No mrl set.\n");
+    return;
+  }
+  
   if(xine_open(tox->stream, tox->current_mrl)) {
     tox->xine_state |= XINE_OPEN;
     _xine_play(command, tox, (void *)NO_ARGS);

Index: loader.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/loader.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loader.c	23 Jan 2003 18:19:34 -0000	1.8
+++ loader.c	15 Oct 2003 14:44:52 -0000	1.9
@@ -35,7 +35,7 @@
 
 extern int errno;
 
-/* #define LOCAL_BUILD 1 */
+#define LOCAL_BUILD 1
 #ifdef LOCAL_BUILD
 #undef TOXINE_PLUGINDIR
 #define TOXINE_PLUGINDIR "plugins/.libs"

Index: playlist.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/playlist.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- playlist.c	17 Jan 2003 23:39:56 -0000	1.10
+++ playlist.c	15 Oct 2003 14:44:52 -0000	1.11
@@ -580,6 +580,7 @@
 	    }
 	  }
 	__discard:
+	  ;
 	}
 	
 	fclose(playlist->fd);

Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xine_commands.c	22 May 2003 20:50:34 -0000	1.39
+++ xine_commands.c	15 Oct 2003 14:44:52 -0000	1.40
@@ -314,6 +314,10 @@
     perr("MRL '%s' is malformed\n", tox->current_mrl);
     break;
 
+  case XINE_ERROR_INPUT_FAILED:
+    perr("Input plugin failed to open '%s'\n", tox->current_mrl);
+    break;
+
   default:
     perr("!! Unhandled error !!\n");
     break;