Ticket #2942: albumart.patch

mythplugins/mythmusic/mythmusic/playbackbox.cpp

@@ -23 +23 @@
 #include "decoder.h"
 #include "playbackbox.h"
 #include "databasebox.h"
+#include "metaio.h"
 #include "mainvisual.h"
 #include "smartplaylist.h"
 #include "search.h"
@@ -1157 +1158 @@
         return;
     
     banner_timer->start(8000);
-    mainvisual->addInformation("\"" + mdata->Title() + "\"\n" + 
+    MetaIO *tagger = decoder->doCreateTagger();
+    QByteArray img_array(tagger->getAlbumArt(curMeta->Filename()));
+    QImage image(img_array);
+    mainvisual->addInformation(image, "\"" + mdata->Title() + "\"\n" + 
                                mdata->Artist() + " - " + mdata->Album());
 }
 
@@ -1172 +1176 @@
 void PlaybackBoxMusic::bannerDisable()
 {
     banner_timer->stop();
-    mainvisual->addInformation("");
+    mainvisual->clearInformation();
 }
 
 void PlaybackBoxMusic::CycleVisualizer()

mythplugins/mythmusic/mythmusic/visualize.cpp

@@ -11 +11 @@
 
 #include <cmath>
 #include "mainvisual.h"
+#include "metaio.h"
 #include "visualize.h"
 #include "inlines.h"
 #include "decoder.h"
@@ -18 +19 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qimage.h>
-#include <qdir.h>
 #include <qurl.h>
 
 #include <iostream>
@@ -327 +327 @@
         return true;
 
     if (filename != pParent->decoder()->getFilename()) {
-        QString curdir = QUrl(pParent->decoder()->getFilename()).dirPath();
-        if (directory != curdir)
-            return true;
+        return true;
     }
 
     return false;
 }
 
-QString AlbumArt::getImageFilename() 
+QByteArray AlbumArt::getImage() 
 {
-    QString result;
-    QString curfile = pParent->decoder()->getFilename();
-    QString curdir = QUrl(curfile).dirPath();
-    QString namefilter = gContext->GetSetting("AlbumArtFilter",
-                                              "*.png;*.jpg;*.jpeg;*.gif;*.bmp");
-    // Get directory contents based on filter
-    QDir folder(curdir, namefilter, QDir::Name | QDir::IgnoreCase, 
-                QDir::Files | QDir::Hidden);
-    
-    if (folder.count())
-        result = folder[rand() % folder.count()];
-
-    result.prepend("/");
-    result.prepend(curdir);
-    
+    QByteArray result;
+    MetaIO *tagger = pParent->decoder()->doCreateTagger();
+    if (tagger) {
+        result = tagger->getAlbumArt(pParent->decoder()->getFilename());
+        delete tagger;
+    }
     return result;
 }
 
@@ -363 +352 @@
     // If the directory has changed (new album) or the size, reload
     if (needsUpdate())
     {
-        QImage art(getImageFilename());
+        QImage art(getImage());
         if (art.isNull())
-        {
-            drawWarning(p, back, size, QObject::tr("?"));
-            cursize = size;
-            return true;
-        }
-        image = art.smoothScale(size, QImage::ScaleMin);
+            image.reset();
+        else
+            image = art.smoothScale(size, QImage::ScaleMin);
+
+        // Store the new filename
+        filename = pParent->decoder()->getFilename();
     }
 
     // Paint the image
     p->fillRect(0, 0, size.width(), size.height(), back);
-    p->drawPixmap((size.width() - image.width()) / 2,
-                  (size.height() - image.height()) / 2,
-                  image);
+    if (image.isNull())
+        drawWarning(p, back, size, QObject::tr("?"));
+    else
+        p->drawPixmap((size.width() - image.width()) / 2,
+                      (size.height() - image.height()) / 2,
+                      image);
     
     // Store our new size
     cursize = size;

mythplugins/mythmusic/mythmusic/mainvisual.h

@@ -97 +97 @@
     void setFrameRate( int newfps );
     int frameRate() const { return fps; }
 
+    void addInformation(const QImage &img, const QString &);
     void addInformation(const QString &);
