[xine-cvs] CVS: xine-ui/src/xitk event.c,1.23,1.24 playlist.c,1.18,1.19

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv11566/src/xitk

Modified Files:
	event.c playlist.c 
Log Message:
make ui use num_mrls result instead of relying on a NULL terminated mrl/autoplay list

Index: event.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/event.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- event.c	2001/07/24 16:51:17	1.23
+++ event.c	2001/07/24 18:05:57	1.24
@@ -750,13 +750,13 @@
       if(gGui->autoplay_options & PLAY_FROM_DVD)
 
 	if(!strcasecmp(autoplay_plugins[i], "DVD")) {
-	  char **autoplay_mrls = xine_get_autoplay_mrls (gGui->xine, "DVD");
-	  int j = 0;
+	  int num_mrls;
+	  char **autoplay_mrls = xine_get_autoplay_mrls (gGui->xine, "DVD", &num_mrls);
+	  int j;
 	  
-	  while(autoplay_mrls[j]) {
+	  for (j=0; j<num_mrls; j++) 
 	    gGui->playlist[gGui->playlist_num + j] = autoplay_mrls[j];
-	    j++;
-	  }
+
 	  gGui->playlist_num += j;
 	  gGui->playlist_cur = 0;
 	  gui_set_current_mrl(gGui->playlist[gGui->playlist_cur]);
@@ -765,13 +765,13 @@
 
       if(gGui->autoplay_options & PLAY_FROM_VCD)
 	if(!strcasecmp(autoplay_plugins[i], "VCD")) {
-	  char **autoplay_mrls = xine_get_autoplay_mrls (gGui->xine, "VCD");
-	  int j = 0;
+	  int num_mrls;
+	  char **autoplay_mrls = xine_get_autoplay_mrls (gGui->xine, "VCD", &num_mrls);
+	  int j;
 	    
-	  while(autoplay_mrls[j]) {
+	  for (j=0; j<num_mrls; j++) 
 	    gGui->playlist[gGui->playlist_num + j] = autoplay_mrls[j];
-	    j++;
-	  }
+
 	  gGui->playlist_num += j;
 	  gGui->playlist_cur = 0;
 	  gui_set_current_mrl(gGui->playlist[gGui->playlist_cur]);

Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/playlist.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- playlist.c	2001/07/23 23:24:44	1.18
+++ playlist.c	2001/07/24 18:05:57	1.19
@@ -413,15 +413,15 @@
       while(autoplay_plugins[i] != NULL) {
 	
 	if(!strcasecmp(autoplay_plugins[i], labelbutton_get_label(w))) {
+	  int num_mrls;
 	  char **autoplay_mrls = 
-	    xine_get_autoplay_mrls (gGui->xine, autoplay_plugins[i]);
-	  int j = 0;
-	  
+	    xine_get_autoplay_mrls (gGui->xine, autoplay_plugins[i], &num_mrls);
+
 	  if(autoplay_mrls) {
-	    while(autoplay_mrls[j]) {
+	    int j;
+
+	    for (j=0; j<num_mrls; j++) 
 	      gGui->playlist[gGui->playlist_num + j] = autoplay_mrls[j];
-	      j++;
-	    }
 	    
 	    gGui->playlist_num += j;
 	    gGui->playlist_cur = 0;