Qt4 - New Simple Preferences look'n feel. Should work without too many segfaults...

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 5cb8a6eb20dc8688ceef6d6104e2f9b541084e52..c4800ee679ed23d7b517633449011fd397dfe629 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", 51 );
-        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,19 +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;
-    p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) );
-    memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
-
-    p_intf->p_sys->p_playlist = (playlist_t *)vlc_object_find( p_intf,
-                            VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-    if( !p_intf->p_sys->p_playlist )
+#if defined HAVE_GETENV && defined Q_WS_X11
+    if( !getenv( "DISPLAY" ) )
     {
-        free( p_intf->p_sys );
+        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;
 }
 
@@ -124,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;
@@ -143,10 +149,16 @@ 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();
- //   fprintf( stderr, "Qt execution terminated\n" );
     MainInputManager::killInstance();
+    DialogsProvider::killInstance();
     delete p_intf->p_sys->p_mi;
 }
 
@@ -157,8 +169,7 @@ static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
                         intf_dialog_args_t *p_arg )
 {
     DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
-    QApplication::postEvent( DialogsProvider::getInstance( p_intf ),
-                             static_cast<QEvent*>(event) );
+    QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
 }
 
 /*****************************************************************************