Ticket #3676: mythmusic-shuffle_repeat.patch

mythmusic/mythmusic/playbackbox.cpp

@@ -93 +93 @@
     show_album_art = gContext->GetNumSetting("VisualAlbumArtOnSongChange", 0);
     random_visualizer = gContext->GetNumSetting("VisualRandomize", 0);
 
-    m_pushedButton = NULL;
+    m_pushedButton  = NULL;
+    m_ShuffleIcon   = NULL;
+    m_RepeatIcon    = NULL;
 
     // Through the magic of themes, our "GUI" already exists we just need to 
     // wire up it
@@ -1563 +1565 @@
                 else
                     shuffle_button->setText(tr("Shuffle: Smart"));
             }
+
+            if (m_ShuffleIcon)
+                m_ShuffleIcon->hide();
+
+            if (shuffle_icon_intelligent)
+                shuffle_icon_intelligent->show();
+
+            m_ShuffleIcon = shuffle_icon_intelligent;
+                        
             music_tree_list->scrambleParents(true);
 
             if (class LCD *lcd = LCD::Get())
@@ -1578 +1589 @@
                 else
                     shuffle_button->setText(tr("Shuffle: Rand"));
             }
+
+            if (m_ShuffleIcon)
+                m_ShuffleIcon->hide();
+
+            if (shuffle_icon_random)
+                shuffle_icon_random->show();
+
+            m_ShuffleIcon = shuffle_icon_random;
+
             music_tree_list->scrambleParents(true);
 
             if (class LCD *lcd = LCD::Get())
@@ -1593 +1613 @@
                 else
                     shuffle_button->setText(tr("Shuffle: Album"));
             }
+
+            if (m_ShuffleIcon)
+                m_ShuffleIcon->hide();
+
+            if (shuffle_icon_album)
+                shuffle_icon_album->show();
+
+            m_ShuffleIcon = shuffle_icon_album;
+
             music_tree_list->scrambleParents(true);
 
             if (class LCD *lcd = LCD::Get())
@@ -1608 +1637 @@
                 else
                     shuffle_button->setText(tr("Shuffle: None"));
             }
+
+            if (m_ShuffleIcon)
+                m_ShuffleIcon->hide();
+
+            m_ShuffleIcon = NULL;
+
             music_tree_list->scrambleParents(false);
 
             if (class LCD *lcd = LCD::Get())
@@ -1671 +1706 @@
     switch (repeatmode)
     {
         case REPEAT_ALL:
-            if (keyboard_accelerators)
-                repeat_button->setText(tr("2 Repeat: All"));
-            else
-                repeat_button->setText(tr("Repeat: All"));
+            if (repeat_button)
+            {
+                if (keyboard_accelerators)
+                        repeat_button->setText(tr("2 Repeat: All"));
+                else
+                        repeat_button->setText(tr("Repeat: All"));
+            }
+
+            if (m_RepeatIcon)
+                m_RepeatIcon->hide();
+
+            if (repeat_icon_all)
+                repeat_icon_all->show();
+
+            m_RepeatIcon = repeat_icon_all;
 
             if (class LCD *lcd = LCD::Get())
                 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_ALL);
@@ -1682 +1728 @@
             bannerEnable(tr("Repeat: All"), 4000);
             break;
         case REPEAT_TRACK:
-            if (keyboard_accelerators)
-                repeat_button->setText(tr("2 Repeat: Track"));
-            else
-                repeat_button->setText(tr("Repeat: Track"));
+            if (repeat_button)
+            {
+                if (keyboard_accelerators)
+                        repeat_button->setText(tr("2 Repeat: Track"));
+                else
+                        repeat_button->setText(tr("Repeat: Track"));
+            }
+
+            if (m_RepeatIcon)
+                m_RepeatIcon->hide();
+
+            if (repeat_icon_track)
+                repeat_icon_track->show();
+
+            m_RepeatIcon = repeat_icon_track;
 
             if (class LCD *lcd = LCD::Get())
                 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_TRACK);
@@ -1693 +1750 @@
             bannerEnable(tr("Repeat: Track"), 4000);
             break;
         default:
-            if (keyboard_accelerators)
-                repeat_button->setText(tr("2 Repeat: None"));
-            else
-                repeat_button->setText(tr("Repeat: None"));
+            if (repeat_button)
+            {
+                if (keyboard_accelerators)
+                        repeat_button->setText(tr("2 Repeat: None"));
+                else
+                        repeat_button->setText(tr("Repeat: None"));
+            }
+
+            if (m_RepeatIcon)
+                m_RepeatIcon->hide();
+
+            m_RepeatIcon = NULL;
 
             if (class LCD *lcd = LCD::Get())
                 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_NONE);
@@ -2217 +2334 @@
         connect(rew_button, SIGNAL(pushed()), this, SLOT(seekback()));
 
     pause_button = getUIPushButtonType("pause_button");
-    pause_button->setLockOn();
+    
     if (pause_button)
+    {
+        pause_button->setLockOn();
         connect(pause_button, SIGNAL(pushed(QString)), this,
         SLOT(handlePush(QString)));
+    }
 
     play_button = getUIPushButtonType("play_button");
-    play_button->setLockOn();
+    
     if (play_button)
+    {
+        play_button->setLockOn();
         connect(play_button, SIGNAL(pushed(QString)), this,
         SLOT(handlePush(QString)));
+    }
 
     stop_button = getUIPushButtonType("stop_button");
-    stop_button->setLockOn();
+    
     if (stop_button)
+    {
+        stop_button->setLockOn();
         connect(stop_button, SIGNAL(pushed(QString)), this,
         SLOT(handlePush(QString)));
+    }
 
     ff_button = getUIPushButtonType("ff_button");
     if (ff_button)
@@ -2250 +2376 @@
     if (repeat_button)
         connect(repeat_button, SIGNAL(pushed()), this, SLOT(toggleRepeat()));
 
+    shuffle_icon_random = getUIImageType("icon-shuffle-random");
+    shuffle_icon_intelligent = getUIImageType("icon-shuffle-intelligent");
+    shuffle_icon_album = getUIImageType("icon-shuffle-album");
+    
+    if (shuffle_icon_random)
+        shuffle_icon_random->hide();
+    
+    if (shuffle_icon_intelligent)
+        shuffle_icon_intelligent->hide();
+    
+    if (shuffle_icon_album)
+        shuffle_icon_album->hide();
+
+    repeat_icon_track = getUIImageType("icon-repeat-track");
+    repeat_icon_all   = getUIImageType("icon-repeat-all");
+    
+    if (repeat_icon_track)
+        repeat_icon_track->hide();
+    
+    if (repeat_icon_all)
+        repeat_icon_all->hide();
+
     pledit_button = getUITextButtonType("pledit_button");
     if (pledit_button)
         connect(pledit_button, SIGNAL(pushed()), this, SLOT(editPlaylist()));

./mythmusic/mythmusic/playbackbox.h

@@ -234 +234 @@
 
     UIPushButtonType      *m_pushedButton;
 
+    UIImageType           *m_ShuffleIcon;
+    UIImageType           *m_RepeatIcon;
+
+    UIImageType           *shuffle_icon_off;
+    UIImageType           *shuffle_icon_random;
+    UIImageType           *shuffle_icon_intelligent;
+    UIImageType           *shuffle_icon_album;
+
+    UIImageType           *repeat_icon_off;
+    UIImageType           *repeat_icon_track;
+    UIImageType           *repeat_icon_all;
+
     UITextButtonType      *shuffle_button;
     UITextButtonType      *repeat_button;
     UITextButtonType      *pledit_button;