Use vlc_object_lock and vlc_object_unlock

[vlc] / modules / gui / wxwidgets / wxwidgets.hpp

diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp
index 9bbb38e8f60aece99aebab81ab832efd9b40aade..39e433b97c14c2b31d13fc246d84d8854a2f7c2c 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.hpp
+++ b/modules/gui/wxwidgets/wxwidgets.hpp
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #ifndef _WXVLC_WIDGETS_H_
 #define _WXVLC_WIDGETS_H_
 
@@ -37,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>
@@ -175,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;
@@ -202,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;
@@ -221,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 );
+        vlc_object_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 );
+        vlc_object_unlock( p_pl );
 }
 
 #endif