From c00492eee152ab5fcb604b78e788acc97cba253f Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Wed, 7 Oct 2015 18:45:03 -0700
Subject: [PATCH] tweaked.

---
 desktop/src-common/advent/screens/scene.clj | 4 ++--
 desktop/src-common/advent/screens/title.clj | 4 ++--
 desktop/src-common/advent/utils.clj         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index de74d86d..5af5ce8e 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -787,7 +787,7 @@ void main()
   (if (not (get-in entities [:started? :value]))
     (do (music! (utils/get-current-music entities) :set-volume (utils/current-music-volume (get-in entities [:volume :value])))
         (when (get-in entities [:state :seen-intro?])
-          (utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))])))
+          (utils/play-music (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))])))
         (assoc entities
                :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic
                                               :finish #(if (not (get-in % [:state :seen-intro?]))
@@ -1108,7 +1108,7 @@ void main()
              (doseq [snd (->> (get-in entities [:musics])
                               vals
                               (filter identity))]
-               (utils/stop-sound snd)))
+               (utils/stop-music snd)))
 
   :on-mouse-moved
   mouse-moved
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index a9c451a1..1abde9f6 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -100,7 +100,7 @@
           (assoc-in [:tweens :fade-out]
                     (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0
                                  :finish (fn [entities]
-                                           (utils/stop-sound (:music entities))
+                                           (utils/stop-music (:music entities))
                                            (reset! utils/selected-save save)
                                            (set-screen! @(resolve 'advent.core/advent) scene/scene scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen fade/fade-screen
                                                         )
@@ -255,7 +255,7 @@
                                                      :finish #(do
 
                                                                 (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0)
-                                                                (utils/play-sound (:music %)) %)
+                                                                (utils/play-music (:music %)) %)
                                                      :ease tween/ease-in-quadratic)}}
             ]
         (merge entities (:main-menu entities)))))
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 8e7f742c..4be1398d 100644
--- a/desktop/src-common/advent/utils.clj
+++ b/desktop/src-common/advent/utils.clj
@@ -242,10 +242,10 @@
   (update-in entities [:room :interactions] (fn [i] (remove #(= id (:id %)) i))))
 
 
-(defn play-sound [snd]
+(defn play-music [snd]
   (music! snd :play))
 
-(defn stop-sound [snd]
+(defn stop-music [snd]
   (music! snd :stop))
 
 (defn make-music [r]