Merge branch 'master' of git@git.videolan.org:vlc

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

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 400365f7d17870a7c527e5faf33183e8f6582df3..ffeb2d36fe733c1c89f5264f0d5b44c217686275 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -24,13 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <errno.h>                                                 /* ENOMEM */
-#include <string.h>                                            /* strerror() */
-#include <stdio.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
 
 #ifdef HAVE_LOCALE_H
 #   include <locale.h>
@@ -111,15 +112,11 @@ private:
                 "on the toolbar (or both)." )
 
 static int pi_playlist_views[] = { 0,1,2 };
-static char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
-                                      N_("Both") };
+static const char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
+                                            N_("Both") };
 
 vlc_module_begin();
-#ifdef WIN32
     int i_score = 150;
-#else
-    int i_score = getenv( "DISPLAY" ) == NULL ? 15 : 150;
-#endif
     set_shortname( (char*) "wxWidgets" );
     set_description( (char *) _("wxWidgets interface module") );
     set_category( CAT_INTERFACE );
@@ -130,42 +127,41 @@ vlc_module_begin();
     add_shortcut( "wxwin" );
     add_shortcut( "wx" );
     add_shortcut( "wxwidgets" );
-    set_program( "wxvlc" );
 
     add_bool( "wx-embed", 1, NULL,
-              EMBED_TEXT, EMBED_LONGTEXT, VLC_FALSE );
-    add_deprecated( "wxwin-enbed", VLC_FALSE); /*Deprecated since 0.8.4*/
+              EMBED_TEXT, EMBED_LONGTEXT, false );
+        add_deprecated_alias( "wxwin-enbed" ); /*Deprecated since 0.8.4*/
     add_bool( "wx-bookmarks", 0, NULL,
-              BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_FALSE );
-    add_deprecated( "wxwin-bookmarks", VLC_FALSE); /*Deprecated since 0.8.4*/
+              BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, false );
+        add_deprecated_alias( "wxwin-bookmarks" ); /*Deprecated since 0.8.4*/
     add_bool( "wx-taskbar", 1, NULL,
-              TASKBAR_TEXT, TASKBAR_LONGTEXT, VLC_FALSE );
-    add_deprecated( "wxwin-taskbar", VLC_FALSE); /*Deprecated since 0.8.4*/
+              TASKBAR_TEXT, TASKBAR_LONGTEXT, false );
+        add_deprecated_alias( "wxwin-taskbar" ); /*Deprecated since 0.8.4*/
     add_bool( "wx-extended", 0, NULL,
-              EXTENDED_TEXT, EXTENDED_LONGTEXT, VLC_FALSE );
+              EXTENDED_TEXT, EXTENDED_LONGTEXT, false );
     add_bool( "wx-minimal", 0, NULL,
-              MINIMAL_TEXT, MINIMAL_LONGTEXT, VLC_TRUE );
-    add_deprecated( "wxwin-minimal", VLC_FALSE); /*Deprecated since 0.8.4*/
+              MINIMAL_TEXT, MINIMAL_LONGTEXT, true );
+        add_deprecated_alias( "wxwin-minimal" ); /*Deprecated since 0.8.4*/
     add_bool( "wx-autosize", 1, NULL,
-              SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, VLC_TRUE );
+              SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, true );
+        add_deprecated_alias( "wxwin-autosize" ); /*Deprecated since 0.8.4*/
     add_integer( "wx-playlist-view", 0, NULL, PLAYLIST_TEXT, PLAYLIST_LONGTEXT,
-             VLC_FALSE );
+             false );
         change_integer_list( pi_playlist_views, psz_playlist_views, 0 );
-    add_deprecated( "wxwin-autosize", VLC_FALSE); /*Deprecated since 0.8.4*/
 /* wxCocoa pretends to support this, but at least 2.6.x doesn't */
 #ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
     add_bool( "wx-systray", 0, NULL,
-              SYSTRAY_TEXT, SYSTRAY_LONGTEXT, VLC_FALSE );
-    add_deprecated( "wxwin-systray", VLC_FALSE); /*Deprecated since 0.8.4*/
+              SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false );
+        add_deprecated_alias( "wxwin-systray" ); /*Deprecated since 0.8.4*/
 #endif
 #endif
