Art: Do not crash if album is not null but empty

[vlc] / modules / gui / qt4 / main_interface.hpp

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 689da2b457f1ba30dd0ec09827569f7941d913b9..d6a59512d97c0b0a0f7f2cc5283e8da7cc192e37 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -86,6 +86,7 @@ public:
 #endif
     int getControlsVisibilityStatus();
     bool isPlDocked() { return ( b_plDocked != false ); }
+    bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
 
 protected:
     void dropEventPlay( QDropEvent *, bool);
@@ -97,7 +98,6 @@ protected:
     virtual void dragMoveEvent( QDragMoveEvent * );
     virtual void dragLeaveEvent( QDragLeaveEvent * );
     virtual void closeEvent( QCloseEvent *);
-    virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
 
@@ -117,6 +117,10 @@ private:
     void showVideo();
     void restoreStackOldWidget();
 
+    /* */
+    void setMinimalView( bool );
+    void setInterfaceFullScreen( bool );
+
     /* */
     QSettings           *settings;
 #ifndef HAVE_MAEMO
@@ -151,8 +155,11 @@ private:
     bool                 b_notificationEnabled; /// Systray Notifications
     bool                 b_autoresize;          ///< persistent resizeable window
     bool                 b_videoEmbedded;       ///< Want an external Video Window
+    bool                 b_videoFullScreen;     ///< --fullscreen
+    bool                 b_videoOnTop;          ///< --video-on-top
     bool                 b_hideAfterCreation;
-    int                  i_visualmode;          ///< Visual Mode
+    bool                 b_minimalView;         ///< Minimal video
+    bool                 b_interfaceFullScreen;
 
     /* States */
     bool                 playlistVisible;       ///< Is the playlist visible ?
@@ -176,7 +183,7 @@ public slots:
     void toggleUpdateSystrayMenu();
 #endif
     void toggleAdvancedButtons();
-    void toggleFullScreen();
+    void toggleInterfaceFullScreen();
     void toggleFSC();
 
     void popupMenu( const QPoint& );
@@ -207,11 +214,23 @@ private slots:
 
     void showBuffering( float );
 
-    void resizeStack( int w, int h ) {
+    void resizeStack( int w, int h )
+    {
         if( !isFullScreen() && !isMaximized() )
-            resize( size() - stackCentralW->size() + QSize( w, h ) );
-        debug(); }
-
+        {
+            if( b_minimalView )
+                resize( w, h ); /* Oh yes, it shouldn't
+                                   be possible that size() - stackCentralW->size() < 0
+                                   since stackCentralW is contained in the QMW... */
+            else
+                resize( size() - stackCentralW->size() + QSize( w, h ) );
+        }
+        debug();
+    }
+
+    void setVideoSize( unsigned int, unsigned int );
+    void setVideoFullScreen( bool );
+    void setVideoOnTop( bool );
 
 signals:
     void askGetVideo( WId *p_id, int *pi_x, int *pi_y,
@@ -219,6 +238,7 @@ signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );
+    void askVideoOnTop( bool );
     void minimalViewToggled( bool );
     void fullscreenInterfaceToggled( bool );