+        void clearInformation();
 
     static void registerVisFactory(VisFactory *);
     static VisualBase *createVis(const QString &name,
@@ -128 +130 @@
 
 public:
     InfoWidget(QWidget *parent = 0);
-    void addInformation(const QString &);
+    void addInformation(const QString &, const QImage *img = 0);
+        void clearInformation();
     void paintEvent(QPaintEvent *);
 
 private:

mythplugins/mythmusic/mythmusic/metaio.h

@@ -16 +16 @@
     
     virtual bool write(Metadata* mdata, bool exclusive = false) = 0;
     virtual Metadata* read(QString filename) = 0;
+        virtual QByteArray getAlbumArt(const QString &filename);
 
     void readFromFilename(QString filename, QString &artist, QString &album, 
                           QString &title, QString &genre, int &tracknum);

mythplugins/mythmusic/mythmusic/metaioid3v2.h

@@ -20 +20 @@
     
     bool write(Metadata* mdata, bool exclusive = false);
     Metadata* read(QString filename);
+        QByteArray getAlbumArt(const QString &filename);
     
 private:
     int getTrackLength(QString filename);

mythplugins/mythmusic/mythmusic/mainvisual.cpp

@@ -373 +373 @@
     visfactories->append(vis);
 }
 
+void MainVisual::addInformation(const QImage &img, const QString &new_info) {
+    info_widget->addInformation(new_info, &img);
+}
+
 void MainVisual::addInformation(const QString &new_info) {
     info_widget->addInformation(new_info);
 }
 
+void MainVisual::clearInformation() {
+    info_widget->clearInformation();
+}
+
 VisualBase *MainVisual::createVis(const QString &name, MainVisual *parent,
                                   long int winid)
 {
@@ -426 +434 @@
     hide();
 }
 
