[vlc-commits] Qt: Deactivate coverflow for releases until someone actually fixes it

Jean-Baptiste Kempf git at videolan.org
Sun Sep 11 22:01:07 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep  9 00:55:52 2011 +0200| [6fcdfb046a1ad84620628cadef3375b2434c0085] | committer: Jean-Baptiste Kempf

Qt: Deactivate coverflow for releases until someone actually fixes it

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6fcdfb046a1ad84620628cadef3375b2434c0085
---

 modules/gui/qt4/components/playlist/playlist.cpp   |    7 ++++++-
 .../gui/qt4/components/playlist/standardpanel.cpp  |    2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index ffdb78f..7193040 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -126,7 +126,12 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
 
     QActionGroup *actionGroup = new QActionGroup( this );
 
-    for( int i = 0; i < StandardPLPanel::VIEW_COUNT; i++ )
+#ifndef NDEBUG
+# define MAX_VIEW StandardPLPanel::VIEW_COUNT
+#else
+# define MAX_VIEW StandardPLPanel::VIEW_COUNT - 1
+#endif
+    for( int i = 0; i < MAX_VIEW; i++ )
     {
         viewActions[i] = actionGroup->addAction( viewNames[i] );
         viewActions[i]->setCheckable( true );
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index af72e59..023ecf0 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -421,8 +421,10 @@ void StandardPLPanel::cycleViews()
     else if( currentView == treeView )
         showView( LIST_VIEW );
     else if( currentView == listView )
+#ifndef NDEBUG
         showView( PICTUREFLOW_VIEW  );
     else if( currentView == picFlowView )
+#endif
         showView( ICON_VIEW );
     else
         assert( 0 );



More information about the vlc-commits mailing list