Skip to content

Commit 7cd965b

Browse files
committed
audio fixes
1 parent eeb446e commit 7cd965b

File tree

5 files changed

+8
-48
lines changed

5 files changed

+8
-48
lines changed

Examples/SwiftFortuneWheelDemo-iOS/SwiftFortuneWheelDemo-iOS/ViewControllers/SoundExample/SoundExampleViewController.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,16 @@ class SoundExampleViewController: UIViewController {
6262
}
6363

6464
func rotate() {
65-
fortuneWheel.startRotationAnimation(finishIndex: 0, continuousRotationTime: 5, nil)
65+
fortuneWheel.startRotationAnimation(finishIndex: 0, continuousRotationTime: 2, nil)
6666
}
6767

6868
@IBAction func impactFeedbackValueChanged(_ sender: UISwitch) {
6969
fortuneWheel.impactFeedbackOn = impactFeedbackSwitch.isOn
7070
}
7171

7272
@IBAction func soundEffectTypeValueChanged(_ sender: UISegmentedControl) {
73+
fortuneWheel.stopRotation()
74+
7375
fortuneWheel.edgeCollisionDetectionOn = soundEffectTypeSegmentedControl.selectedSegmentIndex == 0
7476

7577
fortuneWheel.centerCollisionDetectionOn = soundEffectTypeSegmentedControl.selectedSegmentIndex == 1

Sources/SwiftFortuneWheel/SwiftFortuneWheel.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public class SwiftFortuneWheel: SFWControl {
103103
private(set) lazy var audioPlayerManager = AudioPlayerManager()
104104

105105
#if os(iOS)
106-
@available(iOSApplicationExtension 10.0, *)
106+
@available(iOS 10.0, iOSApplicationExtension 10.0, *)
107107
private(set) lazy var impactFeedbackgenerator = UIImpactFeedbackGenerator(style: .light)
108108
#endif
109109

Sources/SwiftFortuneWheel/Utils/Audio/AudioPlayer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AudioPlayer {
1919
/// - file: Audio file that will be played
2020
/// - identifier: Sound identifier which is will start to play
2121
func play(_ file: AVAudioFile, identifier: SoundIdentifier) {
22-
if #available(iOSApplicationExtension 11.0, OSXApplicationExtension 10.13, tvOSApplicationExtension 11.0, *) {
22+
if #available(iOS 11.0, iOSApplicationExtension 11.0, OSX 10.13, OSXApplicationExtension 10.13, tvOS 11.0, tvOSApplicationExtension 11.0, *) {
2323
node.scheduleFile(file, at: nil, completionCallbackType: .dataPlayedBack) {
2424
[weak self] callbackType in
2525
self?.didCompletePlayback(for: identifier)

Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbackable.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import UIKit
1717
#if os(iOS)
1818
/// The protocol that adds support for the impact feedback
1919
protocol ImpactFeedbackable {
20-
@available(iOSApplicationExtension 10.0, *)
20+
@available(iOS 10.0, iOSApplicationExtension 10.0, *)
2121
/// Use impact feedback to indicate that an impact has occurred
2222
var impactFeedbackgenerator: UIImpactFeedbackGenerator { get }
2323
/// Impact feedback on or off
@@ -27,7 +27,7 @@ protocol ImpactFeedbackable {
2727
extension ImpactFeedbackable {
2828
/// Prepare impact feedback if needed
2929
func prepareImpactFeedbackIfNeeded() {
30-
if #available(iOSApplicationExtension 10.0, *) {
30+
if #available(iOS 10.0, iOSApplicationExtension 10.0, *) {
3131
guard impactFeedbackOn == true else { return }
3232
impactFeedbackgenerator.prepare()
3333
} else {
@@ -37,7 +37,7 @@ extension ImpactFeedbackable {
3737

3838
/// Generates impact feedback
3939
func impactFeedback() {
40-
if #available(iOSApplicationExtension 10.0, *) {
40+
if #available(iOS 10.0, iOSApplicationExtension 10.0, *) {
4141
if impactFeedbackOn {
4242
impactFeedbackgenerator.impactOccurred()
4343
}

Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbacking.swift

-42
This file was deleted.

0 commit comments

Comments
 (0)