diff --git a/LeCountdown.xcodeproj/project.pbxproj b/LeCountdown.xcodeproj/project.pbxproj index 5c18de7..2ef7def 100644 --- a/LeCountdown.xcodeproj/project.pbxproj +++ b/LeCountdown.xcodeproj/project.pbxproj @@ -70,6 +70,13 @@ C498E5A6299152C600E90DE0 /* GreenCheckmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C498E5A4299152B400E90DE0 /* GreenCheckmarkView.swift */; }; C4BA2AD62993F62700CB4FBA /* SoundSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2AD52993F62700CB4FBA /* SoundSelectionView.swift */; }; C4BA2ADB299549BC00CB4FBA /* TimerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2ADA299549BC00CB4FBA /* TimerModel.swift */; }; + C4BA2ADE2995ABA800CB4FBA /* MatriarchFxs_Loop2_Collider.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2ADD2995ABA800CB4FBA /* MatriarchFxs_Loop2_Collider.wav */; }; + C4BA2AE02995ABD200CB4FBA /* HighChords_Loop_River.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2ADF2995ABD200CB4FBA /* HighChords_Loop_River.wav */; }; + C4BA2AE22995ABE700CB4FBA /* SquareArp_Loop_River.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2AE12995ABE700CB4FBA /* SquareArp_Loop_River.wav */; }; + C4BA2AE42995AC0D00CB4FBA /* Arpeggio_Loop_River.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2AE32995AC0D00CB4FBA /* Arpeggio_Loop_River.wav */; }; + C4BA2AE62995AC3F00CB4FBA /* Loop_ToneSD_Boavista.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2AE52995AC3E00CB4FBA /* Loop_ToneSD_Boavista.wav */; }; + C4BA2AE82995ACC200CB4FBA /* Clave_Loop_LLL.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2AE72995ACC200CB4FBA /* Clave_Loop_LLL.wav */; }; + C4BA2AEA2995AD1C00CB4FBA /* SEM_Synths_Loop4_Nothing_Like_You.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4BA2AE92995AD1C00CB4FBA /* SEM_Synths_Loop4_Nothing_Like_You.wav */; }; C4F8B1532987FE6F005C86A5 /* LaunchWidgetLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438C7D72981216200BF3EF9 /* LaunchWidgetLiveActivity.swift */; }; C4F8B15729891271005C86A5 /* Conductor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8B15629891271005C86A5 /* Conductor.swift */; }; C4F8B15929891528005C86A5 /* forest_stream.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C4F8B15829891528005C86A5 /* forest_stream.mp3 */; }; @@ -237,6 +244,13 @@ C4BA2AD52993F62700CB4FBA /* SoundSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundSelectionView.swift; sourceTree = ""; }; C4BA2AD72993F7D200CB4FBA /* LeCountdown.0.5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LeCountdown.0.5.xcdatamodel; sourceTree = ""; }; C4BA2ADA299549BC00CB4FBA /* TimerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerModel.swift; sourceTree = ""; }; + C4BA2ADD2995ABA800CB4FBA /* MatriarchFxs_Loop2_Collider.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = MatriarchFxs_Loop2_Collider.wav; sourceTree = ""; }; + C4BA2ADF2995ABD200CB4FBA /* HighChords_Loop_River.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = HighChords_Loop_River.wav; sourceTree = ""; }; + C4BA2AE12995ABE700CB4FBA /* SquareArp_Loop_River.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SquareArp_Loop_River.wav; sourceTree = ""; }; + C4BA2AE32995AC0D00CB4FBA /* Arpeggio_Loop_River.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = Arpeggio_Loop_River.wav; sourceTree = ""; }; + C4BA2AE52995AC3E00CB4FBA /* Loop_ToneSD_Boavista.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = Loop_ToneSD_Boavista.wav; sourceTree = ""; }; + C4BA2AE72995ACC200CB4FBA /* Clave_Loop_LLL.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = Clave_Loop_LLL.wav; sourceTree = ""; }; + C4BA2AE92995AD1C00CB4FBA /* SEM_Synths_Loop4_Nothing_Like_You.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SEM_Synths_Loop4_Nothing_Like_You.wav; sourceTree = ""; }; C4F8B15629891271005C86A5 /* Conductor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Conductor.swift; sourceTree = ""; }; C4F8B15829891528005C86A5 /* forest_stream.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = forest_stream.mp3; sourceTree = ""; }; C4F8B15E298961A7005C86A5 /* ReorderableForEach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReorderableForEach.swift; sourceTree = ""; }; @@ -479,12 +493,27 @@ C445FA962987D0CF0054D761 /* Sound_Assets */ = { isa = PBXGroup; children = ( + C4BA2ADC2995AB7600CB4FBA /* Stephan_Bodzin */, C4F8B15829891528005C86A5 /* forest_stream.mp3 */, C445FA942987D01C0054D761 /* train_horn.mp3 */, ); path = Sound_Assets; sourceTree = ""; }; + C4BA2ADC2995AB7600CB4FBA /* Stephan_Bodzin */ = { + isa = PBXGroup; + children = ( + C4BA2AE92995AD1C00CB4FBA /* SEM_Synths_Loop4_Nothing_Like_You.wav */, + C4BA2AE72995ACC200CB4FBA /* Clave_Loop_LLL.wav */, + C4BA2AE52995AC3E00CB4FBA /* Loop_ToneSD_Boavista.wav */, + C4BA2AE32995AC0D00CB4FBA /* Arpeggio_Loop_River.wav */, + C4BA2AE12995ABE700CB4FBA /* SquareArp_Loop_River.wav */, + C4BA2ADF2995ABD200CB4FBA /* HighChords_Loop_River.wav */, + C4BA2ADD2995ABA800CB4FBA /* MatriarchFxs_Loop2_Collider.wav */, + ); + path = Stephan_Bodzin; + sourceTree = ""; + }; C4F8B188298AC248005C86A5 /* Generation */ = { isa = PBXGroup; children = ( @@ -699,9 +728,16 @@ buildActionMask = 2147483647; files = ( C4060DC7297AE73D003FAB80 /* Preview Assets.xcassets in Resources */, + C4BA2AEA2995AD1C00CB4FBA /* SEM_Synths_Loop4_Nothing_Like_You.wav in Resources */, + C4BA2AE42995AC0D00CB4FBA /* Arpeggio_Loop_River.wav in Resources */, C4F8B15929891528005C86A5 /* forest_stream.mp3 in Resources */, + C4BA2AE22995ABE700CB4FBA /* SquareArp_Loop_River.wav in Resources */, + C4BA2ADE2995ABA800CB4FBA /* MatriarchFxs_Loop2_Collider.wav in Resources */, + C4BA2AE82995ACC200CB4FBA /* Clave_Loop_LLL.wav in Resources */, C445FA952987D01C0054D761 /* train_horn.mp3 in Resources */, + C4BA2AE02995ABD200CB4FBA /* HighChords_Loop_River.wav in Resources */, C4060DC4297AE73D003FAB80 /* Assets.xcassets in Resources */, + C4BA2AE62995AC3F00CB4FBA /* Loop_ToneSD_Boavista.wav in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/LeCountdown/Sound/Sound.swift b/LeCountdown/Sound/Sound.swift index b6dba4c..54c91f6 100644 --- a/LeCountdown/Sound/Sound.swift +++ b/LeCountdown/Sound/Sound.swift @@ -66,15 +66,26 @@ enum Sound: Int, CaseIterable, Identifiable, Localized { case trainhorn = 1 // default case forestStream - case sb1 - case sb2 + // StephanBodzin + case sbSEM_Synths_Loop4_Nothing_Like_You + case sbClave_Loop_LLL + case sbLoop_ToneSD_Boavista + case sbArpeggio_Loop_River + case sbSquareArp_Loop_River + case sbHighChords_Loop_River + case sbMatriarchFxs_Loop2_Collider var localizedString: String { switch self { case .trainhorn: return NSLocalizedString("Train horn", comment: "") case .forestStream: return NSLocalizedString("Forest stream", comment: "") - case .sb1: return "sb1" - case .sb2: return "sb2" + case .sbSEM_Synths_Loop4_Nothing_Like_You: return "Nothing_Like_You" + case .sbClave_Loop_LLL: return "LLL" + case .sbLoop_ToneSD_Boavista: return "Boavista" + case .sbArpeggio_Loop_River: return "River 1" + case .sbSquareArp_Loop_River: return "River 2" + case .sbHighChords_Loop_River: return "River 3" + case .sbMatriarchFxs_Loop2_Collider: return "Collider" } } @@ -82,9 +93,13 @@ enum Sound: Int, CaseIterable, Identifiable, Localized { switch self { case .trainhorn: return "train_horn.mp3" case .forestStream: return "forest_stream.mp3" - case .sb1: return "forest_stream.mp3" - case .sb2: return "forest_stream.mp3" - + case .sbSEM_Synths_Loop4_Nothing_Like_You: return "SEM_Synths_Loop4_Nothing_Like_You.wav" + case .sbClave_Loop_LLL: return "Clave_Loop_LLL.wav" + case .sbLoop_ToneSD_Boavista: return "Loop_ToneSD_Boavista.wav" + case .sbArpeggio_Loop_River: return "Arpeggio_Loop_River.wav" + case .sbSquareArp_Loop_River: return "SquareArp_Loop_River.wav" + case .sbHighChords_Loop_River: return "HighChords_Loop_River.wav" + case .sbMatriarchFxs_Loop2_Collider: return "MatriarchFxs_Loop2_Collider.wav" } } @@ -92,7 +107,8 @@ enum Sound: Int, CaseIterable, Identifiable, Localized { switch self { case .trainhorn: return .fun case .forestStream: return .nature - case .sb1, .sb2: return .stephanBodzin + case .sbSEM_Synths_Loop4_Nothing_Like_You, .sbClave_Loop_LLL, .sbLoop_ToneSD_Boavista, .sbArpeggio_Loop_River, .sbSquareArp_Loop_River, .sbHighChords_Loop_River, .sbMatriarchFxs_Loop2_Collider: + return .stephanBodzin } } diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/Arpeggio_Loop_River.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/Arpeggio_Loop_River.wav new file mode 100644 index 0000000..93b2faf Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/Arpeggio_Loop_River.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/Clave_Loop_LLL.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/Clave_Loop_LLL.wav new file mode 100644 index 0000000..b5b8f7a Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/Clave_Loop_LLL.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/HighChords_Loop_River.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/HighChords_Loop_River.wav new file mode 100644 index 0000000..019f268 Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/HighChords_Loop_River.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/Loop_ToneSD_Boavista.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/Loop_ToneSD_Boavista.wav new file mode 100644 index 0000000..6751157 Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/Loop_ToneSD_Boavista.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/MatriarchFxs_Loop2_Collider.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/MatriarchFxs_Loop2_Collider.wav new file mode 100644 index 0000000..0ebabed Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/MatriarchFxs_Loop2_Collider.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/SEM_Synths_Loop4_Nothing_Like_You.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/SEM_Synths_Loop4_Nothing_Like_You.wav new file mode 100644 index 0000000..85f7257 Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/SEM_Synths_Loop4_Nothing_Like_You.wav differ diff --git a/LeCountdown/Sound_Assets/Stephan_Bodzin/SquareArp_Loop_River.wav b/LeCountdown/Sound_Assets/Stephan_Bodzin/SquareArp_Loop_River.wav new file mode 100644 index 0000000..0fca48a Binary files /dev/null and b/LeCountdown/Sound_Assets/Stephan_Bodzin/SquareArp_Loop_River.wav differ