]> git.sesse.net Git - vlc/blobdiff - modules/gui/wxwidgets/wxwidgets.hpp
Add missing shortnames.
[vlc] / modules / gui / wxwidgets / wxwidgets.hpp
index c7dd431b84ffb8082bdef9ba3b8610569d69b6e6..58fd5270209db8cd081c7baef1684a22fb6ef7bf 100644 (file)
@@ -41,7 +41,7 @@
 /* Let vlc take care of the i18n stuff */
 #define WXINTL_NO_GETTEXT_MACRO
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include "vlc_charset.h"
 #include <vlc_playlist.h>
@@ -179,8 +179,8 @@ struct intf_sys_t
     WindowSettings      *p_window_settings;
 
     /* special actions */
-    vlc_bool_t          b_playing;
-    vlc_bool_t          b_intf_show;                /* interface to be shown */
+    bool          b_playing;
+    bool          b_intf_show;                /* interface to be shown */
 
     /* The input thread */
     input_thread_t *    p_input;
@@ -206,7 +206,7 @@ struct intf_sys_t
     /* Embedded vout */
     VideoWindow         *p_video_window;
     wxBoxSizer          *p_video_sizer;
-    vlc_bool_t          b_video_autosize;
+    bool          b_video_autosize;
 
     /* Aout */
     aout_instance_t     *p_aout;
@@ -225,13 +225,13 @@ wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
 inline void LockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( p_sys->i_playlist_usage++ == 0)
-        vlc_mutex_lock( &p_pl->object_lock );
+        playlist_lock( p_pl );
 }
 
 inline void UnlockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( --p_sys->i_playlist_usage == 0)
-        vlc_mutex_unlock( &p_pl->object_lock );
+        playlist_Unlock( p_pl );
 }
 
 #endif