change name to --monitor-aspect-ratio so its consistent with other programs

(like mplayer)

diff --git a/NEWS b/NEWS
index bec35cc6ba9878cd1b219313457a5c0f37bc0369..562c12c6aa705ecbfd0965d7685a03656c0022d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ Changes between 0.8.2 and 0.8.4-svn (not yet released):
 
 Core support:
 * IPv6 and Extended passive mode support for FTP
-* new --screen-aspect-ratio option
+* new --monitor-aspect-ratio option
 
 Services discovery:
 * Bleeding edge UPnP service discovery

diff --git a/src/libvlc.h b/src/libvlc.h
index ccbe52d8fc5b10ef59edb1d5c7f6c08def303445..0721a1f07d4d73808e4f5f2fe204178b04baabc9 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -275,11 +275,11 @@ static char *ppsz_align_descriptions[] =
     "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \
     "squareness.")
 
-#define SASPECT_RATIO_TEXT N_("Screen aspect ratio")
-#define SASPECT_RATIO_LONGTEXT N_( \
-    "This will force the scree aspect ratio. Default screen aspect ratio" \
-    "is 4:3. Setting the screen aspect ratio to 4:3 will have no effect," \
-    "other settings (like 16:9) will change the image.")
+#define MASPECT_RATIO_TEXT N_("Monitor aspect ratio")
+#define MASPECT_RATIO_LONGTEXT N_( \
+    "This will force the monitor aspect ratio. Most monitors have a 4:3." \
+    "If you have a 16:9 screen, you will need to change this to 16:9 in" \
+    "order to keep proportions.")
 
 #define SKIP_FRAMES_TEXT N_("Skip frames")
 #define SKIP_FRAMES_LONGTEXT N_( \
@@ -997,8 +997,8 @@ vlc_module_begin();
     add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE );
     add_string( "aspect-ratio", "", NULL,
                ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
-    add_string( "screen-aspect-ratio", "", NULL,
-               SASPECT_RATIO_TEXT, SASPECT_RATIO_LONGTEXT, VLC_FALSE );
+    add_string( "monitor-aspect-ratio", "4:3", NULL,
+               MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_FALSE );
     add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
               VIDEO_DECO_LONGTEXT, VLC_TRUE );
     add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 91db4cf6d32ae0ccc5179fee93b96f0ab20a846a..b21be6e0ee7ea246e95aceb375336b227eab98d7 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -316,9 +316,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
      * the video output pipe */
     if( p_parent->i_object_type != VLC_OBJECT_VOUT )
     {
-        int i_screen_aspect_x = 4 , i_screen_aspect_y = 3;
+        int i_monitor_aspect_x = 4 , i_monitor_aspect_y = 3;
         var_Get( p_vout, "aspect-ratio", &val );
-        var_Get( p_vout, "screen-aspect-ratio", &val2 );
+        var_Get( p_vout, "monitor-aspect-ratio", &val2 );
 
         if( val2.psz_string )
         {
@@ -326,11 +326,11 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
             if( psz_parser )
             {
                 *psz_parser++ = '\0';
-                i_screen_aspect_x = atoi( val2.psz_string );
-                i_screen_aspect_y = atoi( psz_parser );
+                i_monitor_aspect_x = atoi( val2.psz_string );
+                i_monitor_aspect_y = atoi( psz_parser );
             } else {
                 AspectRatio( VOUT_ASPECT_FACTOR * atof( val2.psz_string ),
-                                 &i_screen_aspect_x, &i_screen_aspect_y );
+                                 &i_monitor_aspect_x, &i_monitor_aspect_y );
             }
 
             free( val2.psz_string );
@@ -358,7 +358,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
                 }
             }
             i_new_aspect = (int)((float)i_new_aspect
-                * (float)i_screen_aspect_y*4.0/((float)i_screen_aspect_x*3.0));
+                * (float)i_monitor_aspect_y*4.0/((float)i_monitor_aspect_x*3.0));
 
             free( val.psz_string );
 

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index d886a5bdb17f350979f8dbd773f001a7c739f42e..64576797882d1ead50d4ad7c26a1bb2f31aafcf8 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -177,7 +177,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "snapshot-format", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_vout, "screen-aspect-ratio",
+    var_Create( p_vout, "monitor-aspect-ratio",
                                       VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );