Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| abb0a29fb4 | |||
| ed3ba9698d | |||
| 294902e3fe | |||
| c25071d83a | |||
| 19db1fc74b |
@@ -115,10 +115,11 @@ class AudioDiskEngine: AudioEngine {
|
||||
}
|
||||
|
||||
let playing = playerNode.isPlaying
|
||||
let seekToNeedle = needle > Needle(duration) ? Needle(duration) : needle
|
||||
|
||||
self.needle = needle // to tick while paused
|
||||
self.needle = seekToNeedle // to tick while paused
|
||||
|
||||
seekFrame = AVAudioFramePosition(Float(needle) * audioSampleRate)
|
||||
seekFrame = AVAudioFramePosition(Float(seekToNeedle) * audioSampleRate)
|
||||
seekFrame = max(seekFrame, 0)
|
||||
seekFrame = min(seekFrame, audioLengthSamples)
|
||||
currentPosition = seekFrame
|
||||
|
||||
@@ -273,6 +273,15 @@ class AudioStreamEngine: AudioEngine {
|
||||
//MARK:- Overriden From Parent
|
||||
override func seek(toNeedle needle: Needle) {
|
||||
Log.info("didSeek to needle: \(needle)")
|
||||
|
||||
// if not playable (data not loaded etc), duration could be zero.
|
||||
guard isPlayable else {
|
||||
if predictedStreamDuration == 0 {
|
||||
seekNeedleCommandBeforeEngineWasReady = needle
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
guard needle < (ceil(predictedStreamDuration)) else {
|
||||
if !isPlayable {
|
||||
seekNeedleCommandBeforeEngineWasReady = needle
|
||||
|
||||
@@ -585,8 +585,7 @@ extension SAPlayer: SAPlayerDelegate {
|
||||
}
|
||||
|
||||
internal func seekEngine(toNeedle needle: Needle) {
|
||||
var seekToNeedle = needle < 0 ? 0 : needle
|
||||
seekToNeedle = needle > Needle(duration ?? 0) ? Needle(duration ?? 0) : needle
|
||||
let seekToNeedle = needle < 0 ? 0 : needle
|
||||
player?.seek(toNeedle: seekToNeedle)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'SwiftAudioPlayer'
|
||||
s.version = '6.4.0'
|
||||
s.version = '7.1.0'
|
||||
s.summary = 'SwiftAudioPlayer is a Swift based audio player that can handle streaming from a remote location and audio manipulation.'
|
||||
|
||||
# This description is used to generate tags and improve search results.
|
||||
|
||||
Reference in New Issue
Block a user