Merge remote-tracking branch 'mixxx/2.4'

mixxxdj · Mar 9, 2024 · de0be22 · de0be22
2 parents 3c1a619 + 1b63888
commit de0be22
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml
@@ -1107,6 +1107,18 @@
                     <script-binding />
                 </options>
             </control>
+            <!-- CC's MIDI Channel 4 (0xB3  SHIFT mode)-->
+            <!--Browser encoder-->
+	    <control>
+                <group>[Library]</group>
+                <key>ScrollVertical</key>
+                <description>Scroll Vertical (SHIFT + Browser Knob)</description>
+                <status>0xB3</status>
+                <midino>0x01</midino>
+                <options>
+                    <selectknob />
+                </options>
+            </control>
             <!-- CC's MIDI Channel 5 (0xB4  Deck B - SHIFT mode)-->
             <!--Jog wheel-->
             <control>

diff --git a/src/library/trackset/crate/cratetablemodel.cpp b/src/library/trackset/crate/cratetablemodel.cpp
@@ -168,6 +168,17 @@ int CrateTableModel::addTracks(
     return trackIds.size();
 }
 
+bool CrateTableModel::isLocked() {
+    Crate crate;
+    if (!m_pTrackCollectionManager->internalCollection()
+                    ->crates()
+                    .readCrateById(m_selectedCrate, &crate)) {
+        qWarning() << "Failed to read create" << m_selectedCrate;
+        return false;
+    }
+    return crate.isLocked();
+}
+
 void CrateTableModel::removeTracks(const QModelIndexList& indices) {
     VERIFY_OR_DEBUG_ASSERT(m_selectedCrate.isValid()) {
         return;

diff --git a/src/library/trackset/crate/cratetablemodel.h b/src/library/trackset/crate/cratetablemodel.h
@@ -20,6 +20,7 @@ class CrateTableModel final : public TrackSetTableModel {
     void removeTracks(const QModelIndexList& indices) final;
     /// Returns the number of unsuccessful additions.
     int addTracks(const QModelIndex& index, const QList<QString>& locations) final;
+    bool isLocked() final;
 
     Capabilities getCapabilities() const final;
     QString modelKey(bool noSearch) const override;

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
@@ -904,9 +904,13 @@ void WTrackTableView::hideOrRemoveSelectedTracks() {
     }
 
     TrackModel::Capability cap;
+    // Hide is the primary action if allowed. Else we test for remove capability
     if (pTrackModel->hasCapabilities(TrackModel::Capability::Hide)) {
         cap = TrackModel::Capability::Hide;
-    } else if (pTrackModel->hasCapabilities(TrackModel::Capability::Remove)) {
+    } else if (pTrackModel->isLocked()) { // Locked playlists and crates
+        return;
+    }
+    if (pTrackModel->hasCapabilities(TrackModel::Capability::Remove)) {
         cap = TrackModel::Capability::Remove;
     } else if (pTrackModel->hasCapabilities(TrackModel::Capability::RemoveCrate)) {
         cap = TrackModel::Capability::RemoveCrate;