Merge pull request #34 from danmason/loop-state-in-java

Only handle state of `loop` within Java
danmason · Feb 9, 2022 · c3a4847 · c3a4847
2 parents d134416 + 6b3bf39
commit c3a4847
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/java-src/cljukebox/AudioTrackScheduler.java b/java-src/cljukebox/AudioTrackScheduler.java
@@ -51,8 +51,8 @@ public boolean skip() {
     }
   }
 
-  public boolean setLoop(boolean shouldLoop) {
-    this.loop = shouldLoop;
+  public boolean switchLoop() {
+    loop = !loop;
     return loop;
   }
 

diff --git a/src/cljukebox/handlers/loop.clj b/src/cljukebox/handlers/loop.clj
@@ -2,12 +2,9 @@
   (:require [cljukebox.player :as player]
             [cljukebox.util :as util]))
 
-(def !loop (atom false))
-
 (defn loop-scheduler [{:keys [message-channel]} {:keys [scheduler]}]
-  (let [should-loop (swap! !loop not)]
-    (.setLoop scheduler should-loop)
-    (if should-loop
+  (let [loop-active? (.switchLoop scheduler)]
+    (if loop-active?
       (util/send-message message-channel ":repeat: **Loop enabled!**")
       (util/send-message message-channel ":repeat: **Loop disabled!**"))))