Ticket #3676: mythmusic.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);
@@ -2027 +2092 @@
             ratings_image->setRepeat(0);
         if (current_visualization_text)
             current_visualization_text->SetText("");
+
+                if (albumart_image)
+                        WipeAlbumArt();
 }
 
 void PlaybackBoxMusic::updateTrackInfo(Metadata *mdata)
@@ -2038 +2106 @@
     if (album_text)
         album_text->SetText(mdata->Album());
 
+        if (albumart_image)
+                ShowAlbumArtImage(mdata);
+
     setTrackOnLCD(mdata);
 }
 
+void PlaybackBoxMusic::ShowAlbumArtImage(Metadata *mdata)
+{
+        QSize img_size = albumart_image->GetSize(true);
+
+        QImage albumArt = mdata->getAlbumArt(IT_FRONTCOVER);
+
+        if (!albumArt.isNull())
+    {
+                // draw the albumArt image
+                albumArt = albumArt.smoothScale(img_size.width(), img_size.height(), QImage::ScaleMin);
+
+                QPixmap img(img_size.width(), img_size.height());
+
+                if (img.convertFromImage(albumArt))
+                {               
+                        albumart_image->SetImage(img);
+                        albumart_image->show();
+                }
+                else
+                        albumart_image->hide();
+        }
+        else
+                albumart_image->hide();
+}
+
+void PlaybackBoxMusic::WipeAlbumArt()
+{
+        albumart_image->hide();
+}
+
 void PlaybackBoxMusic::openOutputDevice(void)
 {
     QString adevice;
@@ -2207 +2308 @@
     }
     visual_blackhole = getUIBlackHoleType("visual_blackhole");
 
+    albumart_image   = getUIImageType("albumart");
+    albumart_image->hide();
+
     //  Buttons
     prev_button = getUIPushButtonType("prev_button");
     if (prev_button)
@@ -2250 +2354 @@
     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");
+    shuffle_icon_random->hide();
+    shuffle_icon_intelligent->hide();
+    shuffle_icon_album->hide();
+
+    repeat_icon_track = getUIImageType("icon-repeat-track");
+    repeat_icon_all = getUIImageType("icon-repeat-all");
+    repeat_icon_track->hide();
+    repeat_icon_all->hide();
+
     pledit_button = getUITextButtonType("pledit_button");
     if (pledit_button)
         connect(pledit_button, SIGNAL(pushed()), this, SLOT(editPlaylist()));

./mythmusic/mythmusic/playbackbox.h

@@ -76 +76 @@
     void toggleFullBlankVisualizer();
     void end();
     void resetScrollCount();
+    void ShowAlbumArtImage(Metadata *mdata);
+    void WipeAlbumArt();
 
     void handlePush(QString buttonname);
 
@@ -234 +236 @@
 
     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;
+        UIImageType               *albumart_image;
+
     UITextButtonType      *shuffle_button;
     UITextButtonType      *repeat_button;
     UITextButtonType      *pledit_button;