notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starting to make music work for osx.

Browse Source
This commit is contained in:
Bryce Covert
2015-09-12 22:27:59 -07:00
parent 2c7f16aa04
commit 0ca5dc3fc5
25 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
desktop/src-common/advent/screens/scene.clj
View File

@@ -978,16 +978,16 @@ void main()
:paused? false
:object nil}
:musics {:object nil
:inside-antique (utils/make-music "inside-antique.ogg")
:town-1 (utils/make-music "town-music-1.ogg")
:town-2 (utils/make-music "town-music-2.ogg")
:love (utils/make-music "love.ogg")
:inside-fangald (utils/make-music "inside-fangald.ogg")
:fight (utils/make-music "megaboss.mp3")
:pull-sword (utils/make-music "pull-sword.ogg")
:night (utils/make-music "night.ogg")
:inside-antique (utils/make-music "music/inside-antique.ogg")
:town-1 (utils/make-music "music/town-music-1.ogg")
:town-2 (utils/make-music "music/town-music-2.ogg")
:love (utils/make-music "music/love.ogg")
:inside-fangald (utils/make-music "music/inside-fangald.ogg")
:fight (utils/make-music "music/megaboss.mp3")
:pull-sword (utils/make-music "music/pull-sword.ogg")
:night (utils/make-music "music/night.ogg")
:dream (utils/make-music "dream/music.ogg")
:secret-hideout (utils/make-music "secret-hideout.ogg")}
:secret-hideout (utils/make-music "music/secret-hideout.ogg")}
:state (get-state)
:time-profiles {:object nil
:default utils/default-night-merge

2
desktop/src-common/advent/screens/title.clj
View File

@@ -96,7 +96,7 @@
fullscreen (center fullscreen)
quit (assoc (label "End quest" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y (- 280 (* 32 6)) :height 32 :origin-x 0 :origin-y 0)
quit (center quit)
music (utils/make-music "intro.ogg")
music (utils/make-music "music/intro.ogg")
ui-skin (skin "ui/ui.json")
balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))
]

5
desktop/src-common/advent/utils.clj
View File

@@ -222,7 +222,10 @@
(music! snd :stop))
(defn make-music [r]
(doto (music r) (music! :set-looping true)))
(try
(doto (music r) (music! :set-looping true))
(catch Exception _
(doto (music (str/replace r #"\.ogg" ".mp3")) (music! :set-looping true)))))