Commit 98a5db4c authored by Antoine Cellerier's avatar Antoine Cellerier

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

(like mplayer)
parent c4aaedc8
......@@ -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
......
......@@ -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,
......
......@@ -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 );
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment