Changed a few remaining -dvd and -vcd options to dvd:// and vcd://.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10185 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 23 insertions, 23 deletions

diff --git a/DOCS/xml/en/cd-dvd.xml b/DOCS/xml/en/cd-dvd.xml
index d06a5a7ced..d98b216bcb 100644
--- a/DOCS/xml/en/cd-dvd.xml
+++ b/DOCS/xml/en/cd-dvd.xml
@@ -74,12 +74,12 @@ Tell us!) There is a tool that works for
 <para>
 For the complete list of available options, please read the man page.
 The Syntax for a standard Digital Versatile Disc (DVD) is as follows:
-<screen>mplayer -dvd <replaceable>&lt;track&gt;</replaceable> [-dvd-device <replaceable>&lt;device&gt;</replaceable>]</screen>
+<screen>mplayer dvd://<replaceable>&lt;track&gt;</replaceable> [-dvd-device <replaceable>&lt;device&gt;</replaceable>]</screen>
 </para>
 
 <para>
 Example:
-<screen>mplayer -dvd 1 -dvd-device /dev/hdc</screen>
+<screen>mplayer dvd://1 -dvd-device /dev/hdc</screen>
 </para>
 
 <para>
@@ -282,9 +282,9 @@ to set the region code of your DVD drive (under Linux).
 <para>
 For the complete list of available options, please read the man page. The Syntax for a
 standard Video CD (VCD) is as follows:
-<screen>mplayer -vcd <replaceable>&lt;track&gt;</replaceable> -cdrom-device <replaceable>&lt;device&gt;</replaceable></screen>
+<screen>mplayer vcd://<replaceable>&lt;track&gt;</replaceable> -cdrom-device <replaceable>&lt;device&gt;</replaceable></screen>
 Example:
-<screen>mplayer -vcd 2 -cdrom-device /dev/hdc</screen>
+<screen>mplayer vcd://2 -cdrom-device /dev/hdc</screen>
 The default VCD device is <filename>/dev/cdrom</filename>. If your setup
 differs, make a symlink or specify the correct device on the command line
 with the <option>-cdrom-device</option> option.
@@ -321,7 +321,7 @@ The second and other tracks are raw 2324 bytes/sector MPEG (movie)
 tracks, containing one MPEG PS data packet per sector instead of a
 filesystem. Similar to audio CD tracks, these tracks <emphasis role="bold">cannot
 be mounted</emphasis> (Did you ever mount an audio CD to play it?).
-As most movies are inside this track, you should try <option>-vcd 2</option> first.
+As most movies are inside this track, you should try <option>vcd://2</option> first.
 </para></listitem>
 
 <listitem><para>
@@ -343,8 +343,8 @@ be found in the Linux version of PowerDVD. It has a modified iso9660 filesystem
 (<filename>vcdfs/isofs-2.4.X.o</filename>) driver, which is able to emulate the
 raw tracks through this shadow .DAT file. If you mount the disc using their
 driver, you can copy and even play .DAT files with <application>MPlayer</application>. But it will not
-work with the standard iso9660 driver of the Linux kernel! Use the
-<option>-vcd</option> option instead. Alternatives for VCD copying are the
+work with the standard iso9660 driver of the Linux kernel! Use
+<option>vcd://</option> instead. Alternatives for VCD copying are the
 new <ulink url="http://www.elis.rug.ac.be/~ronsse/cdfs/">cdfs</ulink> kernel
 driver (not part of the official kernel) that shows CD sessions as image files and
 <ulink url="http://cdrdao.sourceforge.net/">cdrdao</ulink>, a bit-by-bit
diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml
index 16daa19f7c..40109f32b1 100644
--- a/DOCS/xml/en/formats.xml
+++ b/DOCS/xml/en/formats.xml
@@ -48,8 +48,8 @@ MPEG files come in different guises:
   DAT: This is the very same format as MPG with a different extension. It
   is used on <emphasis role="bold">Video CDs</emphasis>. Due to the way VCDs
   are created and Linux is designed, the DAT files cannot be played nor copied
