/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
#include "video.hpp"
#include "interface.hpp"
p_parent = _p_parent;
p_child_window = 0;
- vlc_mutex_init( p_intf, &lock );
+ vlc_mutex_init( &lock );
b_auto_size = p_intf->p_sys->b_video_autosize;
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))
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 );
}
}
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() );
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) );
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 );