From: Joseph Tulou Date: Fri, 30 Jan 2009 16:30:35 +0000 (+0100) Subject: SDL: support for autoscaling X-Git-Tag: 1.0.0-pre1~912 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=3d03caf53872716bc3ff44031b892b6496f955a4;hp=65892a479f9994e8dd49ded2ff851a5e98b85ae8 SDL: support for autoscaling Modifications by /me Signed-off-by: Jean-Baptiste Kempf --- diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index 187e539ce0..055524d00c 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -577,6 +577,28 @@ static int Manage( vout_thread_t *p_vout ) p_vout->i_changes |= VOUT_SIZE_CHANGE; } + /* autoscale toggle */ + if( p_vout->i_changes & VOUT_SCALE_CHANGE ) + { + p_vout->i_changes &= ~VOUT_SCALE_CHANGE; + + p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" ); + p_vout->i_zoom = (int) ZOOM_FP_FACTOR; + + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } + + /* scaling factor (if no-autoscale) */ + if( p_vout->i_changes & VOUT_ZOOM_CHANGE ) + { + p_vout->i_changes &= ~VOUT_ZOOM_CHANGE; + + p_vout->b_autoscale = false; + p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) ); + + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } + /* Crop or Aspect Ratio Changes */ if( p_vout->i_changes & VOUT_CROP_CHANGE || p_vout->i_changes & VOUT_ASPECT_CHANGE )