From 3a7308f33d804b573d3c5de17c7ab292a081f273 Mon Sep 17 00:00:00 2001 From: James Elliott Date: Sun, 5 May 2024 12:15:06 -0500 Subject: [PATCH] Clean up issues from refactoring VirtualRekordbox BLT now no longer needs to know about it. --- src/beat_link_trigger/core.clj | 8 +------- src/beat_link_trigger/triggers.clj | 10 +--------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/beat_link_trigger/core.clj b/src/beat_link_trigger/core.clj index a19944be..820c5983 100644 --- a/src/beat_link_trigger/core.clj +++ b/src/beat_link_trigger/core.clj @@ -16,7 +16,7 @@ [taoensso.timbre :as timbre]) (:import [java.awt GraphicsEnvironment] [javax.swing JFrame UIManager] - [org.deepsymmetry.beatlink DeviceAnnouncement DeviceFinder VirtualCdj VirtualRekordbox])) + [org.deepsymmetry.beatlink DeviceAnnouncement DeviceFinder VirtualCdj])) (def ^DeviceFinder device-finder "A convenient reference to the [Beat Link @@ -30,12 +30,6 @@ singleton." (VirtualCdj/getInstance)) -(def ^VirtualRekordbox virtual-rekordbox - "A convenient reference to the [Beat Link - `VirtualRekordbox`](https://deepsymmetry.org/beatlink/apidocs/org/deepsymmetry/beatlink/VirtualRekordbox.html) - singleton." - (VirtualRekordbox/getInstance)) - (def dynamic-class-loader "The class loader that supports dynamic additions, for users to be able to pull in new dependencies. This gets initialized in `start`." diff --git a/src/beat_link_trigger/triggers.clj b/src/beat_link_trigger/triggers.clj index ada96222..f5b1cd5a 100644 --- a/src/beat_link_trigger/triggers.clj +++ b/src/beat_link_trigger/triggers.clj @@ -33,8 +33,7 @@ [java.awt.event WindowEvent] [javax.swing JFrame JMenu JMenuItem JCheckBoxMenuItem JRadioButtonMenuItem] [org.deepsymmetry.beatlink BeatFinder BeatListener CdjStatus CdjStatus$TrackSourceSlot - DeviceAnnouncementListener DeviceFinder DeviceUpdateListener LifecycleListener Util VirtualCdj - VirtualRekordbox] + 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] @@ -69,12 +68,6 @@ singleton." (VirtualCdj/getInstance)) -(def ^VirtualRekordbox virtual-rekordbox - "A convenient reference to the [Beat Link - `VirtualRekordbox`](https://deepsymmetry.org/beatlink/apidocs/org/deepsymmetry/beatlink/VirtualRekordbox.html) - singleton." - (VirtualRekordbox/getInstance)) - (def ^MetadataFinder metadata-finder "A convenient reference to the [Beat Link `MetadataFinder`](https://deepsymmetry.org/beatlink/apidocs/org/deepsymmetry/beatlink/data/MetadataFinder.html) @@ -1816,7 +1809,6 @@ (.stop (BeatFinder/getInstance)) (.stop (org.deepsymmetry.beatlink.dbserver.ConnectionManager/getInstance)) (.stop virtual-cdj) - (.stop virtual-rekordbox) (Thread/sleep 200)) ; Wait for straggling update packets (reflect-online-state) (rebuild-all-device-status)))