Metadata for unanalyzed tracks w/o real player number!

Author: brunchboy

CHANGELOG.md

@@ -8,7 +8,7 @@ This change log follows the conventions of
 
 ### Changed
 
-- We can now obtain track metadata including the waveform and beat grid even for tracks that have not been analyzed by rekordbox when talking to a CDJ-3000 and using a real player number.
+- We can now obtain track metadata including the waveform and beat grid even for tracks that have not been analyzed by rekordbox when talking to CDJ-3000s, whether or not we are using a real player number.
   This means that such tracks can interact usefully with almost all BLT features.
 - Works with the 8.x version of Beat Link, to offer support for the Opus Quad, as long as you build and attach metadata archives for the USBs you are using, or are loading them from rekordbox or rekordbox mobile on a different computer than where BLT is running.
 - The aging (and no-longer-maintained) user interface look-and-feel has been replaced with a newer one, which also supports user choice of light and dark mode (including adopting the system-wide setting for that, if desired), and allows custom look-and-feels to be installed and used.

src/beat_link_trigger/players.clj

@@ -481,6 +481,7 @@
        (seesaw/config! title-label :text title)
        (seesaw/config! artist-label :text "n/a")
        (when (and status
+                  (not= "CDJ-3000" (.getDeviceName status))
                   (not (#{CdjStatus$TrackType/NO_TRACK CdjStatus$TrackType/REKORDBOX} (.getTrackType status)))
                   (not (sending-status?)))
          (report-limited-metadata @player-window player))))))

src/beat_link_trigger/triggers.clj

@@ -36,7 +36,8 @@
            [java.io File]
            [javax.swing JFrame JMenu JMenuItem JCheckBoxMenuItem JPanel JRadioButtonMenuItem UIManager]
            [org.deepsymmetry.beatlink BeatFinder BeatListener CdjStatus CdjStatus$TrackSourceSlot
-            DeviceAnnouncementListener DeviceFinder DeviceUpdateListener LifecycleListener Util VirtualCdj]
+            DeviceAnnouncement DeviceAnnouncementListener DeviceFinder DeviceUpdateListener LifecycleListener
+            Util VirtualCdj]
            [org.deepsymmetry.beatlink.data AnalysisTagFinder ArtFinder BeatGridFinder CrateDigger MetadataFinder
             SearchableItem SignatureFinder TimeFinder TrackMetadata WaveformFinder]
            [beat_link_trigger.util MidiChoice]
@@ -1638,6 +1639,17 @@
         (do (.setSendingStatus virtual-cdj true)      ; We can do it.
             (.setPassive metadata-finder false))))))
 
+(defn- actively-request-metadata-from-cdj-3000s
+  "Even if we are not using a real player number, if the only other
+  players on the network are CDJ-3000s, we can still actively request
+  metadata using the dbserver protocol."
+  []
+  (when (every? (fn [^DeviceAnnouncement device]
+                  (or (> (.getDeviceNumber device) 6)
+                      (= (.getDeviceName device) "CDJ-3000")))
+                (.getCurrentDevices device-finder))
+    (.setPassive metadata-finder false)))
+
 (declare go-online)
 
 (defn expression-report-link
@@ -1906,7 +1918,9 @@
     (when (util/online?)
       (start-other-finders)
       (.addLifecycleListener virtual-cdj vcdj-lifecycle-listener))  ; React when VirtualCdj shuts down unexpectedly.
-    (when (real-player?) (actively-send-status))
+    (if (real-player?)
+      (actively-send-status)
+      (actively-request-metadata-from-cdj-3000s))
     (when (util/online?)
       (run-global-function :online)
       (settings/run-online-actions @trigger-frame expression-globals)