deltaskins fix sounds loading

Signed-off-by: Joseph Mattiello <[email protected]>
Provenance-Emu · Feb 3, 2025 · c14dac3 · c14dac3
1 parent f0cdfbe
commit c14dac3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/PVSettings/Sources/PVSettings/Settings/Model/PVSettingsModel.swift b/PVSettings/Sources/PVSettings/Settings/Model/PVSettingsModel.swift
@@ -133,7 +133,6 @@ public enum ButtonSound: String, Codable, Equatable, UserDefaultsRepresentable,
     case click2 = "click2"
     case tap2 = "tap2"
     case click3 = "click3"
-    case tap3 = "tap3"
     case `switch` = "switch"
 
     public var description: String {
@@ -154,8 +153,6 @@ public enum ButtonSound: String, Codable, Equatable, UserDefaultsRepresentable,
             return "Tap 2"
         case .click3:
             return "Click 3"
-        case .tap3:
-            return "Tap 3"
         case .switch:
             return "Switch"
         }
@@ -176,11 +173,9 @@ public enum ButtonSound: String, Codable, Equatable, UserDefaultsRepresentable,
         case .click2:
             return "Mechanical click sound"
         case .tap2:
-            return "Soft tap sound"
+            return "Sharp tap sound"
         case .click3:
             return "Thudding click sound"
-        case .tap3:
-            return "Sharp tap sound"
         case .switch:
             return "Mechaniacal switch sound"
         }
@@ -203,8 +198,6 @@ public enum ButtonSound: String, Codable, Equatable, UserDefaultsRepresentable,
             return "button-click3"
         case .tap2:
             return "button-tap2"
-        case .tap3:
-            return "button-tap3"
         case .switch:
             return "button-switch"
         }

diff --git a/PVUI/Package.swift b/PVUI/Package.swift
@@ -104,7 +104,7 @@ let package = Package(
             resources: [
                 .copy("Resources/Shaders/fsh"),
                 .copy("Resources/Shaders/GLES"),
-                .process("Resources/Sounds"),
+                .copy("Resources/Sounds"),
                 .process("Resources/Shaders/Metal"),
                 .process("Resources/SystemIcons.xcassets"),
                 .process("Resources/Assets.xcassets"),

diff --git a/PVUI/Sources/PVUIBase/Audio/ButtonSoundGenerator.swift b/PVUI/Sources/PVUIBase/Audio/ButtonSoundGenerator.swift
@@ -24,7 +24,7 @@ public final class ButtonSoundGenerator {
         for sound in ButtonSound.allCases where sound != .none {
             guard let url = Bundle.module.url(forResource: sound.filename,
                                             withExtension: "wav",
-                                            subdirectory: "ButtonSounds"),
+                                            subdirectory: "Sounds/ButtonSounds"),
                   let file = try? AVAudioFile(forReading: url) else {
                 ELOG("Failed to load sound file: \(sound.filename).wav")
                 continue

diff --git a/PVUI/Sources/PVUIBase/Resources/Sounds/ButtonSounds/button-tap2.wav b/PVUI/Sources/PVUIBase/Resources/Sounds/ButtonSounds/button-tap2.wav
diff --git a/PVUI/Sources/PVUIBase/Resources/Sounds/ButtonSounds/button-tap3.wav b/PVUI/Sources/PVUIBase/Resources/Sounds/ButtonSounds/button-tap3.wav