Simple Preferences - Audio: Don't build widget not useful for your platform instead...

[vlc] / modules / gui / wxwidgets / video.cpp

diff --git a/modules/gui/wxwidgets/video.cpp b/modules/gui/wxwidgets/video.cpp
index 3168ed2e575913cc0b0bd57114814c79f1a95771..18af1dd2266804c7f1d7e8a5755a0379cd954031 100644 (file)
--- a/modules/gui/wxwidgets/video.cpp
+++ b/modules/gui/wxwidgets/video.cpp
@@ -24,9 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
 
 #include "video.hpp"
 #include "interface.hpp"
@@ -134,7 +138,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
 
     if( p_child_window ) p_child_window->Show();
     Show();
-    b_shown = VLC_TRUE;
+    b_shown = true;
 
     p_intf->p_sys->p_video_sizer = new wxBoxSizer( wxHORIZONTAL );
 #if (wxCHECK_VERSION(2,5,3))
@@ -154,11 +158,11 @@ VideoWindow::~VideoWindow()
         if( !p_intf->psz_switch_intf )
         {
             if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
-                vout_Control( p_vout, VOUT_REPARENT );
+                vout_Control( p_vout, VOUT_REPARENT, 0 );
         }
         else
         {
-            if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS )
+            if( vout_Control( p_vout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
                 vout_Control( p_vout, VOUT_CLOSE );
         }
     }
@@ -213,7 +217,7 @@ void *VideoWindow::GetWindow( vout_thread_t *_p_vout,
     if( p_vout )
     {
         vlc_mutex_unlock( &lock );
-        msg_Dbg( p_intf, "Video window already in use" );
+        msg_Dbg( p_intf, "video window already in use" );
         return NULL;
     }
 
@@ -277,7 +281,7 @@ void VideoWindow::UpdateSize( wxEvent &_event )
         p_intf->p_sys->p_video_sizer->Show( this, TRUE );
         p_intf->p_sys->p_video_sizer->Layout();
         SetFocus();
-        b_shown = VLC_TRUE;
+        b_shown = true;
     }
 
     p_intf->p_sys->p_video_sizer->SetMinSize( event->GetSize() );
@@ -299,7 +303,7 @@ void VideoWindow::OnHideTimer( wxTimerEvent& WXUNUSED(event))
         p_intf->p_sys->p_video_sizer->Show( this, FALSE );
         SetSize( 0, 0 );
         p_intf->p_sys->p_video_sizer->Layout();
-        b_shown = VLC_FALSE;
+        b_shown = false;
     }
     p_intf->p_sys->p_video_sizer->SetMinSize( wxSize(0,0) );
 
@@ -352,10 +356,8 @@ int VideoWindow::ControlWindow( void *p_window, int i_query, va_list args )
             unsigned int i_width  = va_arg( args, unsigned int );
             unsigned int i_height = va_arg( args, unsigned int );
 
-            vlc_mutex_lock( &lock );
             if( !i_width && p_vout ) i_width = p_vout->i_window_width;
             if( !i_height && p_vout ) i_height = p_vout->i_window_height;
-            vlc_mutex_unlock( &lock );
 
             /* Update dimensions */
             wxSizeEvent event( wxSize( i_width, i_height ), UpdateSize_Event );