Merge svn changes up to r28712

author: Uoti Urpala <uau@glyph.nonexistent.invalid> 2009-02-23 21:00:52 +0200
committer: Uoti Urpala <uau@glyph.nonexistent.invalid> 2009-02-23 21:00:52 +0200
commit: 66f6f9f0768de5b003fc1b0fa9b1ea428466308a (patch)
tree: 157b98be78b0cd1e99b3dd51979bc97792d11642 /DOCS
parent: ebb541c6553af10203b2c2f5bcead6118a44f5be (diff)
parent: 30aa2383cadb2f879e02dca9df293c01119a3111 (diff)
download: mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.bz2
mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.xz
6 files changed, 44 insertions, 12 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 927678e3d9..81ebd0cbec 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -5484,6 +5484,13 @@ Changing playback speed, would change pitch, leaving audio tempo at 1.2x.
 .RE
 .PD 1
 .
+.TP
+.B "stats\ \ "
+Collects and prints statistics about the audio stream, especially the volume.
+These statistics are especially intended to help adjusting the volume while
+avoiding clipping.
+The volumes are printed in dB and compatible with the volume audio filter.
+.
 .
 .
 .SH "VIDEO FILTERS"
diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1
index 19c7cb468d..28efcf0fb4 100644
--- a/DOCS/man/ru/mplayer.1
+++ b/DOCS/man/ru/mplayer.1
@@ -2,7 +2,7 @@
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .\" Translated by Vladimir Voroshilov <voroshil@gmail.com>
 .\" Encoding: koi8-r
-.\" synced with r28670
+.\" synced with r28704
 .
 .\" --------------------------------------------------------------------------
 .\" Определения макросов
@@ -5554,6 +5554,15 @@ scale и к эху при его низких значениях.
 .RE
 .PD 1
 .
+.TP
+.B "stats\ \ "
+Собирает и отображает статистику об аудио потоке, в особенности о
+громкости. 
+Эта статистика специально предназначена для облегчения подстройки
+звука без его срезания.
+Отображение громкости осуществляется в дБ и совместимо с аудио
+фильтром volume.
+.
 .
 .
 .SH "ВИДЕО ФИЛЬТРЫ"
diff --git a/DOCS/xml/en/cd-dvd.xml b/DOCS/xml/en/cd-dvd.xml
index fafc76410d..535f62fe08 100644
--- a/DOCS/xml/en/cd-dvd.xml
+++ b/DOCS/xml/en/cd-dvd.xml
@@ -53,7 +53,7 @@ If you set it to too high, the drive will continuously spin up and down, and
 will dramatically decrease the performance.
 It is recommended that you also tune your CD-ROM drive
 with <command>hdparm</command>:
-<screen>hdparm -d1 -a8 -u1 <replaceable>[cdrom device]</replaceable></screen>
+<screen>hdparm -d1 -a256 -u1 <replaceable>[cdrom device]</replaceable></screen>
 </para>
 
 <para>
@@ -68,8 +68,16 @@ for fine-tuning your CD-ROM.
 </para>
 
 <para>
-SCSI drives do not have a uniform way of setting these parameters (Do you know
-one? Tell us!) There is a tool that works for
+You may tweak the speed of SCSI CD-ROM drives with
+<command>sdparm</command>, you need version 1.03 or higher:
+<screen>sdparm --command=speed=<replaceable>[speed in kB/s]</replaceable> <replaceable>[cdrom device]</replaceable></screen>
+Speed must be specified in kilobytes per second, the drive will
+round it as appropriate. Please refer to the sdparm man page for
+details.
+</para>
+
+<para>
+There is also a dedicated tool that works for
 <ulink url="http://das.ist.org/~georg/">Plextor SCSI drives</ulink>.
 </para>
 </sect2>
diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index 0173cb8c95..83989dbf3a 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -590,7 +590,7 @@ It works normal when i run it as a user.
 <answer><para>
 This is again a power management effect (see above). Plug the external power
 connector in <emphasis role="bold">before</emphasis> you power on your notebook
