[vlc-devel] commit: Qt: don' t show the menu button if there is only 1 chapter and 1 title ( Jean-Baptiste Kempf )

git version control git at videolan.org
Thu Feb 25 16:40:29 CET 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 25 16:22:18 2010 +0100| [3da0fd7e0230b16a3b2fb7e9742d75a81ac6205f] | committer: Jean-Baptiste Kempf 

Qt: don't show the menu button if there is only 1 chapter and 1 title

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

 modules/gui/qt4/input_manager.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 695c81b..9845baa 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -396,6 +396,7 @@ void InputManager::UpdateNavigation()
 {
     /* Update navigation status */
     vlc_value_t val; val.i_int = 0;
+    vlc_value_t val2; val2.i_int = 0;
 
     if( hasInput() )
         var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
@@ -405,10 +406,9 @@ void InputManager::UpdateNavigation()
         emit titleChanged( true );
         msg_Dbg( p_intf, "Title %i", val.i_int );
         /* p_input != NULL since val.i_int != 0 */
-        val.i_int = 0;
-        var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
-        emit chapterChanged( (val.i_int > 0) );
-        msg_Dbg( p_intf, "Chapter: %i", val.i_int );
+        var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val2, NULL );
+        emit chapterChanged( (val2.i_int > 1) || ( val2.i_int > 0 && val.i_int > 1 ) );
+        msg_Dbg( p_intf, "Chapter: %i", val2.i_int );
     }
     else
         emit titleChanged( false );




More information about the vlc-devel mailing list