[xine-cvs] CVS: xine-vcdnav/input vcdio.c,1.19,1.20 vcdplayer.h,1.26,1.27 xineplug_inp_vcd.c,1.37,1.38

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

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

Modified Files:
	vcdio.c vcdplayer.h xineplug_inp_vcd.c 
Log Message:
Minor changes to assist in reading .bin files. 
xineplug_inp_vcd.c: Some wording changed (don't assume CDROM device)
vcdio.c: new "auto" open used rather than DEVICE
vcdplayer.h: xvcd:/// -> vcdx:///



Index: vcdio.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/vcdio.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vcdio.c	28 Dec 2002 13:40:59 -0000	1.19
+++ vcdio.c	30 Dec 2002 06:57:21 -0000	1.20
@@ -99,7 +99,7 @@
     }
   }
 
-  if (!vcdinfo_open(obj, intended_vcd_device, VCDINFO_SOURCE_DEVICE)) {
+  if (!vcdinfo_open(obj, intended_vcd_device, VCDINFO_SOURCE_AUTO)) {
     return false;
   }
 

Index: vcdplayer.h
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/vcdplayer.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vcdplayer.h	28 Dec 2002 13:41:00 -0000	1.26
+++ vcdplayer.h	30 Dec 2002 06:57:21 -0000	1.27
@@ -187,17 +187,17 @@
  * vcdplayer://[vcd_path][:[EPTS]number]
  *
  * Examples
- *   xvcd://                    - Play (navigate) default device: /dev/cdrom
- *   xvcd://:                   - same as above
- *   xvcd:///dev/cdrom          - probably same as above
- *   xvcd:///dev/cdrom2         - Play (navigate) /dev/cdrom2
- *   xvcd:///dev/cdrom2:        - same as above
- *   xvcd:///dev/cdrom2:T1      - Play Track 1 from /dev/cdrom2
- *   xvcd:///dev/cdrom:S1       - Play selection id 1 from /dev/cdrom
- *   xvcd://:P1                 - probably same as above
- *   xvcd:///dev/cdrom:E1       - Play Entry id 1 from default device
- *   xvcd://:P1                 - probably same as above.
- *   xvcd://:S1                 - Play segment 1 from default device
+ *   vcdx://                    - Play (navigate) default device: /dev/cdrom
+ *   vcdx://:                   - same as above
+ *   vcdx:///dev/cdrom          - probably same as above
+ *   vcdx:///dev/cdrom2         - Play (navigate) /dev/cdrom2
+ *   vcdx:///dev/cdrom2:        - same as above
+ *   vcdx:///dev/cdrom2:T1      - Play Track 1 from /dev/cdrom2
+ *   vcdx:///dev/cdrom:S1       - Play selection id 1 from /dev/cdrom
+ *   vcdx://:P1                 - probably same as above
+ *   vcdx:///dev/cdrom:E1       - Play Entry id 1 from default device
+ *   vcdx://:P1                 - probably same as above.
+ *   vcdx://:S1                 - Play segment 1 from default device
  *
  */
 bool

Index: xineplug_inp_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_vcd.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xineplug_inp_vcd.c	28 Dec 2002 13:41:00 -0000	1.37
+++ xineplug_inp_vcd.c	30 Dec 2002 06:57:21 -0000	1.38
@@ -831,7 +831,7 @@
   vcdplayer_play(&my_vcdx.v, itemid);
   
 
-  dbg_print(INPUT_DBG, "CDROM device successfully opened for %s.\n", 
+  dbg_print(INPUT_DBG, "Successfully opened MRL %s.\n", 
             my_vcdx.v.mrl);
 
   return &(my_vcdx.input_plugin);