[vlc-commits] commit: Qt: do "normal->loopall->loop1->normal" instead of "normal->loop1-> loopall->normal" (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar  4 01:32:01 2010 +0100| [4e5dff5adce40b0b5eaa33dfea0f8cb167388706] | committer: Jean-Baptiste Kempf 

Qt: do "normal->loopall->loop1->normal" instead of "normal->loop1->loopall->normal"

And fix logic

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

 modules/gui/qt4/components/controller_widget.cpp |    4 ++--
 modules/gui/qt4/input_manager.cpp                |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 9ee7117..095d875 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -258,6 +258,6 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
 void LoopButton::updateIcons( int value )
 {
     setChecked( value != NORMAL );
-    setIcon( ( value == REPEAT_ALL ) ? QIcon( ":/buttons/playlist/repeat_all" )
-                                     : QIcon( ":/buttons/playlist/repeat_one" ) );
+    setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
+                                     : QIcon( ":/buttons/playlist/repeat_all" ) );
 }
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index b589564..c7222c2 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1103,8 +1103,8 @@ void MainInputManager::toggleRandom()
 
 void MainInputManager::notifyRepeatLoop()
 {
-    int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ONE
-              + var_GetBool( THEPL, "repeat" ) * REPEAT_ALL;
+    int i_value = var_GetBool( THEPL, "loop" ) * REPEAT_ALL
+              + var_GetBool( THEPL, "repeat" ) * REPEAT_ONE;
 
     emit repeatLoopChanged( i_value );
 }