-or use the <option>-nortc</option> option.
+or make sure you do not use the <option>-rtc</option> option.
 </para></answer>
 </qandaentry>
 
diff --git a/DOCS/xml/ru/cd-dvd.xml b/DOCS/xml/ru/cd-dvd.xml
index bc1ad4d82e..2fc96328d3 100644
--- a/DOCS/xml/ru/cd-dvd.xml
+++ b/DOCS/xml/ru/cd-dvd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with r26990 -->
+<!-- synced with r28706 -->
 <chapter id="cd-dvd">
 <title>п≤я│п©пЎп╩я▄пЇпЎп╡п╟пҐп╦п╣ CD/DVD</title>
 
@@ -54,7 +54,7 @@
 пЄп╦я│п╨п╟я┘ я│ я├п╟я─п╟п©п╦пҐп╟п╪п╦). п∙я│п╩п╦ п©пЎя│я┌п╟п╡п╦я┌я▄ я│п╩п╦я┬п╨пЎп╪ п╠пЎп╩я▄я┬пЎп╣ пЇпҐп╟я┤п╣пҐп╦п╣, я┌пЎ п©пЎя│я┌пЎя▐пҐпҐя▀п╧
 пЇп╟п©я┐я│п╨ п╦ пЎя│я┌п╟пҐпЎп╡п╨п╟ п╡я─п╟я┴п╣пҐп╦я▐ пЄп╦я│п╨п╟ я┐пІп╟я│пҐпЎ я│пҐп╦пЇя▐я┌ я█я└я└п╣п╨я┌п╦п╡пҐпЎя│я┌я▄.
 п═п╣п╨пЎп╪п╣пҐпЄя┐п╣я┌я│я▐ я┌п╟п╨пІп╣ п©пЎпЄя│я┌я─пЎп╦я┌я▄ п©я─п╦п╡пЎпЄ, п╦я│п©пЎп╩я▄пЇя┐я▐ <command>hdparm</command>:
-<screen>hdparm -d1 -a8 -u1 <replaceable>[я┐я│я┌я─пЎп╧я│я┌п╡пЎ cdrom]</replaceable></screen>
+<screen>hdparm -d1 -a256 -u1 <replaceable>[я┐я│я┌я─пЎп╧я│я┌п╡пЎ cdrom]</replaceable></screen>
 </para>
 
 <para>
@@ -70,9 +70,17 @@
 </para>
 
 <para>
-пё SCSI п©я─п╦п╡пЎпЄпЎп╡ пҐп╣я┌ пЎп╠я┴п╣пЁпЎ я│п©пЎя│пЎп╠п╟ п╡я▀я│я┌п╟п╡п╦я┌я▄ я█я┌п╦ п©п╟я─п╟п╪п╣я┌я─я▀ (п▓я▀ пЇпҐп╟п╣я┌п╣
-п╨п╟п╨пЎп╧-пҐп╦п╠я┐пЄя▄? п═п╟я│я│п╨п╟пІп╦я┌п╣ пҐп╟п╪!) п║я┐я┴п╣я│я┌п╡я┐п╣я┌ п©я─пЎпЁя─п╟п╪п╪п╟ пЄп╩я▐
-<ulink url="http://das.ist.org/~georg/">Plextor SCSI п©я─п╦п╡пЎпЄпЎп╡</ulink>.
+п▓я▀ п╪пЎпІп╣я┌п╣ пҐп╟я│я┌я─пЎп╦я┌я▄ я│п╨пЎя─пЎя│я┌я▄ SCSI CD-ROM п©я─п╦п╡пЎпЄпЎп╡ я│ п©пЎп╪пЎя┴я▄я▌
+<command>sdparm</command>, пҐп╣пЎп╠я┘пЎпЄп╦п╪п╟ п╡п╣я─я│п╦я▐ 1.03 п╦п╩п╦ п╡я▀я┬п╣:
+<screen>sdparm --command=speed=<replaceable>[я│п╨пЎя─пЎя│я┌я▄ п╡ п╨п▒/я│]</replaceable> <replaceable>[я┐я│я┌я─пЎп╧я│я┌п╡пЎ cdrom]</replaceable></screen>
+п║п╨пЎя─пЎя│я┌я▄ пЄпЎп╩пІпҐп╟ п╠я▀я┌я▄ я┐п╨п╟пЇп╟пҐп╟ п╡ п╨п╦п╩пЎп╠п╟п╧я┌п╟я┘ п╡ я│п╣п╨я┐пҐпЄя┐, п©я─п╦п╡пЎпЄ
+пЎп╨я─я┐пЁп╩п╦я┌ п╣я▒ пҐп╟пЄп╩п╣пІп╟я┴п╦п╪ пЎп╠я─п╟пЇпЎп╪. п÷пЎпІп╟п╩я┐п╧я│я┌п╟, пЎп╠я─п╟я┌п╦я┌п╣я│я▄ я│ я│я┌я─п╟пҐп╦я├п╣
+я─я┐п╨пЎп╡пЎпЄя│я┌п╡п╟ sdparm пЄп╩я▐ пЄп╣я┌п╟п╩п╣п╧.
+</para>
+
+<para>
+There is also a dedicated tool that works for
+<ulink url="http://das.ist.org/~georg/">Plextor SCSI drives</ulink>.
 </para>
 </sect2>
 
