* 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_
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include "vlc_charset.h"
+#include <vlc_playlist.h>
#include <wx/wx.h>
#define SLIDER_MAX_POS 10000
* a wxString.
*
* Note that if you want to use non-ANSI code page characters on Windows,
- * you MUST build WxWidgets in “Unicode” mode.
+ * you MUST build WxWidgets in “Unicode” mode. wxConvUTF8
*/
static inline char *wxFromLocale (const wxString& string)
{
return FromWide ((const wchar_t *)string.c_str());
# define wxLocaleFree free
# else
- return FromLocale (string.mb_str());
-# define wxLocaleFree LocaleFree
+ return FromLocaleDup (string.mb_str());
+# define wxLocaleFree free
# endif
#else
# warning Please use WxWidgets with Unicode.
# define wxLocaleFree LocaleFree
#endif
}
-
+
/* From Locale functions to use for File Drop targets ... go figure */
#if defined( wxUSE_UNICODE ) && !defined( WIN32 )
static inline char *wxDnDFromLocale( const wxChar *stupid )
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;
/* 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;
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