[xine-cvs] CVS: xine-vcdnav/input vcdplayer.c,1.30,1.31 vcdplayer.h,1.27,1.28 xineplug_inp_vcd.c,1.38,1.39

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

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

Modified Files:
	vcdplayer.c vcdplayer.h xineplug_inp_vcd.c 
Log Message:
Respect default autotype in configuration as we are supposed to do.


Index: vcdplayer.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/vcdplayer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vcdplayer.c	30 Dec 2002 15:51:39 -0000	1.30
+++ vcdplayer.c	30 Dec 2002 18:46:37 -0000	1.31
@@ -285,7 +285,8 @@
  */
 bool
 vcdplayer_parse_mrl(char *default_vcd_device, char *mrl, 
-                  char **device_str_p, vcdinfo_itemid_t *itemid) 
+                    char **device_str_p, vcdinfo_itemid_t *itemid,
+                    vcdplayer_autoplay_t auto_type) 
 {
   char type_str[2];
   int count;
@@ -293,7 +294,7 @@
   unsigned int num = 0;
 
   type_str[0]='\0';
-  itemid->type = VCDINFO_ITEM_TYPE_ENTRY;
+  itemid->type = (vcdinfo_item_enum_t) auto_type;
 
   if ( NULL != mrl && !strncasecmp(mrl, MRL_PREFIX, MRL_PREFIX_LEN) )
     p = &mrl[MRL_PREFIX_LEN];
@@ -367,6 +368,9 @@
     itemid->type = VCDINFO_ITEM_TYPE_ENTRY;
     break;
   case '\0': 
+    /* None specified, use config value. */
+    itemid->type = (vcdinfo_item_enum_t) auto_type;
+    break;
   case 'P': 
     itemid->type = VCDINFO_ITEM_TYPE_LID;
     break;

Index: vcdplayer.h
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/vcdplayer.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vcdplayer.h	30 Dec 2002 06:57:21 -0000	1.27
+++ vcdplayer.h	30 Dec 2002 18:46:37 -0000	1.28
@@ -57,10 +57,10 @@
 } vcdplayer_slider_length_t;
 
 typedef enum {
-  VCDPLAYER_AUTOPLAY_TRACK,
-  VCDPLAYER_AUTOPLAY_ENTRY,
-  VCDPLAYER_AUTOPLAY_SEGMENT,
-  VCDPLAYER_AUTOPLAY_PBC, 
+  VCDPLAYER_AUTOPLAY_TRACK   = VCDINFO_ITEM_TYPE_TRACK,
+  VCDPLAYER_AUTOPLAY_ENTRY   = VCDINFO_ITEM_TYPE_ENTRY,
+  VCDPLAYER_AUTOPLAY_SEGMENT = VCDINFO_ITEM_TYPE_SEGMENT,
+  VCDPLAYER_AUTOPLAY_PBC     = VCDINFO_ITEM_TYPE_LID, 
 } vcdplayer_autoplay_t;
 
 typedef struct {
@@ -202,7 +202,8 @@
  */
 bool
 vcdplayer_parse_mrl(char *default_vcd_device, char *mrl, 
-                 char **device_str_p, vcdinfo_itemid_t *itemid);
+                    char **device_str_p, vcdinfo_itemid_t *itemid, 
+                    vcdplayer_autoplay_t auto_type);
 
 bool
 vcdplayer_build_mrl_list(vcdplayer_input_t *this, char *vcd_device);

Index: xineplug_inp_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_vcd.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xineplug_inp_vcd.c	30 Dec 2002 06:57:21 -0000	1.38
+++ xineplug_inp_vcd.c	30 Dec 2002 18:46:38 -0000	1.39
@@ -377,7 +377,8 @@
     char *mrl = strdup(filename);
     dbg_print(INPUT_DBG_CALL, "Called with %s\n", filename);
     if (!vcdplayer_parse_mrl(my_vcdx.v.default_vcd_device, mrl, 
-                             &intended_vcd_device, &itemid)) { 
+                             &intended_vcd_device, &itemid, 
+                             my_vcdx.v.default_autoplay)) { 
       *num_files = 0; 
       free (mrl);
       return NULL; 
@@ -808,7 +809,8 @@
   dbg_print(INPUT_DBG_CALL, "Called with %s\n", test_mrl);
  
   if (!vcdplayer_parse_mrl(my_vcdx.v.default_vcd_device, test_mrl, 
-                           &intended_vcd_device, &itemid))
+                           &intended_vcd_device, &itemid,
+                           my_vcdx.v.default_autoplay))
     return NULL;
 
   free(my_vcdx.v.mrl);