-    add_bool( "wx-labels", 0, NULL, LABEL_TEXT, LABEL_LONGTEXT, VLC_TRUE);
+    add_bool( "wx-labels", 0, NULL, LABEL_TEXT, LABEL_LONGTEXT, true);
     add_string( "wx-config-last", NULL, NULL,
-                N_("last config"), N_("last config"), VLC_TRUE );
+                N_("last config"), N_("last config"), true );
         change_autosave();
         change_internal();
-    add_deprecated( "wxwin-config-last", VLC_FALSE); /*Deprecated since 0.8.4*/
+        add_deprecated_alias( "wxwin-config-last" ); /*Deprecated since 0.8.4*/
 
     add_submodule();
     set_description( _("wxWidgets dialogs provider") );
@@ -183,7 +179,14 @@ vlc_module_end();
 static int Open( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
-
+    /* Test in we have an X*/
+#if defined HAVE_GETENV && (defined __WXGTK__ || defined __WXX11)
+    if( !getenv( "DISPLAY" ) )
+    {
+        msg_Err( p_intf, "no X server");
+        return VLC_EGENERIC;
+    }
+#endif
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
@@ -209,7 +212,7 @@ static int Open( vlc_object_t *p_this )
     p_intf->pf_show_dialog = NULL;
 
     /* We support play on start */
-    p_intf->b_play = VLC_TRUE;
+    p_intf->b_play = true;
 
     p_intf->p_sys->b_video_autosize =
         config_GetInt( p_intf, "wx-autosize" );
@@ -235,7 +238,7 @@ static void Close( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
     vlc_mutex_lock( &p_intf->object_lock );
-    p_intf->b_dead = VLC_TRUE;
+    p_intf->b_dead = true;
     vlc_mutex_unlock( &p_intf->object_lock );
 
     if( p_intf->pf_show_dialog )
@@ -282,7 +285,7 @@ static void Run( intf_thread_t *p_intf )
 
         /* Create a new thread for wxWidgets */
         if( vlc_thread_create( p_intf, "Skins Dialogs Thread",
-                               Init, 0, VLC_TRUE ) )
+                               Init, 0, true ) )
         {
             msg_Err( p_intf, "cannot create Skins Dialogs Thread" );
             p_intf->pf_show_dialog = NULL;
@@ -398,7 +401,7 @@ bool Instance::OnInit()
                                            FIND_ANYWHERE );
         if( p_playlist )
         {
-            playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE );
+            playlist_Control( p_playlist, PLAYLIST_PLAY, false );
             vlc_object_release( p_playlist );
         }
     }
@@ -415,7 +418,7 @@ int Instance::OnExit()
     if( p_intf->pf_show_dialog )
     {
          /* We need to manually clean up the dialogs class */
-         if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow;
+         delete p_intf->p_sys->p_wxwindow;
     }
 
 #if (wxCHECK_VERSION(2,5,0))
@@ -557,7 +560,7 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf )
         }
     }
 
-    if( psz_org ) free( psz_org );
+    free( psz_org );
     return;
 
 invalid:
@@ -569,7 +572,7 @@ invalid:
         position[i] = wxDefaultPosition;
         size[i] = wxDefaultSize;
     }
-    if( psz_org ) free( psz_org );
+    free( psz_org );
 }
 
 
@@ -592,7 +595,7 @@ WindowSettings::~WindowSettings( )
                                      size[i].x, size[i].y );
     }
 
-    config_PutPsz( p_intf, "wx-config-last", sCfg.mb_str() );
+    config_PutPsz( p_intf, "wx-config-last", sCfg.mb_str(wxConvUTF8) );
 }
 
 void WindowSettings::SetScreen( int i_screen_w, int i_screen_h )