[xine-cvs] CVS: xine-vcdnav/input xineplug_inp_vcd.c,1.67,1.68

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-vcdnav/input
In directory sc8-pr-cvs1:/tmp/cvs-serv23255

Modified Files:
	xineplug_inp_vcd.c 
Log Message:
vcdx_class_get_autoplay_list(): bug in retrieving anything but
entries. 

vcdx_update_title(): make sure to update comment as well as title.


Index: xineplug_inp_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_vcd.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xineplug_inp_vcd.c	7 Mar 2003 20:05:22 -0000	1.67
+++ xineplug_inp_vcd.c	11 Mar 2003 20:35:04 -0000	1.68
@@ -1132,11 +1132,19 @@
     
     int offset = vcdx_get_mrl_type_offset(&my_vcd, itemtype, &size);
 
+    /* This is because entries start at 0 while other playable units 
+       start at 1. Can remove the below when everything has the same
+       origin.
+     */
+    if (VCDINFO_ITEM_TYPE_ENTRY != itemtype) offset++;
+
     for (i=0; i<size; i++) {
       if (my_vcd.mrls[offset+i] != NULL) {
         filelist[i] = my_vcd.mrls[offset+i]->mrl;
+        dbg_print((INPUT_DBG_MRL), "filelist[%d]: %s\n", i, filelist[i]);
       } else {
         filelist[i] = NULL;
+        dbg_print((INPUT_DBG_MRL), "filelist[%d]: NULL\n", i);
       }
     }
     *num_files = i;
@@ -1239,6 +1247,9 @@
   if (my_vcd.stream == NULL) return;
 
   meta_info_assign(XINE_META_INFO_TITLE, my_vcd.stream, title_str);
+  meta_info_assign(XINE_META_INFO_COMMENT, my_vcd.stream,
+                   vcdplayer_format_str(&my_vcd.player, 
+                                        my_vcd.comment_format_str));
   stream_info_assign(XINE_STREAM_INFO_VIDEO_HAS_STILL, my_vcd.stream, 
                      my_vcd.player.in_still);
 
@@ -1550,7 +1561,7 @@
                           _("format string for display banner"),
 _("Format used in the GUI Title. Similar to the Unix date "
 "command. Format specifiers that start with a percent sign. Specifiers are "
-"%A, %C, %c, %F, %I, %L, %N, %P, %p, %S, %V, %v, and %%."),
+"%A, %C, %c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, and %%."),
                           0,
                           vcdx_title_format_str_changed_cb,
                           NULL));
@@ -1558,7 +1569,7 @@
   my_vcd.comment_format_str = 
     strdup(config->register_string(config,
                           "vcdx.comment_format",
-                          "%P",
+                          "%P - Track %T",
                           _("format string for stream comment field"),
 _("Format used in the GUI Title. Similar to the Unix date "
 "command. Format specifiers that start with a percent sign. Specifiers are "