move a few global variables into the appropriate class.

Comment out a few non-thread-safe functions from embedded vout
handling. Fixes a crash when playlist item changes. refs #955

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 6b0a77ae29c46bc1b5e70ba9faa8e7931dddad7f..143d221ca8bf92e82947dde487278ccf989dd7cf 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -75,10 +75,6 @@ static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a )
     return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
 }
 
-bool embeddedPlaylistWasActive;
-bool videoIsActive;
-QSize savedVideoSize;
-
 MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 {
     /* Configuration */
@@ -292,13 +288,13 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
         if( VISIBLE( playlistWidget ) )
         {
             embeddedPlaylistWasActive = true;
-            playlistWidget->hide();
+//            playlistWidget->hide();
         }
         bool bgWasVisible = false;
         if( VISIBLE( bgWidget) )
         {
             bgWasVisible = true;
-            bgWidget->hide();
+//            bgWidget->hide();
         }
         if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
         {
@@ -311,7 +307,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
             // videoWidget->widgetSize = bgWidget->widgeTSize;
             videoWidget->widgetSize = QSize( *pi_width, *pi_height );
         }
-        videoWidget->updateGeometry(); /// FIXME: Needed ?
+//        videoWidget->updateGeometry(); /// FIXME: Needed ?
         need_components_update = true;
     }
     return ret;
@@ -324,9 +320,9 @@ void MainInterface::releaseVideo( void *p_win )
     videoWidget->resize( videoWidget->widgetSize );
 
     if( embeddedPlaylistWasActive )
-        playlistWidget->show();
+        ;//playlistWidget->show();
     else if( bgWidget )
-        bgWidget->show();
+        ;//bgWidget->show();
 
     videoIsActive = false;
     need_components_update = true;
@@ -351,7 +347,7 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
             unsigned int i_width  = va_arg( args, unsigned int );
             unsigned int i_height = va_arg( args, unsigned int );
             videoWidget->widgetSize = QSize( i_width, i_height );
-            videoWidget->updateGeometry();
+            // videoWidget->updateGeometry();
             need_components_update = true;
             i_ret = VLC_SUCCESS;
             break;

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 0f63a7093194804b7ff0821a17f629562db72040..c7da3cb48c9570efb6dadd414c944125099a7304 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -77,6 +77,11 @@ private:
     VideoWidget         *videoWidget;
     virtual void keyPressEvent( QKeyEvent *);
 
+    bool embeddedPlaylistWasActive;
+    bool videoIsActive;
+    QSize savedVideoSize;
+
+
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
     ControlsWidget      *advControls;