Skip to content

Commit

Permalink
🔀 Merge branch 'hugo/fetaure/Add-DanceFreeze-musics'
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed Sep 15, 2023
2 parents f99be10 + eeba9b8 commit ed16b16
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 16 deletions.
3 changes: 0 additions & 3 deletions Apps/LekaActivityUIExplorer/Resources/Sounds/nyan.mp3

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class ExplorerActivity: ObservableObject {
case .listenThenTouchToSelect:
return ["guitar"]
case .danceFreeze:
return ["nyan"]
return ["guitar"]
default:
return nil
}
Expand Down
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
3 changes: 0 additions & 3 deletions Modules/GameEngineKit/Resources/Sounds/nyan.mp3

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import DesignKit
import SwiftUI

public let kAvailableSongs: [AudioRecordingModel] = [
// TO DO : (@hugo) Replace nyan by validated free use music
AudioRecordingModel(name: "Frère Jacques", file: "nyan"),
AudioRecordingModel(name: "Dansons la Capucine", file: "nyan"),
AudioRecordingModel(name: "Petit Escargot", file: "nyan"),
AudioRecordingModel(name: "Stairway to Heaven", file: "nyan"),
AudioRecordingModel(name: "Can you feel the love tonight", file: "nyan"),
AudioRecordingModel(name: "Cette année là", file: "nyan"),
AudioRecordingModel(name: "Giggly Squirrel", file: "Giggly_Squirrel"),
AudioRecordingModel(name: "Empty Page", file: "Empty_Page"),
AudioRecordingModel(name: "Early Bird", file: "Early_Bird"),
AudioRecordingModel(name: "Hands On", file: "Hands_On"),
AudioRecordingModel(name: "In The Game", file: "In_The_Game"),
AudioRecordingModel(name: "Little by Little", file: "Little_by_little"),
]

struct SongSelector: View {
Expand Down
4 changes: 2 additions & 2 deletions Modules/GameEngineKit/Sources/Utils/AudioPlayer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class AudioPlayer: NSObject, ObservableObject {
didFinishPlaying = false

do {
let path = Bundle.main.path(forResource: audioRecording.file, ofType: "mp3")!
player = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: path))
let fileUrl = Bundle.module.url(forResource: audioRecording.file, withExtension: "mp3")!
player = try AVAudioPlayer(contentsOf: fileUrl)
player.delegate = self
} catch {
print("ERROR - mp3 file not found - \(error)")
Expand Down

0 comments on commit ed16b16

Please sign in to comment.