Skip to content

Commit

Permalink
Clean up issues from refactoring VirtualRekordbox
Browse files Browse the repository at this point in the history
BLT now no longer needs to know about it.
  • Loading branch information
brunchboy committed May 5, 2024
1 parent 32dfabd commit 3a7308f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
8 changes: 1 addition & 7 deletions src/beat_link_trigger/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`."
Expand Down
10 changes: 1 addition & 9 deletions src/beat_link_trigger/triggers.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)))
Expand Down

0 comments on commit 3a7308f

Please sign in to comment.