From 475f9e09cf6ef3c8df86fc69c56921573a9b36b6 Mon Sep 17 00:00:00 2001
From: Harshit Maurya <hmaurya999@gmail.com>
Date: Wed, 22 Apr 2020 16:14:54 +0530
Subject: [PATCH 1/2] WTrackTableView: bring back load track overrides

---
 src/widget/wtracktableview.cpp | 31 +++++++++++++++++++++++++++++++
 src/widget/wtracktableview.h   |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 651dd25c514..fec27b5557b 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -736,6 +736,37 @@ void WTrackTableView::keyPressEvent(QKeyEvent* event) {
     }
 }
 
+void WTrackTableView::loadSelectedTrack() {
+    auto indices = selectionModel()->selectedRows();
+    if (indices.size() > 0) {
+        slotMouseDoubleClicked(indices.at(0));
+    }
+}
+
+void WTrackTableView::loadSelectedTrackToGroup(QString group, bool play) {
+    auto indices = selectionModel()->selectedRows();
+    if (indices.size() > 0) {
+        // If the track load override is disabled, check to see if a track is
+        // playing before trying to load it
+        if (!(m_pConfig->getValueString(
+                               ConfigKey("[Controls]", "AllowTrackLoadToPlayingDeck"))
+                            .toInt())) {
+            // TODO(XXX): Check for other than just the first preview deck.
+            if (group != "[PreviewDeck1]" &&
+                    ControlObject::get(ConfigKey(group, "play")) > 0.0) {
+                return;
+            }
+        }
+        auto index = indices.at(0);
+        auto trackModel = getTrackModel();
+        TrackPointer pTrack;
+        if (trackModel &&
+                (pTrack = trackModel->getTrack(index))) {
+            emit loadTrackToPlayer(pTrack, group, play);
+        }
+    }
+}
+
 QList<TrackId> WTrackTableView::getSelectedTrackIds() const {
     QList<TrackId> trackIds;
 
diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index 3d7a41dfd09..a0cbdcfa4a2 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -38,6 +38,8 @@ class WTrackTableView : public WLibraryTableView {
     void onShow() override;
     bool hasFocus() const override;
     void keyPressEvent(QKeyEvent* event) override;
+    void loadSelectedTrack() override;
+    void loadSelectedTrackToGroup(QString group, bool play = false) override;
     void assignNextTrackColor() override;
     void assignPreviousTrackColor() override;
     QList<TrackId> getSelectedTrackIds() const;

From 9a833dc8c4f667d558be74669a90bb252b67d249 Mon Sep 17 00:00:00 2001
From: Harshit Maurya <hmaurya999@gmail.com>
Date: Thu, 23 Apr 2020 02:02:46 +0530
Subject: [PATCH 2/2] WTrackTableView: remove default play parameter value

---
 src/widget/wtracktableview.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index a0cbdcfa4a2..9a8146381e6 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -39,7 +39,7 @@ class WTrackTableView : public WLibraryTableView {
     bool hasFocus() const override;
     void keyPressEvent(QKeyEvent* event) override;
     void loadSelectedTrack() override;
-    void loadSelectedTrackToGroup(QString group, bool play = false) override;
+    void loadSelectedTrackToGroup(QString group, bool play) override;
     void assignNextTrackColor() override;
     void assignPreviousTrackColor() override;
     QList<TrackId> getSelectedTrackIds() const;