-  from VCDs as regular files. You have to use the <option>-vcd</option> option
-  to play the Video CD.
+  from VCDs as regular files. You have to use <option>vcd://</option>
+  to play a Video CD.
   </simpara></listitem>
 <listitem><simpara>
   VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index b02fadb819..09ddbdfc70 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -37,8 +37,8 @@ Just two commands are needed:
 remove this file, which can come from a previous 3-pass encoding (it interferes
 with current one)
 <screen>
-mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi
-mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi
+mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi
+mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi
 </screen>
 </para>
 
@@ -97,9 +97,9 @@ inserted into the destination file...and it's all ready!
 remove this file, which can come from a previous 3-pass encoding
 (it interferes with current one)
 <screen>
-mencoder -dvd 2 -ovc frameno -o frameno.avi -oac mp3lame -lameopts vbr=3
-mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi
-mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi
+mencoder dvd://2 -ovc frameno -o frameno.avi -oac mp3lame -lameopts vbr=3
+mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi
+mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi
 </screen>
 </para>
 </example>
@@ -286,7 +286,7 @@ The first column contains the codec names that should be passed after the
 <informalexample>
 <para>
 An example, with MJPEG compression:
-<screen>mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -oac copy</screen>
+<screen>mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -oac copy</screen>
 </para>
 </informalexample>
 </sect1>
@@ -428,9 +428,9 @@ before starting.
 <title>Copying two subtitles from a DVD while doing 3-pass encoding</title>
 <screen>
 rm subtitles.idx subtitles.sub
-mencoder -dvd 1 -vobsubout subtitles -vobsuboutindex 0 -sid 2 -o frameno.avi -ovc frameno
-mencoder -dvd 1 -oac copy -ovc divx4 -pass 1
-mencoder -dvd 1 -oac copy -ovc divx4 -pass 2 -vobsubout subtitles -vobsuboutindex 1 -sid 5<!--
+mencoder dvd://1 -vobsubout subtitles -vobsuboutindex 0 -sid 2 -o frameno.avi -ovc frameno
+mencoder dvd://1 -oac copy -ovc divx4 -pass 1
+mencoder dvd://1 -oac copy -ovc divx4 -pass 2 -vobsubout subtitles -vobsuboutindex 1 -sid 5<!--
 --></screen>
 </example>
 
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index 593797f2a4..0ce34cf1b3 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -298,7 +298,7 @@ VCDs. It works like this (adjust for the drive letter of your CD-ROM):
 <para>
 DVDs also work, just set the DVD device correctly to whatever your CD-ROM
 device is:
-<screen>mplayer -dvd &lt;title&gt; -dvd-device '\\.\d:'</screen>
+<screen>mplayer dvd://&lt;title&gt; -dvd-device '\\.\d:'</screen>
 </para>
 
 <para>
diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml
index 8ce81c915a..3c339eef4c 100644
--- a/DOCS/xml/en/usage.xml
+++ b/DOCS/xml/en/usage.xml
@@ -51,7 +51,7 @@ Playing more files:
 Playing VCD:
 <synopsis>
 <command>mplayer</command> [<replaceable>options</replaceable>]<!--
---> -vcd <replaceable>trackno</replaceable><!--
+--> vcd://<replaceable>trackno</replaceable><!--
 --> [-cdrom-device <replaceable>/dev/cdrom</replaceable>]
 </synopsis>
 </para>
@@ -60,7 +60,7 @@ Playing VCD:
 Playing DVD:
 <synopsis>
 <command>mplayer</command> [<replaceable>options</replaceable>]<!--
---> -dvd <replaceable>titleno</replaceable><!--
+--> dvd://<replaceable>titleno</replaceable><!--
 --> [-dvd-device <replaceable>/dev/dvd</replaceable>]
 </synopsis>
 </para>
@@ -94,9 +94,9 @@ or
 Examples:
 <screen>
 mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
-mplayer -vcd 2
+mplayer vcd://2 -cd-rom-device /dev/hdc
 mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
-mplayer -dvd 1 -dvd-device /dev/hdc
+mplayer dvd://1 -dvd-device /dev/hdc
 mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi<!--
 --></screen>
 </para>