* modules/video_output/x11/xcommon.c,

  modules/gui/wxwindows/video.cpp: fixed size for VOUT_SET_ZOOM.

diff --git a/modules/gui/wxwindows/video.cpp b/modules/gui/wxwindows/video.cpp
index acad16cfd9c6da34a9030f3b49159cdb5cae5420..be7db2a258ae5a1dd7c6c79d70eca74362c2b014 100644 (file)
--- a/modules/gui/wxwindows/video.cpp
+++ b/modules/gui/wxwindows/video.cpp
@@ -2,7 +2,7 @@
  * video.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004, 2003 VideoLAN
- * $Id: interface.cpp 6961 2004-03-05 17:34:23Z sam $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *
@@ -280,8 +280,8 @@ int VideoWindow::ControlWindow( void *p_window, int i_query, va_list args )
             double f_arg = va_arg( args, double );
 
             /* Update dimensions */
-            wxSizeEvent event( wxSize(p_vout->render.i_width * f_arg,
-                                      p_vout->render.i_height * f_arg),
+            wxSizeEvent event( wxSize(p_vout->i_window_width * f_arg,
+                                      p_vout->i_window_height * f_arg),
                                UpdateSize_Event );
             AddPendingEvent( event );
 

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 99706971f06615202b2430ab75fe718fd695966e..338074c461e447813bd80798aa46c2000d0b7afd 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -2145,10 +2145,11 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
             vlc_mutex_lock( &p_vout->p_sys->lock );
 
             /* Update dimensions */
+            /* FIXME: export InitWindowSize() from vout core */
             XResizeWindow( p_vout->p_sys->p_display,
                            p_vout->p_sys->p_win->base_window,
-                           p_vout->render.i_width * f_arg,
-                           p_vout->render.i_height * f_arg );
+                           p_vout->i_window_width * f_arg,
+                           p_vout->i_window_height * f_arg );
 
             vlc_mutex_unlock( &p_vout->p_sys->lock );
             return VLC_SUCCESS;