Move export of track metadata from TrackCollection into Library

4 files changed, 23 insertions, 35 deletions

diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp
index b6299c31db..43137c9e02 100644
--- a/src/library/recording/dlgrecording.cpp
+++ b/src/library/recording/dlgrecording.cpp
@@ -2,25 +2,25 @@
 
 #include "control/controlobject.h"
 #include "library/recording/dlgrecording.h"
-#include "library/trackcollection.h"
+#include "library/trackcollectionmanager.h"
 #include "widget/wwidget.h"
 #include "widget/wskincolor.h"
 #include "widget/wtracktableview.h"
 #include "util/assert.h"
 
 DlgRecording::DlgRecording(QWidget* parent, UserSettingsPointer pConfig,
-                           Library* pLibrary, TrackCollection* pTrackCollection,
+                           Library* pLibrary,
                            RecordingManager* pRecordingManager, KeyboardEventFilter* pKeyboard)
         : QWidget(parent),
           m_pConfig(pConfig),
-          m_pTrackCollection(pTrackCollection),
-          m_browseModel(this, m_pTrackCollection, pRecordingManager),
+          m_pTrackTableView(new WTrackTableView(this, pConfig, pLibrary->trackCollections(), true)),
+          m_browseModel(this, pLibrary->trackCollections(), pRecordingManager),
           m_proxyModel(&m_browseModel),
           m_bytesRecordedStr("--"),
           m_durationRecordedStr("--:--"),
           m_pRecordingManager(pRecordingManager) {
     setupUi(this);
-    m_pTrackTableView = new WTrackTableView(this, pConfig, m_pTrackCollection, true);
+
     m_pTrackTableView->installEventFilter(pKeyboard);
 
     connect(m_pTrackTableView,
diff --git a/src/library/recording/dlgrecording.h b/src/library/recording/dlgrecording.h
index 0851065d04..7136ad9157 100644
--- a/src/library/recording/dlgrecording.h
+++ b/src/library/recording/dlgrecording.h
@@ -20,7 +20,7 @@ class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual Lib
     Q_OBJECT
   public:
     DlgRecording(QWidget *parent, UserSettingsPointer pConfig,
-                 Library* pLibrary, TrackCollection* pTrackCollection,
+                 Library* pLibrary,
                  RecordingManager* pRecManager, KeyboardEventFilter* pKeyboard);
     ~DlgRecording() override;
 
@@ -50,7 +50,6 @@ class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual Lib
 
   private:
     UserSettingsPointer m_pConfig;
-    TrackCollection* m_pTrackCollection;
     WTrackTableView* m_pTrackTableView;
     BrowseTableModel m_browseModel;
     ProxyTrackModel m_proxyModel;
diff --git a/src/library/recording/recordingfeature.cpp b/src/library/recording/recordingfeature.cpp
index 1a0eef46ce..5c362db6ff 100644
--- a/src/library/recording/recordingfeature.cpp
+++ b/src/library/recording/recordingfeature.cpp
@@ -6,28 +6,24 @@
 #include "library/treeitem.h"
 #include "library/recording/recordingfeature.h"
 #include "library/library.h"
-#include "library/trackcollection.h"
 #include "widget/wlibrary.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
+#include "recording/recordingmanager.h"
 
-const QString RecordingFeature::m_sRecordingViewName = QString("Recording");
+namespace {
+
+const QString kViewName = "Recording";
+
+} // anonymous namespace
 
 RecordingFeature::RecordingFeature(Library* pLibrary,
                                    UserSettingsPointer pConfig,
-                                   TrackCollection* pTrackCollection,
                                    RecordingManager* pRecordingManager)
-        : LibraryFeature(pLibrary),
-          m_pConfig(pConfig),
-          m_pLibrary(pLibrary),
-          m_pTrackCollection(pTrackCollection),
+        : LibraryFeature(pLibrary, pConfig),
           m_pRecordingManager(pRecordingManager),
           m_icon(":/images/library/ic_library_recordings.svg") {
 }
 
-RecordingFeature::~RecordingFeature() {
-
-}
-
 QVariant RecordingFeature::title() {
     return QVariant(tr("Recordings"));
 }
@@ -45,12 +41,11 @@ void RecordingFeature::bindLibraryWidget(WLibrary* pLibraryWidget,
     DlgRecording* pRecordingView = new DlgRecording(pLibraryWidget,
                                                     m_pConfig,
                                                     m_pLibrary,
-                                                    m_pTrackCollection,
                                                     m_pRecordingManager,
                                                     keyboard);
 
     pRecordingView->installEventFilter(keyboard);
-    pLibraryWidget->registerView(m_sRecordingViewName, pRecordingView);
+    pLibraryWidget->registerView(kViewName, pRecordingView);
     connect(pRecordingView,
             &DlgRecording::loadTrack,
             this,
@@ -76,7 +71,7 @@ void RecordingFeature::bindLibraryWidget(WLibrary* pLibraryWidget,
 
 void RecordingFeature::activate() {
     emit(refreshBrowseModel());
-    emit(switchToView(m_sRecordingViewName));
+    emit(switchToView(kViewName));
     // Ask the view to emit a restoreSearch signal.
     emit(requestRestoreSearch());
     emit(enableCoverArtDisplay(false));
diff --git a/src/library/recording/recordingfeature.h b/src/library/recording/recordingfeature.h
index b794df2571..732f0664c5 100644
--- a/src/library/recording/recordingfeature.h
+++ b/src/library/recording/recordingfeature.h
@@ -12,22 +12,19 @@
 #include "library/browse/foldertreemodel.h"
 #include "library/libraryfeature.h"
 #include "library/proxytrackmodel.h"
-#include "recording/recordingmanager.h"
 
-class Library;
-class TrackCollection;
+class RecordingManager;
 
-class RecordingFeature : public LibraryFeature {
+class RecordingFeature final : public LibraryFeature {
     Q_OBJECT
   public:
     RecordingFeature(Library* parent,
                      UserSettingsPointer pConfig,
-                     TrackCollection* pTrackCollection,
                      RecordingManager* pRecordingManager);
-    virtual ~RecordingFeature();
+    ~RecordingFeature() override = default;
 
-    QVariant title();
-    QIcon getIcon();
+    QVariant title() override;
+    QIcon getIcon() override;
 
     void bindLibraryWidget(WLibrary* libraryWidget,
                     KeyboardEventFilter* keyboard);
@@ -43,13 +40,10 @@ class RecordingFeature : public LibraryFeature {
     void refreshBrowseModel();
 
   private:
-    UserSettingsPointer m_pConfig;
-    Library* m_pLibrary;
-    TrackCollection* m_pTrackCollection;
+    RecordingManager* const m_pRecordingManager;
+    const QIcon m_icon;
+
     FolderTreeModel m_childModel;
-    const static QString m_sRecordingViewName;
-    RecordingManager* m_pRecordingManager;
-    QIcon m_icon;
 };
 
 #endif