[Mplayer-cvslog] CVS: main parser-mpcmd.c,1.11,1.12

pl CVS pl at mplayerhq.hu
Fri Aug 8 22:08:02 CEST 2003


Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv29584

Modified Files:
	parser-mpcmd.c 
Log Message:
fix the bug where only the last file of the command line is found


Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parser-mpcmd.c	3 Aug 2003 17:42:43 -0000	1.11
+++ parser-mpcmd.c	8 Aug 2003 20:07:38 -0000	1.12
@@ -49,13 +49,13 @@
     return 0;
 }
 
-static inline void add_entry(play_tree_t *last_parent,
-	play_tree_t *last_entry, play_tree_t *entry) {
-    if(last_entry == NULL)
-      play_tree_set_child(last_parent,entry);		      
+static inline void add_entry(play_tree_t **last_parentp,
+	play_tree_t **last_entryp, play_tree_t *entry) {
+    if(*last_entryp == NULL)
+      play_tree_set_child(*last_parentp,entry);		      
     else 
-      play_tree_append_entry(last_entry,entry);
-    last_entry = entry;
+      play_tree_append_entry(*last_entryp,entry);
+    *last_entryp = entry;
 }
 
 play_tree_t*
@@ -162,7 +162,7 @@
 	  tmp = is_entry_option(opt,(i+1<argc) ? argv[i + 1] : NULL,&entry);
 	  if(tmp > 0)  { // It's an entry
 	    if(entry) {
-	      add_entry(last_parent,last_entry,entry);
+	      add_entry(&last_parent,&last_entry,entry);
 	      if((last_parent->flags & PLAY_TREE_RND) && entry->child)
 		entry->flags |= PLAY_TREE_RND;
 	      UNSET_GLOBAL;
@@ -203,7 +203,7 @@
 	// Lock stdin if it will be used as input
 	if(strcasecmp(argv[i],"-") == 0)
 	  m_config_set_option(config,"use-stdin",NULL);
-	add_entry(last_parent,last_entry,entry);
+	add_entry(&last_parent,&last_entry,entry);
 	UNSET_GLOBAL; // We start entry specific options
 
       }



More information about the MPlayer-cvslog mailing list