* qt DirectoryConfigControl: default open in selected directory

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index faf193520fcb103abbbf66040ce81026d90f4087..5158d50980c8b1390f27ed014c85d24189401a77 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -45,7 +45,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 vlc_module_begin();
     set_shortname( (char *)"Qt" );
     set_description( (char*)_("Qt interface") );
-    set_category( CAT_INTERFACE) ;
+    set_category( CAT_INTERFACE ) ;
     set_subcategory( SUBCAT_INTERFACE_MAIN );
     set_capability( "interface", 100 );
     set_callbacks( Open, Close );
@@ -56,7 +56,7 @@ vlc_module_begin();
     add_submodule();
         set_description( "Dialogs provider" );
         set_capability( "dialogs provider", 49 );
-        add_bool( "qt-always-video", VLC_FALSE, NULL, "", "", VLC_TRUE );
+        add_bool( "qt-always-video", VLC_FALSE, NULL, "FIXME", "FIXME", VLC_TRUE );
         set_callbacks( OpenDialogs, Close );
 vlc_module_end();
 
@@ -68,12 +68,26 @@ static int Open( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
     p_intf->pf_run = Run;
+#if defined HAVE_GETENV && defined Q_WS_X11
+    if( !getenv( "DISPLAY" ) )
+    {
+        msg_Err(p_intf, "no X server");
+        return VLC_EGENERIC;
+    }
+#endif
     p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) );
+    if( !p_intf->p_sys )
+    {
+        msg_Err(p_intf, "Out of memory");
+        return VLC_ENOMEM;
+    }
     memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
 
     p_intf->p_sys->p_playlist = pl_Yield( p_intf );
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
 
+    p_intf->b_play = VLC_TRUE;
+
     return VLC_SUCCESS;
 }
 
@@ -117,7 +131,6 @@ static void Init( intf_thread_t *p_intf )
     char *argv[] = { "" };
     int argc = 1;
     Q_INIT_RESOURCE( vlc );
-
     QApplication *app = new QApplication( argc, argv , true );
     app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
     p_intf->p_sys->p_app = app;
@@ -136,6 +149,12 @@ static void Init( intf_thread_t *p_intf )
     if( p_intf->pf_show_dialog )
         vlc_thread_ready( p_intf );
 
+    /* Start playing if needed */
+    if( !p_intf->pf_show_dialog && p_intf->b_play )
+    {
+        playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE );
+    }
+
     app->setQuitOnLastWindowClosed( false );
     app->exec();
     MainInputManager::killInstance();