mixxxdj · kain88-de · Nov 5, 2014 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014
diff --git a/build/depends.py b/build/depends.py
@@ -729,6 +729,7 @@ def sources(self, build):
                    "library/missingtablemodel.cpp",
                    "library/hiddentablemodel.cpp",
                    "library/proxytrackmodel.cpp",
+                   "library/coverart.cpp",
                    "library/coverartcache.cpp",
 
                    "library/playlisttablemodel.cpp",
@@ -780,7 +781,6 @@ def sources(self, build):
                    "library/dao/libraryhashdao.cpp",
                    "library/dao/settingsdao.cpp",
                    "library/dao/analysisdao.cpp",
-                   "library/dao/coverartdao.cpp",
 
                    "library/librarycontrol.cpp",
                    "library/schemamanager.cpp",

diff --git a/res/schema.xml b/res/schema.xml
@@ -385,15 +385,14 @@ METADATA
   </revision>
   <revision version="24" min_compatible="3">
     <description>
-      Add cover art support
+      Add cover art support. Default source is UNKNOWN and default type is NONE.
+      See library/coverart.h.
     </description>
     <sql>
-      CREATE TABLE IF NOT EXISTS cover_art (
-        id INTEGER primary key AUTOINCREMENT,
-        location TEXT,
-	hash TEXT UNIQUE
-      );
-      ALTER TABLE library ADD COLUMN cover_art INTEGER DEFAULT NULL REFERENCES covert_art(id);
+      ALTER TABLE library ADD COLUMN coverart_source INTEGER DEFAULT 0;
+      ALTER TABLE library ADD COLUMN coverart_type INTEGER DEFAULT 0;
+      ALTER TABLE library ADD COLUMN coverart_location TEXT DEFAULT "";
+      ALTER TABLE library ADD COLUMN coverart_hash INTEGER DEFAULT 0;
     </sql>
   </revision>
 </schema>
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
@@ -8,80 +8,92 @@
 <Template>
   <WidgetGroup>
     <ObjectName>DeckTextRow</ObjectName>
-    <Layout>vertical</Layout>
+    <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
+      <CoverArt>
+        <ObjectName>DeckCoverArt</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <MinimumSize>58,58</MinimumSize>
+        <Group><Variable name="group"/></Group>
+      </CoverArt>
       <WidgetGroup>
-        <ObjectName>UpperTextRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <!-- When TextRow is laid out, we need to ignore our children. Otherwise
-             decks might end up with different widths based on the size of the
-             labels in this row -->
-        <SizePolicy>i,max</SizePolicy>
+        <ObjectName>DeckTextColumn</ObjectName>
+        <Layout>vertical</Layout>
         <Children>
           <WidgetGroup>
-            <ObjectName>TitleGutter</ObjectName>
+            <ObjectName>UpperTextRow</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <!-- When TextRow is laid out, we need to ignore our children. Otherwise
+                 decks might end up with different widths based on the size of the
+                 labels in this row -->
+            <SizePolicy>i,max</SizePolicy>
             <Children>
-              <TrackProperty>
-                <TooltipId>track_title</TooltipId>
-                <SizePolicy>me,min</SizePolicy>
-                <Property>title</Property>
-                <Group><Variable name="group"/></Group>
-              </TrackProperty>
               <WidgetGroup>
-                <ObjectName>BPMGutter</ObjectName>
+                <ObjectName>TitleGutter</ObjectName>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <Key>
+                  <TrackProperty>
+                    <TooltipId>track_title</TooltipId>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Property>title</Property>
                     <Group><Variable name="group"/></Group>
