Sound update

main
Laurent 3 years ago
parent 9b03cea1bd
commit f321de3b10
  1. 12
      LeCountdown.xcodeproj/project.pbxproj
  2. 14
      LeCountdown/Sound/Sound.swift
  3. BIN
      LeCountdown/Sound_Assets/Nature/QP01 0075 Ocean shore waves delicate birds.wav
  4. BIN
      LeCountdown/Sound_Assets/Nature/QP01 0130 Desert morning bird chorus.wav
  5. 8
      LeCountdown/Subscription/AppGuard.swift

@ -36,7 +36,6 @@
C415D3F329C377BC0037B215 /* QP01 0022 Surf mod small pebbled.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3F229C377BC0037B215 /* QP01 0022 Surf mod small pebbled.wav */; };
C415D3F529C378230037B215 /* QP01 0028 Insect crickets isolated.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3F429C378230037B215 /* QP01 0028 Insect crickets isolated.wav */; };
C415D3F729C378D10037B215 /* QP01 0037 Tropical forest morning.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3F629C378D10037B215 /* QP01 0037 Tropical forest morning.wav */; };
C415D3F929C379700037B215 /* QP01 0050 Deciduous forest morning songbirds robin.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3F829C379700037B215 /* QP01 0050 Deciduous forest morning songbirds robin.wav */; };
C415D3FB29C37A460037B215 /* QP01 0096 Wetland lake early morning.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3FA29C37A460037B215 /* QP01 0096 Wetland lake early morning.wav */; };
C415D3FD29C37AA40037B215 /* QP01 0118 Riparian Zone thrush.wav in Resources */ = {isa = PBXBuildFile; fileRef = C415D3FC29C37AA40037B215 /* QP01 0118 Riparian Zone thrush.wav */; };
C438C7C12980228B00BF3EF9 /* CountdownScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438C7C02980228B00BF3EF9 /* CountdownScheduler.swift */; };
@ -141,6 +140,8 @@
C4A16DC929D311C800143D5E /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A16DC429D311C800143D5E /* Extensions.swift */; };
C4A67AAB29DC167E0098D692 /* rose1.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C4A67AAA29DC167E0098D692 /* rose1.mp3 */; };
C4A67AAD29DC16890098D692 /* trancoso_bowl1.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C4A67AAC29DC16890098D692 /* trancoso_bowl1.mp3 */; };
C4A67AAF29DC1E690098D692 /* QP01 0130 Desert morning bird chorus.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4A67AAE29DC1E690098D692 /* QP01 0130 Desert morning bird chorus.wav */; };
C4A67AB129DC1F430098D692 /* QP01 0075 Ocean shore waves delicate birds.wav in Resources */ = {isa = PBXBuildFile; fileRef = C4A67AB029DC1F430098D692 /* QP01 0075 Ocean shore waves delicate birds.wav */; };
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 */; };
@ -349,7 +350,6 @@
C415D3F229C377BC0037B215 /* QP01 0022 Surf mod small pebbled.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0022 Surf mod small pebbled.wav"; sourceTree = "<group>"; };
C415D3F429C378230037B215 /* QP01 0028 Insect crickets isolated.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0028 Insect crickets isolated.wav"; sourceTree = "<group>"; };
C415D3F629C378D10037B215 /* QP01 0037 Tropical forest morning.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0037 Tropical forest morning.wav"; sourceTree = "<group>"; };
C415D3F829C379700037B215 /* QP01 0050 Deciduous forest morning songbirds robin.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0050 Deciduous forest morning songbirds robin.wav"; sourceTree = "<group>"; };
C415D3FA29C37A460037B215 /* QP01 0096 Wetland lake early morning.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0096 Wetland lake early morning.wav"; sourceTree = "<group>"; };
C415D3FC29C37AA40037B215 /* QP01 0118 Riparian Zone thrush.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0118 Riparian Zone thrush.wav"; sourceTree = "<group>"; };
C418A14F298428CB00C22230 /* LeCountdown.0.1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LeCountdown.0.1.xcdatamodel; sourceTree = "<group>"; };
@ -404,6 +404,8 @@
C4A16DCA29D323CF00143D5E /* LeCountdown.0.6.4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LeCountdown.0.6.4.xcdatamodel; sourceTree = "<group>"; };
C4A67AAA29DC167E0098D692 /* rose1.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = rose1.mp3; sourceTree = "<group>"; };
C4A67AAC29DC16890098D692 /* trancoso_bowl1.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = trancoso_bowl1.mp3; sourceTree = "<group>"; };
C4A67AAE29DC1E690098D692 /* QP01 0130 Desert morning bird chorus.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0130 Desert morning bird chorus.wav"; sourceTree = "<group>"; };
C4A67AB029DC1F430098D692 /* QP01 0075 Ocean shore waves delicate birds.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "QP01 0075 Ocean shore waves delicate birds.wav"; sourceTree = "<group>"; };
C4BA2AD52993F62700CB4FBA /* SoundSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundSelectionView.swift; sourceTree = "<group>"; };
C4BA2AD72993F7D200CB4FBA /* LeCountdown.0.5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LeCountdown.0.5.xcdatamodel; sourceTree = "<group>"; };
C4BA2ADA299549BC00CB4FBA /* TimerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerModel.swift; sourceTree = "<group>"; };
@ -639,9 +641,10 @@
C415D3F229C377BC0037B215 /* QP01 0022 Surf mod small pebbled.wav */,
C415D3F429C378230037B215 /* QP01 0028 Insect crickets isolated.wav */,
C415D3F629C378D10037B215 /* QP01 0037 Tropical forest morning.wav */,
C415D3F829C379700037B215 /* QP01 0050 Deciduous forest morning songbirds robin.wav */,
C4A67AB029DC1F430098D692 /* QP01 0075 Ocean shore waves delicate birds.wav */,
C415D3FA29C37A460037B215 /* QP01 0096 Wetland lake early morning.wav */,
C415D3FC29C37AA40037B215 /* QP01 0118 Riparian Zone thrush.wav */,
C4A67AAE29DC1E690098D692 /* QP01 0130 Desert morning bird chorus.wav */,
);
path = Nature;
sourceTree = "<group>";
@ -1083,10 +1086,11 @@
C4A67AAD29DC16890098D692 /* trancoso_bowl1.mp3 in Resources */,
C4A16D9B29D0A7D300143D5E /* MRKRSTPHR_synth_one_shot_bleep_G.wav in Resources */,
C415D3CE29C0B1430037B215 /* EX_ATSM_20_Inch_Highwall_Bowl_Hit_Ring_Ab.wav in Resources */,
C4A67AB129DC1F430098D692 /* QP01 0075 Ocean shore waves delicate birds.wav in Resources */,
C415D3ED29C3765B0037B215 /* QP01 0011 Rain soft.wav in Resources */,
C415D3D229C0B1620037B215 /* EX_ATSM_140_Koshi_Chimes_Aria_Tuning_Loop_Wondering_Am.wav in Resources */,
C415D3F929C379700037B215 /* QP01 0050 Deciduous forest morning songbirds robin.wav in Resources */,
C4A16DA129D0A7FE00143D5E /* ESM_One_Shot_FX_Interface_Glitch_Spaceship_Console_18_Interface_Button_Alert_System_Cm.wav in Resources */,
C4A67AAF29DC1E690098D692 /* QP01 0130 Desert morning bird chorus.wav in Resources */,
C415D3DE29C0B2230037B215 /* FF_SH_flute_melody_ambient_stacked_profound_Dmin.wav in Resources */,
C473C32C29AA330E0056B38A /* Localizable.strings in Resources */,
C415D3FB29C37A460037B215 /* QP01 0096 Wetland lake early morning.wav in Resources */,

@ -117,13 +117,14 @@ enum Sound: Int, CaseIterable, Identifiable, Localized {
case surf1
case crickets
case tropicalForestMorning
case deciduousForestMorning
case desertMorning
case wetland
case riparianZone
// Shorts
case ESM_Ambient_Game_Menu_Soft_Wood
case sbRose
case trancosoBowl
case natureOceanShore
static var `default`: Sound { .sbSEM_Synths_Loop4_Nothing_Like_You }
@ -149,12 +150,13 @@ enum Sound: Int, CaseIterable, Identifiable, Localized {
case .surf1: return "Surf 1"
case .crickets: return "Crickets"
case .tropicalForestMorning: return "Forest morning 1"
case .deciduousForestMorning: return "Forest morning 2"
case .desertMorning: return "Desert morning 2"
case .wetland: return "Wetland"
case .riparianZone: return "Riparian Zone"
case .ESM_Ambient_Game_Menu_Soft_Wood: return "Wood percussion"
case .sbRose: return "Rose"
case .trancosoBowl: return "Bowl 4"
case .natureOceanShore: return "Ocean Shore"
}
}
@ -180,12 +182,13 @@ enum Sound: Int, CaseIterable, Identifiable, Localized {
case .surf1: return "QP01 0022 Surf mod small pebbled.wav"
case .crickets: return "QP01 0028 Insect crickets isolated.wav"
case .tropicalForestMorning: return "QP01 0037 Tropical forest morning.wav"
case .deciduousForestMorning: return "QP01 0050 Deciduous forest morning songbirds robin.wav"
case .desertMorning: return "QP01 0130 Desert morning bird chorus.wav"
case .wetland: return "QP01 0096 Wetland lake early morning.wav"
case .riparianZone: return "QP01 0096 Wetland lake early morning.wav"
case .ESM_Ambient_Game_Menu_Soft_Wood: return "ESM_Ambient_Game_Menu_Soft_Wood_Confirm_1_Notification_Button_Settings_UI.wav"
case .sbRose: return "rose1.mp3"
case .trancosoBowl: return "trancoso_bowl1.mp3"
case .natureOceanShore: return "QP01 0075 Ocean shore waves delicate birds.wav"
}
}
@ -195,7 +198,7 @@ enum Sound: Int, CaseIterable, Identifiable, Localized {
return .stephanBodzin
case .FF_SH_bowl_drone_tapping_C, .FF_SH_bowl_drone_tap_hold_E, .EX_ATSM_Koshi_Chimes_Aria_Tuning_Texture_Longer_Dm, .EX_ATSM_Bell_Binaural_Flam_Eb, .EX_ATSM_160_Metal_Tonal_Percussion_Sansula_Loop_Call_Am, .EX_ATSM_125_Metal_Percussion_Wing_Loop_Chimey_Dm, .EX_ATSM_140_Koshi_Chimes_Aria_Tuning_Loop_Wondering_Am, .EX_ATSM_20_Inch_Highwall_Bowl_Hit_Ring_Ab, .trancosoBowl:
return .relax
case .rain_soft, .stream1, .stream2, .surf1, .crickets, .tropicalForestMorning, .deciduousForestMorning, .wetland, .riparianZone:
case .rain_soft, .stream1, .stream2, .surf1, .crickets, .tropicalForestMorning, .desertMorning, .wetland, .riparianZone, .natureOceanShore:
return .nature
case .ESM_Ambient_Game_Menu_Soft_Wood:
return .shorts
@ -214,7 +217,8 @@ enum Sound: Int, CaseIterable, Identifiable, Localized {
var url: URL? {
let components = self.fileName.components(separatedBy: ".")
if components.count == 2 {
return Bundle.main.url(forResource: components[0], withExtension: components[1])
return Bundle.main.url(forResource: components[0],
withExtension: components[1])
} else {
print("bad sound file name for \(self)")
return nil

@ -131,15 +131,15 @@ extension Notification.Name {
var currentPlan: StorePlan {
// #if DEBUG
// return .yearly
// #else
#if DEBUG
return .yearly
#else
if let currentBestPlan = self.currentBestPlan,
let plan = StorePlan(rawValue: currentBestPlan.productID) {
return plan
}
return .none
// #endif
#endif
}
fileprivate func _updateBestPlan() {

Loading…
Cancel
Save