diff --git a/DOCS/xml/ru/faq.xml b/DOCS/xml/ru/faq.xml
index 99c87172c0..7addcabb2e 100644
--- a/DOCS/xml/ru/faq.xml
+++ b/DOCS/xml/ru/faq.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with  r28660  -->
+<!-- synced with  r28707  -->
 <chapter id="faq" xreflabel="FAQ">
 <title>пїп╟я│я┌пЎ п≈п╟пЄп╟п╡п╟п╣п╪я▀п╣ п╡пЎп©я─пЎя│я▀</title>
 
@@ -578,7 +578,7 @@ Windows Media 9.)
 <answer><para>
 пґя┌пЎ я┌пЎпІп╣ я█я└я└п╣п╨я┌ я│п╦я│я┌п╣п╪я▀ я┐п©я─п╟п╡п╩п╣пҐп╦я▐ я█пҐп╣я─пЁпЎп©пЎя┌я─п╣п╠п╩п╣пҐп╦п╣п╪ (я│п╪пЎя┌я─п╦я┌п╣ п╡я▀я┬п╣).
 п÷пЎпЄя│пЎп╣пЄп╦пҐп╦я┌п╣ я─п╟пЇя┼п╣п╪ п╡пҐп╣я┬пҐп╣пЁпЎ п©п╦я┌п╟пҐп╦я▐ <emphasis role="bold">пЄпЎ</emphasis>
-п╡п╨п╩я▌я┤п╣пҐп╦я▐ пҐпЎя┐я┌п╠я┐п╨п╟ п╩п╦п╠пЎ п╦я│п©пЎп╩я▄пЇя┐п╧я┌п╣ пЎп©я├п╦я▌ <option>-nortc</option>.
+п╡п╨п╩я▌я┤п╣пҐп╦я▐ пҐпЎя┐я┌п╠я┐п╨п╟ п╩п╦п╠пЎ я┐п╠п╣пЄп╦я┌п╣я│я▄, я┤я┌пЎ пҐп╣ п╦я│п©пЎп╩я▄пЇя┐п╣я┌я│я▐ пЎп©я├п╦я▐ <option>-rtc</option>.
 </para></answer>
 </qandaentry>
author	Uoti Urpala <uau@glyph.nonexistent.invalid>	2009-02-23 21:00:52 +0200
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>	2009-02-23 21:00:52 +0200
commit	66f6f9f0768de5b003fc1b0fa9b1ea428466308a (patch)
tree	157b98be78b0cd1e99b3dd51979bc97792d11642 /DOCS
parent	ebb541c6553af10203b2c2f5bcead6118a44f5be (diff)
parent	30aa2383cadb2f879e02dca9df293c01119a3111 (diff)
download	mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.bz2 mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.xz