-                    <SizePolicy>min,</SizePolicy>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                    </Connection>
-                  </Key>
-                  <NumberBpm>
-                    <Group><Variable name="group"/></Group>
-                    <SizePolicy>min,</SizePolicy>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                    </Connection>
-                  </NumberBpm>
+                  </TrackProperty>
+                  <WidgetGroup>
+                    <ObjectName>BPMGutter</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,max</SizePolicy>
+                    <Children>
+                      <Key>
+                        <Group><Variable name="group"/></Group>
+                        <SizePolicy>min,</SizePolicy>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                        </Connection>
+                      </Key>
+                      <NumberBpm>
+                        <Group><Variable name="group"/></Group>
+                        <SizePolicy>min,</SizePolicy>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
+                        </Connection>
+                      </NumberBpm>
+                    </Children>
+                  </WidgetGroup>
                 </Children>
               </WidgetGroup>
             </Children>
           </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-      <WidgetGroup>
-        <ObjectName>LowerTextRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <!-- When TextRow is laid out, we need to ignore our children. Otherwise
-             decks might end up with different widths based on the size of the
-             labels in this row -->
-        <SizePolicy>i,max</SizePolicy>
-        <Children>
           <WidgetGroup>
-            <ObjectName>ArtistGutter</ObjectName>
+            <ObjectName>LowerTextRow</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
+            <!-- When TextRow is laid out, we need to ignore our children. Otherwise
+                 decks might end up with different widths based on the size of the
+                 labels in this row -->
+            <SizePolicy>i,max</SizePolicy>
             <Children>
-              <TrackProperty>
-                <TooltipId>track_artist</TooltipId>
-                <Property>artist</Property>
-                <SizePolicy>me,min</SizePolicy>
-                <Group><Variable name="group"/></Group>
-              </TrackProperty>
               <WidgetGroup>
-                <ObjectName>PositionGutter</ObjectName>
+                <ObjectName>ArtistGutter</ObjectName>
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
+                <SizePolicy>me,max</SizePolicy>
                 <Children>
-                  <NumberPos>
+                  <TrackProperty>
+                    <TooltipId>track_artist</TooltipId>
+                    <Property>artist</Property>
+                    <SizePolicy>me,min</SizePolicy>
                     <Group><Variable name="group"/></Group>
-                  </NumberPos>
+                  </TrackProperty>
+                  <WidgetGroup>
+                    <ObjectName>PositionGutter</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,max</SizePolicy>
+                    <Children>
+                      <NumberPos>
+                        <Group><Variable name="group"/></Group>
+                      </NumberPos>
+                    </Children>
+                  </WidgetGroup>
                 </Children>
               </WidgetGroup>
             </Children>

diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
@@ -41,6 +41,10 @@
                   </WidgetGroup>
                   <LibrarySidebar>
                   </LibrarySidebar>
+                  <CoverArt>
+                    <SizePolicy>me,me</SizePolicy>
+                    <MinimumSize>100,100</MinimumSize>
+                  </CoverArt>
                 </Children>
               </WidgetGroup>
               <Library>

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -8,8 +8,13 @@
   border: 1px solid #555;
 }
 
-#UpperTextRow {
+#DeckTextRow {
   border-top: 1px solid #555;
+}
+
+#UpperTextRow {
+  /* top 0px seems required for bottom 1px to work O_o */
+  border-top: 0px solid #555;
   border-bottom: 1px solid #555;
 }
 

diff --git a/src/basetrackplayer.cpp b/src/basetrackplayer.cpp
@@ -214,7 +214,7 @@ void BaseTrackPlayer::slotFinishLoading(TrackPointer pTrackInfoObject)
     m_replaygainPending = false;
     // Read the tags if required
     if (!m_pLoadedTrack->getHeaderParsed()) {
-        m_pLoadedTrack->parse();
+        m_pLoadedTrack->parse(false);
     }
 
     // m_pLoadedTrack->setPlayedAndUpdatePlaycount(true); // Actually the song is loaded but not played

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
@@ -687,7 +687,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                tr("Show/hide the preview deck"), guiMenu);
     addControl("[Library]", "show_coverart",
                tr("Cover Art Show/Hide"),
-               tr("Show/hide the cover art"), guiMenu);
+               tr("Show/hide cover art"), guiMenu);
 
     const int iNumDecks = ControlObject::get(ConfigKey("[Master]", "num_decks"));
     QString spinnyTitle = tr("Vinyl Spinner Show/Hide");

