From 19ca1d0c824594010eccec6269d8ea341703fab7 Mon Sep 17 00:00:00 2001 From: Gordon Pedersen Date: Tue, 9 May 2023 10:54:31 +1000 Subject: [PATCH] Move music into sounds folder so it works on iOS --- app/music_list.rb | 38 +++++++++--------- {music => sounds/music}/ambience1.ogg | Bin {music => sounds/music}/pyramids/fill1.ogg | Bin {music => sounds/music}/pyramids/lead1.ogg | Bin {music => sounds/music}/pyramids/lead2.ogg | Bin .../music}/pyramids/lead_beats.ogg | Bin {music => sounds/music}/pyramids/loop1_a.ogg | Bin {music => sounds/music}/pyramids/loop1_b.ogg | Bin {music => sounds/music}/pyramids/loop2_a.ogg | Bin {music => sounds/music}/pyramids/loop2_b.ogg | Bin .../music}/pyramids/post_lead.ogg | Bin .../music}/pyramids/post_lead2.ogg | Bin .../music}/pyramids/silent_bar.ogg | Bin .../music}/pyramids/underscore1_a.ogg | Bin .../music}/pyramids/underscore1_b.ogg | Bin .../music}/pyramids/underscore2_a.ogg | Bin .../music}/pyramids/underscore2_b.ogg | Bin .../music}/pyramids/underscore_bridge1.ogg | Bin .../music}/pyramids/underscore_bridge2+a.ogg | Bin 19 files changed, 19 insertions(+), 19 deletions(-) rename {music => sounds/music}/ambience1.ogg (100%) rename {music => sounds/music}/pyramids/fill1.ogg (100%) rename {music => sounds/music}/pyramids/lead1.ogg (100%) rename {music => sounds/music}/pyramids/lead2.ogg (100%) rename {music => sounds/music}/pyramids/lead_beats.ogg (100%) rename {music => sounds/music}/pyramids/loop1_a.ogg (100%) rename {music => sounds/music}/pyramids/loop1_b.ogg (100%) rename {music => sounds/music}/pyramids/loop2_a.ogg (100%) rename {music => sounds/music}/pyramids/loop2_b.ogg (100%) rename {music => sounds/music}/pyramids/post_lead.ogg (100%) rename {music => sounds/music}/pyramids/post_lead2.ogg (100%) rename {music => sounds/music}/pyramids/silent_bar.ogg (100%) rename {music => sounds/music}/pyramids/underscore1_a.ogg (100%) rename {music => sounds/music}/pyramids/underscore1_b.ogg (100%) rename {music => sounds/music}/pyramids/underscore2_a.ogg (100%) rename {music => sounds/music}/pyramids/underscore2_b.ogg (100%) rename {music => sounds/music}/pyramids/underscore_bridge1.ogg (100%) rename {music => sounds/music}/pyramids/underscore_bridge2+a.ogg (100%) diff --git a/app/music_list.rb b/app/music_list.rb index 92e46d1..0c55024 100644 --- a/app/music_list.rb +++ b/app/music_list.rb @@ -2,24 +2,24 @@ module Music MUSIC = { - ambience: SoundInstance.new({ path: 'music/ambience1.ogg', looping: true }), - underscore_a: SoundInstance.new({ path: 'music/pyramids/underscore1_a.ogg', looping: false }), - underscore_b: SoundInstance.new({ path: 'music/pyramids/underscore1_b.ogg', looping: false }), - underscore2_a: SoundInstance.new({ path: 'music/pyramids/underscore2_a.ogg', looping: false }), - underscore2_b: SoundInstance.new({ path: 'music/pyramids/underscore2_b.ogg', looping: false }), - underscore_bridge1: SoundInstance.new({ path: 'music/pyramids/underscore_bridge1.ogg', looping: false }), - underscore_bridge2_a: SoundInstance.new({ path: 'music/pyramids/underscore_bridge2+a.ogg', looping: false }), - lead_beats: SoundInstance.new({ path: 'music/pyramids/lead_beats.ogg', looping: false }), - fill1: SoundInstance.new({ path: 'music/pyramids/fill1.ogg', looping: false }), - lead1: SoundInstance.new({ path: 'music/pyramids/lead1.ogg', looping: false }), - lead2: SoundInstance.new({ path: 'music/pyramids/lead2.ogg', looping: false }), - loop1_a: SoundInstance.new({ path: 'music/pyramids/loop1_a.ogg', looping: false }), - loop1_b: SoundInstance.new({ path: 'music/pyramids/loop1_b.ogg', looping: false }), - loop2_a: SoundInstance.new({ path: 'music/pyramids/loop1_a.ogg', looping: false }), - loop2_b: SoundInstance.new({ path: 'music/pyramids/loop1_b.ogg', looping: false }), - post_lead: SoundInstance.new({ path: 'music/pyramids/post_lead.ogg', looping: false }), - post_lead2: SoundInstance.new({ path: 'music/pyramids/post_lead2.ogg', looping: false }), - bridge: SoundInstance.new({ path: 'music/pyramids/underscore_bridge2+a.ogg', looping: false }), - silent_bar: SoundInstance.new({ path: 'music/pyramids/silent_bar.ogg', looping: false }), + ambience: SoundInstance.new({ path: 'sounds/music/ambience1.ogg', looping: true }), + underscore_a: SoundInstance.new({ path: 'sounds/music/pyramids/underscore1_a.ogg', looping: false }), + underscore_b: SoundInstance.new({ path: 'sounds/music/pyramids/underscore1_b.ogg', looping: false }), + underscore2_a: SoundInstance.new({ path: 'sounds/music/pyramids/underscore2_a.ogg', looping: false }), + underscore2_b: SoundInstance.new({ path: 'sounds/music/pyramids/underscore2_b.ogg', looping: false }), + underscore_bridge1: SoundInstance.new({ path: 'sounds/music/pyramids/underscore_bridge1.ogg', looping: false }), + underscore_bridge2_a: SoundInstance.new({ path: 'sounds/music/pyramids/underscore_bridge2+a.ogg', looping: false }), + lead_beats: SoundInstance.new({ path: 'sounds/music/pyramids/lead_beats.ogg', looping: false }), + fill1: SoundInstance.new({ path: 'sounds/music/pyramids/fill1.ogg', looping: false }), + lead1: SoundInstance.new({ path: 'sounds/music/pyramids/lead1.ogg', looping: false }), + lead2: SoundInstance.new({ path: 'sounds/music/pyramids/lead2.ogg', looping: false }), + loop1_a: SoundInstance.new({ path: 'sounds/music/pyramids/loop1_a.ogg', looping: false }), + loop1_b: SoundInstance.new({ path: 'sounds/music/pyramids/loop1_b.ogg', looping: false }), + loop2_a: SoundInstance.new({ path: 'sounds/music/pyramids/loop1_a.ogg', looping: false }), + loop2_b: SoundInstance.new({ path: 'sounds/music/pyramids/loop1_b.ogg', looping: false }), + post_lead: SoundInstance.new({ path: 'sounds/music/pyramids/post_lead.ogg', looping: false }), + post_lead2: SoundInstance.new({ path: 'sounds/music/pyramids/post_lead2.ogg', looping: false }), + bridge: SoundInstance.new({ path: 'sounds/music/pyramids/underscore_bridge2+a.ogg', looping: false }), + silent_bar: SoundInstance.new({ path: 'sounds/music/pyramids/silent_bar.ogg', looping: false }), } end diff --git a/music/ambience1.ogg b/sounds/music/ambience1.ogg similarity index 100% rename from music/ambience1.ogg rename to sounds/music/ambience1.ogg diff --git a/music/pyramids/fill1.ogg b/sounds/music/pyramids/fill1.ogg similarity index 100% rename from music/pyramids/fill1.ogg rename to sounds/music/pyramids/fill1.ogg diff --git a/music/pyramids/lead1.ogg b/sounds/music/pyramids/lead1.ogg similarity index 100% rename from music/pyramids/lead1.ogg rename to sounds/music/pyramids/lead1.ogg diff --git a/music/pyramids/lead2.ogg b/sounds/music/pyramids/lead2.ogg similarity index 100% rename from music/pyramids/lead2.ogg rename to sounds/music/pyramids/lead2.ogg diff --git a/music/pyramids/lead_beats.ogg b/sounds/music/pyramids/lead_beats.ogg similarity index 100% rename from music/pyramids/lead_beats.ogg rename to sounds/music/pyramids/lead_beats.ogg diff --git a/music/pyramids/loop1_a.ogg b/sounds/music/pyramids/loop1_a.ogg similarity index 100% rename from music/pyramids/loop1_a.ogg rename to sounds/music/pyramids/loop1_a.ogg diff --git a/music/pyramids/loop1_b.ogg b/sounds/music/pyramids/loop1_b.ogg similarity index 100% rename from music/pyramids/loop1_b.ogg rename to sounds/music/pyramids/loop1_b.ogg diff --git a/music/pyramids/loop2_a.ogg b/sounds/music/pyramids/loop2_a.ogg similarity index 100% rename from music/pyramids/loop2_a.ogg rename to sounds/music/pyramids/loop2_a.ogg diff --git a/music/pyramids/loop2_b.ogg b/sounds/music/pyramids/loop2_b.ogg similarity index 100% rename from music/pyramids/loop2_b.ogg rename to sounds/music/pyramids/loop2_b.ogg diff --git a/music/pyramids/post_lead.ogg b/sounds/music/pyramids/post_lead.ogg similarity index 100% rename from music/pyramids/post_lead.ogg rename to sounds/music/pyramids/post_lead.ogg diff --git a/music/pyramids/post_lead2.ogg b/sounds/music/pyramids/post_lead2.ogg similarity index 100% rename from music/pyramids/post_lead2.ogg rename to sounds/music/pyramids/post_lead2.ogg diff --git a/music/pyramids/silent_bar.ogg b/sounds/music/pyramids/silent_bar.ogg similarity index 100% rename from music/pyramids/silent_bar.ogg rename to sounds/music/pyramids/silent_bar.ogg diff --git a/music/pyramids/underscore1_a.ogg b/sounds/music/pyramids/underscore1_a.ogg similarity index 100% rename from music/pyramids/underscore1_a.ogg rename to sounds/music/pyramids/underscore1_a.ogg diff --git a/music/pyramids/underscore1_b.ogg b/sounds/music/pyramids/underscore1_b.ogg similarity index 100% rename from music/pyramids/underscore1_b.ogg rename to sounds/music/pyramids/underscore1_b.ogg diff --git a/music/pyramids/underscore2_a.ogg b/sounds/music/pyramids/underscore2_a.ogg similarity index 100% rename from music/pyramids/underscore2_a.ogg rename to sounds/music/pyramids/underscore2_a.ogg diff --git a/music/pyramids/underscore2_b.ogg b/sounds/music/pyramids/underscore2_b.ogg similarity index 100% rename from music/pyramids/underscore2_b.ogg rename to sounds/music/pyramids/underscore2_b.ogg diff --git a/music/pyramids/underscore_bridge1.ogg b/sounds/music/pyramids/underscore_bridge1.ogg similarity index 100% rename from music/pyramids/underscore_bridge1.ogg rename to sounds/music/pyramids/underscore_bridge1.ogg diff --git a/music/pyramids/underscore_bridge2+a.ogg b/sounds/music/pyramids/underscore_bridge2+a.ogg similarity index 100% rename from music/pyramids/underscore_bridge2+a.ogg rename to sounds/music/pyramids/underscore_bridge2+a.ogg