[MPlayer-cvslog] CVS: main mplayer.c,1.923,1.924

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

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

Modified Files:
	mplayer.c 
Log Message:
Fix stepping in the playtree when interupting libmpdemux.
Thanks to Jonas Jermann for the report.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- mplayer.c	24 Mar 2006 20:42:23 -0000	1.923
+++ mplayer.c	27 Mar 2006 18:33:23 -0000	1.924
@@ -131,6 +131,7 @@
 
 play_tree_t* playtree;
 play_tree_iter_t* playtree_iter = NULL;
+static int play_tree_step = 1;
 
 #define PT_NEXT_ENTRY 1
 #define PT_PREV_ENTRY -1
@@ -716,6 +717,7 @@
 	 exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
        case MP_CMD_PLAY_TREE_STEP: {
 	 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
+	 play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i;
        } break;
        case MP_CMD_PLAY_TREE_UP_STEP: {
 	 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV;
@@ -769,8 +771,6 @@
   return PT_NEXT_SRC;
 }
 
-static int play_tree_step = 1;
-
 int sub_source(void)
 {
     int source = -1;