[MPlayer-cvslog] CVS: main mplayer.c,1.859,1.860

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv31559

Modified Files:
	mplayer.c 
Log Message:
loadfile/loadlist can now also add files to the playlist


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- mplayer.c	5 Aug 2005 19:57:44 -0000	1.859
+++ mplayer.c	15 Aug 2005 08:30:42 -0000	1.860
@@ -2998,6 +2998,9 @@
       play_tree_t* e = play_tree_new();
       play_tree_add_file(e,cmd->args[0].v.s);
 
+      if (cmd->args[1].v.i) // append
+        play_tree_append_entry(playtree, e);
+      else {
       // Go back to the start point
       while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
 	/* NOP */;
@@ -3005,6 +3008,7 @@
       play_tree_set_child(playtree,e);
       play_tree_iter_step(playtree_iter,0,0);
       eof = PT_NEXT_SRC;
+      }
       brk_cmd = 1;
     } break;
     case MP_CMD_LOADLIST : {
@@ -3012,6 +3016,9 @@
       if(!e)
 	mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_PlaylistLoadUnable,cmd->args[0].v.s);
       else {
+	if (cmd->args[1].v.i) // append
+	  play_tree_append_entry(playtree, e);
+	else {
 	// Go back to the start point
 	while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
 	  /* NOP */;
@@ -3019,6 +3026,7 @@
 	play_tree_set_child(playtree,e);
 	play_tree_iter_step(playtree_iter,0,0);
 	eof = PT_NEXT_SRC;	
+	}
       }
       brk_cmd = 1;
     } break;