Merge remote-tracking branch 'cardinot/coverArtSupport' into

coverart_test

* Update WTrackTableView changes to match new WCoverArtMenu behavior.
* Remove DirectoryDAO integration for now.

Conflicts:
	src/library/coverartcache.cpp
	src/library/coverartcache.h
	src/widget/wcoverartmenu.cpp
	src/widget/wcoverartmenu.h

1 files changed, 2 insertions, 8 deletions

diff --git a/src/widget/wcoverartmenu.cpp b/src/widget/wcoverartmenu.cpp
index 8908981df2..5fe19713bd 100644
--- a/src/widget/wcoverartmenu.cpp
+++ b/src/widget/wcoverartmenu.cpp
@@ -32,15 +32,9 @@ void WCoverArtMenu::createActions() {
     addAction(m_pReload);
 }
 
-void WCoverArtMenu::clear() {
-    m_coverInfo = CoverInfo();
-    m_pTrack.clear();
-}
-
-void WCoverArtMenu::show(QPoint pos, CoverInfo info, TrackPointer pTrack) {
-    m_coverInfo = info;
+void WCoverArtMenu::setCoverArt(TrackPointer pTrack, const CoverInfo& info) {
     m_pTrack = pTrack;
-    popup(pos);
+    m_coverInfo = info;
 }
 
 void WCoverArtMenu::slotChange() {