-void InfoWidget::addInformation(const QString &new_info) {
+void InfoWidget::addInformation(const QString &new_info, const QImage *img) {
     if (new_info == info)
         return;
     
@@ -440 +448 @@
     info_pixmap = QPixmap(width(), height()/*, pixmap.depth ()*/);
     QPainter p(&info_pixmap);
 
-    int indent = int(info_pixmap.width() * 0.02);
+    int text_indent = int(info_pixmap.width() * 0.02);
+    int img_indent = int(info_pixmap.width() * 0.01);
 
     p.fillRect(0, 0,
                info_pixmap.width(), info_pixmap.height(),
@@ -450 +459 @@
     p.setFont(gContext->GetMediumFont());
 
     QFontMetrics fm(p.font());
-    int width = fm.width(info);
-    int height = fm.height() * (info.contains("\n") + 1);
-    int x = indent;
-    int y = indent;
+    int text_width = fm.width(info);
+    int text_height = fm.height() * (info.contains("\n") + 1);
+    int text_x = text_indent;
+    int text_y = text_indent;
 
+    if (img && !img->isNull()) {
+        text_x += info_pixmap.height();
+        int img_height = info_pixmap.height() - 2 * img_indent;
+        QRect rect(img_indent, img_indent, img_height, img_height);
+        p.drawImage(rect, img->smoothScale (rect.size(), QImage::ScaleMin));
+    }
+
     QString info_copy = info;
-    for (int offset = 0; offset < height; offset += fm.height()) {
+    for (int offset = 0; offset < text_height; offset += fm.height()) {
         QString l = info_copy.left(info_copy.find("\n"));
         p.setPen(Qt::black);
-        p.drawText(x + 2, y + offset + 2, width, height, Qt::AlignLeft, l);
+        p.drawText(text_x + 2, text_y + offset + 2, text_width, text_height, Qt::AlignLeft, l);
         p.setPen(Qt::white);
-        p.drawText(x, y + offset, width, height, Qt::AlignLeft, l);
+        p.drawText(text_x, text_y + offset, text_width, text_height, Qt::AlignLeft, l);
         info_copy.remove(0, l.length () + 1);
     }
 
@@ -469 +485 @@
     repaint();
 }
 
+void InfoWidget::clearInformation() {
+    addInformation("", 0);
+}
+
 void InfoWidget::paintEvent ( QPaintEvent * ) 
 {
     bitBlt(this, 0, 0, &info_pixmap); 

mythplugins/mythmusic/mythmusic/metaio.cpp

@@ -2 +2 @@
 
 #include "metaio.h"
 #include "metadata.h"
+#include <qdir.h>
+#include <qurl.h>
 #include <mythtv/mythcontext.h>
 
 //==========================================================================
@@ -104 +106 @@
 
     return retdata;
 }
+
+//==========================================================================
+/*!
+ * \brief Retrieve the albumart.
+ *
+ * The default implementation picks a random image file from the
+ * directory in which the file is.
+ *
+ * \param filename The filename to try and determin metadata for.
+ * \returns A QByteArray that can be passed to QImage or such.
+ */
+QByteArray MetaIO::getAlbumArt(const QString &filename)
+{
+    QString curdir = QUrl(filename).dirPath();
+    QString namefilter = gContext->GetSetting("AlbumArtFilter",
+                                              "*.png;*.jpg;*.jpeg;*.gif;*.bmp");
+    // Get directory contents based on filter
+    QDir folder(curdir, namefilter, QDir::Name | QDir::IgnoreCase, 
+                QDir::Files | QDir::Hidden);
+    
+    if (!folder.count())
+        return QByteArray();
+    
+    QString result = folder[rand() % folder.count()];
+    result.prepend("/");
+    result.prepend(curdir);
+    
+    QFile file(result);
+    file.open(IO_ReadOnly);
+    if (!file.isOpen())
+        return QByteArray();
+
+    return file.readAll();
+}

mythplugins/mythmusic/mythmusic/visualize.h

@@ -94 +94 @@
     bool process(VisualNode *node = 0);
     bool draw(QPainter *p, const QColor &back = Qt::black);
     bool needsUpdate();
-    QString getImageFilename();
+    QByteArray getImage();
 
   private:
     QSize size, cursize;

mythplugins/mythmusic/mythmusic/metaioid3v2.cpp

@@ -15 +15 @@
 
 #include <mythtv/mythcontext.h>
 
+id3_file *openFile(const QString &filename, id3_file_mode mode) {
+    id3_file *f = id3_file_open(filename.local8Bit(), mode);
+    if (!f)
+        f = id3_file_open(filename.ascii(), mode);
+    return f;
+}
+
 //==========================================================================
 MetaIOID3v2::MetaIOID3v2(void)
     : MetaIO(".mp3")
@@ -43 +50 @@
     if (!mdata)
         return false;
 
-    id3_file* p_input = NULL;
-    
-    p_input = id3_file_open(mdata->Filename().local8Bit(), ID3_FILE_MODE_READWRITE);
+    id3_file* p_input = openFile(mdata->Filename().local8Bit(), ID3_FILE_MODE_READWRITE);
     if (!p_input)
-        p_input = id3_file_open(mdata->Filename().ascii(), ID3_FILE_MODE_READWRITE);
-  
-    if (!p_input)
       return false;
 
     // We don't like id3v1 tags... too limiting.
@@ -178 +180 @@
     bool compilation = false;
     id3_file *p_input = NULL;
     
-    p_input = id3_file_open(filename.local8Bit(), ID3_FILE_MODE_READONLY);
-    if (!p_input)
-        p_input = id3_file_open(filename.ascii(), ID3_FILE_MODE_READONLY);
-
+    p_input = openFile(filename, ID3_FILE_MODE_READONLY);
     if (p_input)
     {
         id3_tag *tag = id3_file_tag(p_input);
@@ -596 +595 @@
 
     return true;
 }
+
+//==========================================================================
+/*!
+ * \brief Function to set an individual comment in an ID3v2 Tag
+ *
+ * \param pTag Pointer to a id3_file object
+ * \param pLabel The label of the comment you want
+ * \param value A reference to the data you want to write
+ * \param desc An optional description (frame type pLabel must support this)
+ * \returns Nothing
+ */
+QByteArray MetaIOID3v2::getAlbumArt(const QString &filename)
+{
+    id3_file *file = openFile(filename, ID3_FILE_MODE_READONLY);
+    if (!file)
+        return MetaIO::getAlbumArt(filename);
+
+    id3_tag *tag = id3_file_tag(file);
+    if (!tag) {
+        id3_file_close(file);
+        return MetaIO::getAlbumArt(filename);
+    }
+
+    struct id3_frame *p_frame = 0;
+    for (int i=0; NULL != (p_frame = id3_tag_findframe(tag, "APIC", i)); ++i) {
+        for (unsigned int f = 0; f < p_frame->nfields; ++f) {
+            id3_field *field = &(p_frame->fields[f]);
+            if (field->type == ID3_FIELD_TYPE_BINARYDATA) {
+                QByteArray data;
+                data.duplicate((char*)field->binary.data, (size_t)field->binary.length);
+                id3_file_close(file);
+                return data;
+            }
+        }
+    }
+
+    id3_file_close(file);
+    return MetaIO::getAlbumArt(filename);
+}