diff --git a/src/dlganalysis.cpp b/src/dlganalysis.cpp
@@ -27,8 +27,8 @@ DlgAnalysis::DlgAnalysis(QWidget* parent,
     connect(m_pAnalysisLibraryTableView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
 
-    connect(m_pAnalysisLibraryTableView, SIGNAL(loadCoverArt(CoverInfo, bool)),
-            this, SIGNAL(loadCoverArt(CoverInfo, bool)));
+    connect(m_pAnalysisLibraryTableView, SIGNAL(trackSelected(TrackPointer)),
+            this, SIGNAL(trackSelected(TrackPointer)));
 
     QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
     Q_ASSERT(box); // Assumes the form layout is a QVBox/QHBoxLayout!

diff --git a/src/dlganalysis.h b/src/dlganalysis.h
@@ -4,7 +4,6 @@
 #include <QItemSelection>
 #include "ui_dlganalysis.h"
 #include "configobject.h"
-#include "library/coverartcache.h"
 #include "library/libraryview.h"
 #include "library/trackcollection.h"
 #include "library/analysislibrarytablemodel.h"
@@ -48,7 +47,7 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra
     void loadTrackToPlayer(TrackPointer pTrack, QString player);
     void analyzeTracks(QList<int> trackIds);
     void stopAnalysis();
-    void loadCoverArt(CoverInfo info, bool cachedOnly);
+    void trackSelected(TrackPointer pTrack);
 
   private:
     //Note m_pTrackTablePlaceholder is defined in the .ui file

diff --git a/src/dlgautodj.cpp b/src/dlgautodj.cpp
@@ -39,8 +39,8 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
     connect(m_pTrackTableView, SIGNAL(loadTrackToPlayer(TrackPointer, QString, bool)),
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString, bool)));
 
-    connect(m_pTrackTableView, SIGNAL(loadCoverArt(CoverInfo, bool)),
-            this, SIGNAL(loadCoverArt(CoverInfo, bool)));
+    connect(m_pTrackTableView, SIGNAL(trackSelected(TrackPointer)),
+            this, SIGNAL(trackSelected(TrackPointer)));
 
     QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
     Q_ASSERT(box); //Assumes the form layout is a QVBox/QHBoxLayout!

diff --git a/src/dlgautodj.h b/src/dlgautodj.h
@@ -6,7 +6,6 @@
 #include "configobject.h"
 #include "controlpushbutton.h"
 #include "trackinfoobject.h"
-#include "library/coverartcache.h"
 #include "library/libraryview.h"
 #include "library/trackcollection.h"
 #include "library/dao/playlistdao.h"
@@ -52,7 +51,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void addRandomButton(bool buttonChecked);
     void loadTrack(TrackPointer tio);
     void loadTrackToPlayer(TrackPointer tio, QString group, bool);
