applied Panagiotis' patch

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

5 files changed, 41 insertions, 3 deletions

diff --git a/DOCS/Hungarian/documentation.html b/DOCS/Hungarian/documentation.html
index 30ac4732c6..e58290ea66 100644
--- a/DOCS/Hungarian/documentation.html
+++ b/DOCS/Hungarian/documentation.html
@@ -549,6 +549,9 @@ könyvtárban lévő skin kerül betöltésre.</P>
 jelenleg 8 fajtát ismer fel. Hogy lásd melyek ezek, nézd meg a subreader.c
 file-t, a 30. sor körül.</P>
 
+<P>A DVD feliratok használatához olvasd el a <A HREF="cd-dvd.html#4.2">DVD
+fejezetet.</A></P>
+
 <P>Az <B>MPlayer</B> tartalmaz egy új, <B><I>MPsub</I></B> nevű feliratformátumot.
 A tervezés az én (Gabucino) kezem munkáját dicséri. A legfőbb újítása hogy
 <I>dinamikusan</I> idő alapú (bár van képkocka alapú módja is). Példa (a
@@ -658,6 +661,15 @@ TV tuner-ről</B>.</P>
 </UL>
 </P>
 
+<P><B>Tipp</B> : ha az <B>MPlayer</B> <CODE>ioctl: can't sync</CODE>-szerű
+  üzenetekkel dobálózik, a tunered nem tudja a kért felbontást. Próbáld a
+  <CODE>width=640:height=480</CODE> opciókkal.</P>
+
+<P><B>Tipp #2</B> : rosszak a színek? Ezekszerint a tunered nem tudja a képet
+  YV12 colorspace-ben grabbelni. Próbáld a YUY2, UYVY vagy végső esetben az
+  RGB32 colorspace-eket (ezutóbbit <CODE>-vo sdl</CODE>-el). Ezeket a
+  <CODE>outfmt=YV12</CODE> opcióval lehet megadni, lásd lent.</P>
+
 <P><B><I>Rendelkezésre álló opciók</I></B><BR>
 <TABLE BORDER=0>
 <TR>
@@ -793,6 +805,7 @@ Szabványos V4L-ről bemenet<BR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>fel vagy le</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>hátra/előre seek, 1 percnyi</TD><TR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>pgup/pgdown</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>hátra/előre seek, 10 percnyi</TD><TR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>p vagy SPACE</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>pillanatállj, bármely billentyűre tovább</TD><TR>
+<TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>&lt; or &gt;</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>előző / következő file a lejátszási listában</TD><TR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>q vagy ESC</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>lejátszás leállítasa, kilépés</TD><TR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>+ vagy -</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>audio késleltetése +/- 0.1 másodperccel</TD><TR>
 <TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>/ vagy *</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>hangerő csökkentése/növelése</TD><TR>
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 6620f01e89..97ad5f893c 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -530,6 +530,8 @@ directive to use the skin in <CODE>*/Skin/newskin</CODE> directory.</P>
 8 kinds of subtitle can be used by the subreader code. To see what are
 these subtitle formats, see subreader.c, line ~30.</P>
 
+<P>About DVD subtitles, read the <A HREF="cd-dvd.html#4.2">DVD section</A>.</P>
+
 <P><B>MPlayer</B> introduces a new subtitle format called <B><I>MPsub</I></B>.
 It was designed by me (Gabucino). Basically its main feature is being
 <I>dynamically</I> time-based (although it has frame-based mode too). Example (from
@@ -637,6 +639,15 @@ TV tuner</B>.</P>
 </UL>
 </P>
 
+<P><B>Hint</B>: if <B>MPlayer</B> prints <CODE>ioctl: can't sync</CODE> or something
+  like this, your tuner can't capture the requested image size. Try using
+  <CODE>width=640:height=480</CODE> options.</P>
+
+<P><B>Hint #2</B> : are the colors fucked up? Then your tuner can't display
+  in YV12 colorspace. Try YUY2, UYVY or if none of these works: RGB32 (this one
+  with <CODE>-vo sdl</CODE>).
+  You can specify these with the <CODE>outfmt=YV12</CODE> option see below.</P>
+
 <P><B><I>Available options</I></B><BR>
 <TABLE BORDER=0>
 <TR>
@@ -767,6 +778,7 @@ Input from standard V4L<BR>
 <TR><TD>&nbsp;&nbsp;</TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>&lt;-  or  -&gt;</TD><TD>&nbsp;&nbsp;</TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>seek backward/forward  10 seconds</TD></TR>
 <TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>up or down</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>seek backward/forward   1 minute</TD></TR>
 <TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>pgup/pgdown</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>seek backward/forward  10 minutes</TD></TR>
+<TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>&lt; or &gt;</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>seek backward/forward  in playlist</TD><TR>
 <TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>p or SPACE</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>pause movie (press any key)</TD></TR>
 <TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>q or ESC</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>stop playing and quit program</TD></TR>
 <TR><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>+ or -</TD><TD></TD><TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>adjust audio delay by +/- 0.1 second</TD></TR>
diff --git a/help_mp-nl.h b/help_mp-nl.h
index 11fb84ee33..9e668384f9 100644
--- a/help_mp-nl.h
+++ b/help_mp-nl.h
@@ -96,9 +96,18 @@ static char help_text[]=
 #define MSGTR_CannotInitVO "FATAL: Kan video driver niet initialiseren!\n"
 #define MSGTR_CannotInitAO "Kon audio device niet open/init -> NOSOUND\n"
 #define MSGTR_StartPlaying "Start afspelen...\n"
-#define MSGTR_SystemTooSlow "\n*********************************************************************************"\
-			    "\n** Je systeem is te TRAAG om dit af te spelen! Probeer met -framedrop of RTFM! **"\
-			    "\n*********************************************************************************\n"
+#define MSGTR_SystemTooSlow "\n\n"\
+"         ************************************************\n"\
+"         ** Je system is te TRAAG om dit af te spelen! **\n"\
+"         ************************************************\n"\
+"!!! Mogelijke oorzaken, problemen, oplossingen: \n"\
+"- Meestal: kapotte/buggy _audio_ driver. Oplossing: Probeer -ao sdl of gebruik\n"\
+"  ALSA 0.5 of oss emulatie of ALSA 0.9. Lees DOCS/sound.html voor more tips!\n"\
+"- Trage video output. Probeer andere -vo driver (voor lijst: -vo help) of probeer\n"\
+"  net -framedrop !  Lees DOCS/video.html voor video tuning/speedup tips.\n"\
+"- Trage CPU. Probeer geen grote DVD/DivX af te spelen op een trage CPU! Probeer -hardframedrop\n"\
+"- Kapot bestand. Probeer verschillende combinaties van: -nobps  -ni  -mc 0  -forceidx\n"\
+"Als geen van deze oorzaken van toepassingen zijn, lees dan DOCS/bugreports.html !\n\n"
 
 #define MSGTR_NoGui "MPlayer werd gecompileerd ZONDER GUI ondersteuning!\n"
 #define MSGTR_GuiNeedsX "MPlayer GUI heeft X11 nodig!\n"
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index e3643ca09f..bf61cf82ef 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -62,6 +62,8 @@
 #define wsPlus  '+'
 #define wsMul   '*'
 #define wsDiv   '/'
+#define wsLess  '<'
+#define wsMore  '>'
 
 #define wsUp            0x52 + 256
 #define wsDown          0x54 + 256
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 1e1fed1411..393cfa4af6 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -247,6 +247,8 @@ void vo_x11_putkey(int key){
    case wsMul:       mplayer_put_key('*'); break;
    case wsGrayDiv:
    case wsDiv:       mplayer_put_key('/'); break;
+   case wsLess:      mplayer_put_key('<'); break;
+   case wsMore:      mplayer_put_key('>'); break;
    case wsm:
    case wsM:	     mplayer_put_key('m'); break;
    case wso: