[vlc-devel] commit: Redirected "zoom" on "scale" (vout_thread_t). (Laurent Aimar )
git version control
git at videolan.org
Tue Jan 26 23:44:39 CET 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Jan 26 23:34:02 2010 +0100| [86e59e436dc261493316fc643fbd3b3636548722] | committer: Laurent Aimar
Redirected "zoom" on "scale" (vout_thread_t).
It fixes zoom settings at the core level (partially close #3245).
"zoom" cannot be removed as it provides a list of choices while "scale" is
a free value. The names aren't great, but that can wait.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=86e59e436dc261493316fc643fbd3b3636548722
---
src/video_output/vout_intf.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 3336481..0856b48 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -699,13 +699,7 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
- vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
- p_vout->i_window_height );
- return VLC_SUCCESS;
+ return var_SetFloat( p_this, "scale", newval.f_float );
}
static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
More information about the vlc-devel
mailing list