-    void loadCoverArt(CoverInfo info, bool cachedOnly);
+    void trackSelected(TrackPointer pTrack);
 
   private:
     enum ADJstates {

diff --git a/src/dlgcoverartfullsize.cpp b/src/dlgcoverartfullsize.cpp
@@ -1,6 +1,7 @@
 #include <QDesktopWidget>
 
 #include "dlgcoverartfullsize.h"
+#include "library/coverartutils.h"
 
 DlgCoverArtFullSize::DlgCoverArtFullSize(QWidget* parent)
         : QDialog(parent) {
@@ -12,37 +13,27 @@ DlgCoverArtFullSize::~DlgCoverArtFullSize() {
 }
 
 void DlgCoverArtFullSize::init(CoverInfo info) {
-    // this cannot be null
-    QWidget* activeWindow = QApplication::activeWindow();
-    if (!activeWindow) {
-        return;
-    }
-
-    CoverArtCache* cache = CoverArtCache::instance();
-    if (info.coverLocation.isEmpty()) {
-        info.coverLocation = cache->trackInDBHash(info.trackId);
-    }
-
-    if (info.coverLocation == cache->getDefaultCoverLocation())  {
-        return;
-    }
-
+    // TODO(rryan): don't do this in the main thread
+    QImage cover = CoverArtUtils::loadCover(info);
     QPixmap pixmap;
-    if (info.coverLocation == "ID3TAG") {
-        pixmap.convertFromImage(
-            cache->extractEmbeddedCover(info.trackLocation));
-    } else {
-        pixmap = QPixmap(info.coverLocation);
+    if (!cover.isNull()) {
+        pixmap.convertFromImage(cover);
     }
 
     if (pixmap.isNull()) {
         return;
     }
 
+    QWidgetList windows = QApplication::topLevelWidgets();
+    QSize largestWindowSize;
+    foreach (QWidget* pWidget, windows) {
+        largestWindowSize = largestWindowSize.expandedTo(pWidget->size());
+    }
+
     // If cover is bigger than Mixxx, it must be resized!
     // In this case, it need to do a small adjust to make
     // this dlg a bit smaller than the Mixxx window.
-    QSize mixxxSize = activeWindow->size() / qreal(1.2);
+    QSize mixxxSize = largestWindowSize / qreal(1.2);
     if (pixmap.height() > mixxxSize.height()
             || pixmap.width() > mixxxSize.width()) {
         pixmap = pixmap.scaled(
@@ -54,4 +45,5 @@ void DlgCoverArtFullSize::init(CoverInfo info) {
     show();
     move(QApplication::desktop()->screenGeometry().center() - rect().center());
     raise();
+    activateWindow();
 }
diff --git a/src/dlgcoverartfullsize.h b/src/dlgcoverartfullsize.h
@@ -4,12 +4,11 @@
 #include <QDialog>
 
 #include "ui_dlgcoverartfullsize.h"
-#include "library/coverartcache.h"
+#include "library/coverart.h"
 
 class DlgCoverArtFullSize
         : public QDialog,
-          public Ui::DlgCoverArtFullSize
-{
+          public Ui::DlgCoverArtFullSize {
     Q_OBJECT
   public:
     DlgCoverArtFullSize(QWidget* parent=0);

diff --git a/src/dlghidden.cpp b/src/dlghidden.cpp
@@ -38,8 +38,8 @@ DlgHidden::DlgHidden(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
             this,
             SLOT(selectionChanged(const QItemSelection&, const QItemSelection&)));
 
-    connect(m_pTrackTableView, SIGNAL(loadCoverArt(CoverInfo, bool)),
-            this, SIGNAL(loadCoverArt(CoverInfo, bool)));
+    connect(m_pTrackTableView, SIGNAL(trackSelected(TrackPointer)),
+            this, SIGNAL(trackSelected(TrackPointer)));
 }
 
 DlgHidden::~DlgHidden() {

diff --git a/src/dlghidden.h b/src/dlghidden.h
@@ -3,7 +3,6 @@
 
 #include "ui_dlghidden.h"
 #include "configobject.h"
-#include "library/coverartcache.h"
 #include "library/libraryview.h"
 #include "library/trackcollection.h"
 #include "mixxxkeyboard.h"
@@ -28,7 +27,7 @@ class DlgHidden : public QWidget, public Ui::DlgHidden, public LibraryView {
     void selectionChanged(const QItemSelection&, const QItemSelection&);
 
   signals:
-    void loadCoverArt(CoverInfo info, bool cachedOnly);
+    void trackSelected(TrackPointer pTrack);
 
   private:
     void activateButtons(bool enable);

diff --git a/src/dlgmissing.cpp b/src/dlgmissing.cpp
@@ -33,8 +33,8 @@ DlgMissing::DlgMissing(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
             this,
             SLOT(selectionChanged(const QItemSelection&, const QItemSelection&)));
 
-    connect(m_pTrackTableView, SIGNAL(loadCoverArt(CoverInfo, bool)),
-            this, SIGNAL(loadCoverArt(CoverInfo, bool)));
+    connect(m_pTrackTableView, SIGNAL(trackSelected(TrackPointer)),
+            this, SIGNAL(trackSelected(TrackPointer)));
 }
 
 DlgMissing::~DlgMissing() {