Ticket #2685: albumart.diff

mythmusic/mythmusic/playbackbox.cpp

@@ -86 +86 @@
     showrating = gContext->GetNumSetting("MusicShowRatings", 0);
     listAsShuffled = gContext->GetNumSetting("ListAsShuffled", 0);
     cycle_visualizer = gContext->GetNumSetting("VisualCycleOnSongChange", 0);
+    show_album_art = gContext->GetNumSetting("AlbumArtOnSongChange", 0);
 
     // Through the magic of themes, our "GUI" already exists we just need to 
     // wire up it
@@ -1157 +1158 @@
         return;
     
     banner_timer->start(8000);
+    if (show_album_art)
+        mainvisual->forceVisual("AlbumArt");
     mainvisual->addInformation("\"" + mdata->Title() + "\"\n" + 
                                mdata->Artist() + " - " + mdata->Album());
 }
@@ -1173 +1176 @@
 {
     banner_timer->stop();
     mainvisual->addInformation("");
+    if (show_album_art)
+        mainvisual->unforceVisual();
 }
 
 void PlaybackBoxMusic::CycleVisualizer()

mythmusic/mythmusic/mainvisual.h

@@ -79 +79 @@
     void setVis( VisualBase *newvis );
     void setVisual( const QString &visualname );
 
+    void forceVisual ( const QString &visualname );
+    void unforceVisual();
+
     QString getCurrentVisual() const;
     QString getCurrentVisualDesc() const;
     int numVisualizers() const;
@@ -120 +123 @@
 
     QString current_visual_name;
     QStringList allowed_modes;
+
+    QString next_visual;
+    bool visual_forced;
 };
 
 class InfoWidget : public QWidget

mythmusic/mythmusic/globalsettings.cpp

@@ -356 +356 @@
     return gc;
 };
 
+static HostCheckBox *AlbumArtOnSongChange()
+{
+    HostCheckBox *gc = new HostCheckBox("AlbumArtOnSongChange");
+    gc->setLabel(QObject::tr("Show album art at start of each song"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("Show the album art when the song "
+                    "change."));
+    return gc;
+};
+
 static HostSpinBox *VisualScaleWidth()
 {
     HostSpinBox *gc = new HostSpinBox("VisualScaleWidth", 1, 2, 1);
@@ -566 +576 @@
     playersettings2->setLabel(QObject::tr("Visualization Settings"));
     playersettings2->addChild(VisualizationMode());
     playersettings2->addChild(VisualCycleOnSongChange());
+    playersettings2->addChild(AlbumArtOnSongChange());
     playersettings2->addChild(VisualModeDelay());
     playersettings2->addChild(VisualScaleWidth());
     playersettings2->addChild(VisualScaleHeight());

mythmusic/mythmusic/playbackbox.h

@@ -179 +179 @@
     GenericTree *playlist_tree;
     
     bool cycle_visualizer;
+    bool show_album_art;
     bool show_whole_tree;
     bool keyboard_accelerators;
     bool volume_control;

mythmusic/mythmusic/mainvisual.cpp

@@ -104 +104 @@
 MainVisual::MainVisual(QWidget *parent, const char *name)
     : QWidget( parent, name ), vis( 0 ), playing( FALSE ), fps( 20 )
 {
+    visual_forced = false;
+
     int screenwidth = 0, screenheight = 0;
     float wmult = 0, hmult = 0;
    
@@ -137 +139 @@
     nodes.clear();
 }
 
+void MainVisual::forceVisual( const QString &visualname )
+{
+    if (visual_forced)
+        return;
+    next_visual = getCurrentVisual();
+    setVisual(visualname);
+    visual_forced = true;
+}
+
+void MainVisual::unforceVisual(void)
+{
+    if (!visual_forced)
+        return;
+    visual_forced = false;
+    setVisual(next_visual);
+}
+
 void MainVisual::setVisual( const QString &visualname )
 {
+    if (visual_forced)
+    {
+        next_visual = visualname;
+        return;
+    }
+
     VisualBase *newvis = 0;
 
     allowed_modes = QStringList::split(",", visualname);
@@ -214 +239 @@
 
 QString MainVisual::getCurrentVisual(void) const
 {
+    if (visual_forced)
+        return next_visual;
+    //else
     return current_visual_name;
 }
 
@@ -221 +249 @@
 {
     /* XXX This should be changed to a real call to visual->description() 
      * it works as long as ::name and ::desc uses the same string */
+    if (visual_forced)
+        return next_visual;
+    //else
     return QObject::tr(current_visual_name);
 }