From a2dda036d889f976cd44d364a9e029cbf6dcf6cb Mon Sep 17 00:00:00 2001 From: cehoyos Date: Fri, 27 Apr 2007 23:16:45 +0000 Subject: =?UTF-8?q?Make=20-monitorpixelaspect=201=20the=20default.=20Patch?= =?UTF-8?q?=20by=20Onur=20K=C3=BC=C3=A7=C3=BCk=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/de/mplayer.1 | 6 +++--- DOCS/man/en/mplayer.1 | 5 +++-- cfg-mplayer.h | 4 ++-- libvo/aspect.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1 index 4bbedd4d94..b3b41c55cb 100644 --- a/DOCS/man/de/mplayer.1 +++ b/DOCS/man/de/mplayer.1 @@ -2991,6 +2991,8 @@ Gibt den Bereich f .TP .B \-monitoraspect (siehe auch \-aspect) Gibt das Höhen-/\:Breitenverhältnis deines Monitors oder Fernsehers an. +Der Wert 0 schaltet frühere Einstellungen (z.B. in der config Datei) aus. +Überschreibt bei Verwendung die Einstellung von \-monitorpixelaspect. .sp 1 .I BEISPIEL: .PD 0 @@ -3005,9 +3007,7 @@ Gibt das H .B \-monitorpixelaspect (siehe auch \-aspect) Setze den Aspekt eines einzelnen Pixels deines Monitors oder TV-Schirms (Standard: deaktiviert). -Überschreibt die Einstellung \-monitoraspect. -Ein Wert von 0 deaktiviert, Wert von 1 bedeutet quadratische Pixel (korrekt -für (fast?) alle LCDs). +Ein Wert von 1 bedeutet quadratische Pixel (korrekt für (fast?) alle LCDs). . .TP .B \-nodouble diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 8591b518ae..c1f5f3909d 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2880,6 +2880,8 @@ Specify the vertical frequency range of the monitor. .TP .B \-monitoraspect (also see \-aspect) Set the aspect ratio of your monitor or TV screen. +A value of 0 disables previous monitoraspect setting (e.g. in config file). +Overrides the \-monitorpixelaspect setting if enabled. .sp 1 .I EXAMPLE: .PD 0 @@ -2893,8 +2895,7 @@ Set the aspect ratio of your monitor or TV screen. .TP .B \-monitorpixelaspect (also see \-aspect) Set the aspect of a single pixel of your monitor or TV screen (default: disabled). -Overrides the \-monitoraspect setting. -A value of 0 disables, a value of 1 means square pixels +A value of 1 means square pixels (correct for (almost?) all LCDs). . .TP diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 05a95eede1..2058cf6728 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -206,8 +206,8 @@ m_option_t mplayer_opts[]={ // Geometry string {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL}, // set aspect ratio of monitor - useful for 16:9 TVout - {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL}, - {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL}, + {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL}, + {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL}, // video mode switching: (x11,xv,dga) {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, diff --git a/libvo/aspect.c b/libvo/aspect.c index 44470e16e7..c5fd8ec819 100644 --- a/libvo/aspect.c +++ b/libvo/aspect.c @@ -19,8 +19,8 @@ float vo_panscanrange = 1.0; #include "video_out.h" -float monitor_aspect=4.0/3.0; -float monitor_pixel_aspect=0; +float monitor_aspect=0; +float monitor_pixel_aspect=1; extern float movie_aspect; static struct { @@ -55,7 +55,7 @@ void aspect_save_screenres(int scrw, int scrh){ #endif aspdat.scrw = scrw; aspdat.scrh = scrh; - if (monitor_pixel_aspect) + if (!monitor_aspect) monitor_aspect = monitor_pixel_aspect * scrw / scrh; } -- cgit v1.2.3