diff --git a/assets/music/main-theme.wav b/assets/music/main-theme.wav deleted file mode 100644 index 5973809..0000000 Binary files a/assets/music/main-theme.wav and /dev/null differ diff --git a/assets/music/main_theme.wav b/assets/music/main_theme.wav new file mode 100644 index 0000000..e04baf8 Binary files /dev/null and b/assets/music/main_theme.wav differ diff --git a/assets/source/music/src/music/core.clj b/assets/source/music/src/music/core.clj index 281493e..5d8509b 100644 --- a/assets/source/music/src/music/core.clj +++ b/assets/source/music/src/music/core.clj @@ -18,4 +18,4 @@ (reset! state (edna/play! (read-music song)))) (defmacro build-for-cljs [] - (edna/edna->data-uri (read-music "main-theme"))) + (edna/edna->data-uri (read-music "main_theme"))) diff --git a/assets/source/music/src/music/music.clj b/assets/source/music/src/music/music.clj deleted file mode 100644 index 8f9e839..0000000 --- a/assets/source/music/src/music/music.clj +++ /dev/null @@ -1,10 +0,0 @@ -(ns music.music) - -[:piano {:octave 4 - :tempo 74} - - 1/8 #{:-d :-a :e :f#} :a 1/2 #{:f# :+d} - 1/8 #{:-e :e :+c} :a 1/2 #{:c :e :f} - - 1/8 #{:-d :-a :e :f#} :a :+d :+c# :+e :+d :b :+c# - 1/2 #{:-e :c :a} 1/2 #{:c :e}] diff --git a/assets/source/music/src/music/songs/main-theme.clj b/assets/source/music/src/music/songs/main-theme.clj deleted file mode 100644 index 4e8706b..0000000 --- a/assets/source/music/src/music/songs/main-theme.clj +++ /dev/null @@ -1,10 +0,0 @@ -(ns music.songs.main-theme) - -[:piano {:octave 4 - :tempo 60} - - 1/8 #{:-d :-a :e :f#} :a 1/2 #{:f# :+d} - 1/8 #{:-e :e :+c} :a 1/2 #{:c :e :f} - - 1/8 #{:-d :-a :e :f#} :a :+d :+c# :+e :+d :b :+c# - 1/2 #{:-e :c :a} 1/2 #{:c :e}] diff --git a/assets/source/music/src/music/songs/main_theme.clj b/assets/source/music/src/music/songs/main_theme.clj new file mode 100644 index 0000000..d6d9804 --- /dev/null +++ b/assets/source/music/src/music/songs/main_theme.clj @@ -0,0 +1,10 @@ +(ns music.songs.main-theme) + +[:piano {:octave 4 + :tempo 60} + + #{:-d :-a :e :f#} :a #{:f# :+d} + #{:-e :e :+c} :a #{:c :e :f} + + #{:-d :-a :e :f#} :a :+d :+c# :+e :+d :b :+c# + #{:-e :c :a} #{:c :e}] diff --git a/scripts/build-soundtrack b/scripts/build-soundtrack index b20ba2d..b7d5da0 100755 --- a/scripts/build-soundtrack +++ b/scripts/build-soundtrack @@ -10,9 +10,15 @@ MUSIC_SOURCE_DIR="$ASSETS_DIR/source/music" MUSIC_OUTPUT_DIR="$MUSIC_SOURCE_DIR/target" MUSIC_ASSETS_DIR="$ASSETS_DIR/music" +echo "Removing all wav files from $MUSIC_OUTPUT_DIR" +rm -f "$MUSIC_OUTPUT_DIR/"*.wav cd $MUSIC_SOURCE_DIR +echo "Building songs" clj -M prod.clj soundtrack cd $OLDWD +echo "Removing all wav files from $MUSIC_ASSETS_DIR" +rm -f "$MUSIC_ASSETS_DIR/"*.wav mv "$MUSIC_OUTPUT_DIR/"*.wav "$MUSIC_ASSETS_DIR/" +echo "Moved all songs to $MUSIC_ASSETS_DIR"