Fixes typo
This commit is contained in:
@@ -333,7 +333,7 @@ public final class AudioPlayer {
|
||||
}
|
||||
}
|
||||
|
||||
fileStreamProcessor.effectCallback = { [weak self] effect in
|
||||
fileStreamProcessor.fileStreamCallback = { [weak self] effect in
|
||||
guard let self = self else { return }
|
||||
switch effect {
|
||||
case .proccessSource:
|
||||
|
||||
@@ -19,7 +19,7 @@ struct AudioConvertInfo {
|
||||
let packDescription: UnsafeMutablePointer<AudioStreamPacketDescription>?
|
||||
}
|
||||
|
||||
enum FileStreamProccessorEffect {
|
||||
enum FileStreamProcessorEffect {
|
||||
case proccessSource
|
||||
case raiseError(AudioPlayerError)
|
||||
}
|
||||
@@ -28,7 +28,7 @@ enum FileStreamProccessorEffect {
|
||||
final class AudioFileStreamProcessor {
|
||||
private let maxCompressedPacketForBitrate = 4096
|
||||
|
||||
var effectCallback: ((FileStreamProccessorEffect) -> Void)?
|
||||
var fileStreamCallback: ((FileStreamProcessorEffect) -> Void)?
|
||||
|
||||
private let playerContext: AudioPlayerContext
|
||||
private let rendererContext: AudioRendererContext
|
||||
@@ -165,7 +165,7 @@ final class AudioFileStreamProcessor {
|
||||
|
||||
if audioConverter == nil {
|
||||
guard AudioConverterNew(&inputFormat, &outputFormat, &audioConverter) == noErr else {
|
||||
effectCallback?(.raiseError(.audioSystemError(.fileStreamError)))
|
||||
fileStreamCallback?(.raiseError(.audioSystemError(.fileStreamError)))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -183,7 +183,7 @@ final class AudioFileStreamProcessor {
|
||||
return
|
||||
}
|
||||
guard AudioFileStreamSetProperty(fileStream, kAudioConverterDecompressionMagicCookie, cookieSize, cookie) == noErr else {
|
||||
effectCallback?(.raiseError(.audioSystemError(.fileStreamError)))
|
||||
fileStreamCallback?(.raiseError(.audioSystemError(.fileStreamError)))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -328,7 +328,7 @@ final class AudioFileStreamProcessor {
|
||||
if let playingEntry = playerContext.audioPlayingEntry,
|
||||
playingEntry.seekRequest.requested, playingEntry.calculatedBitrate() > 0
|
||||
{
|
||||
effectCallback?(.proccessSource)
|
||||
fileStreamCallback?(.proccessSource)
|
||||
if rendererContext.waiting.value {
|
||||
rendererContext.packetsSemaphore.signal()
|
||||
}
|
||||
@@ -388,7 +388,7 @@ final class AudioFileStreamProcessor {
|
||||
if let playingEntry = playerContext.audioPlayingEntry,
|
||||
playingEntry.seekRequest.requested, playingEntry.calculatedBitrate() > 0
|
||||
{
|
||||
effectCallback?(.proccessSource)
|
||||
fileStreamCallback?(.proccessSource)
|
||||
if rendererContext.waiting.value {
|
||||
rendererContext.packetsSemaphore.signal()
|
||||
}
|
||||
|
||||
@@ -47,5 +47,5 @@ protocol AudioStreamSource: CoreAudioStreamSource {
|
||||
var underlyingQueue: DispatchQueue { get }
|
||||
|
||||
/// A `MetadataStreamSource` object that handles the metadata parsing
|
||||
var metadataStreamProccessor: MetadataStreamSource { get }
|
||||
var metadataStreamProcessor: MetadataStreamSource { get }
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
private var relativePosition: Int
|
||||
private var seekOffset: Int
|
||||
|
||||
internal var metadataStreamProccessor: MetadataStreamSource
|
||||
internal var metadataStreamProcessor: MetadataStreamSource
|
||||
|
||||
internal var audioFileHint: AudioFileTypeID {
|
||||
guard let output = parsedHeaderOutput else {
|
||||
@@ -48,7 +48,7 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
httpHeaders: [String: String])
|
||||
{
|
||||
networkingClient = networking
|
||||
metadataStreamProccessor = metadataStreamSource
|
||||
metadataStreamProcessor = metadataStreamSource
|
||||
self.url = url
|
||||
additionalRequestHeaders = httpHeaders
|
||||
relativePosition = 0
|
||||
@@ -67,9 +67,9 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
httpHeaders: [String: String])
|
||||
{
|
||||
let metadataParser = MetadataParser()
|
||||
let metadataProccessor = MetadataStreamProcessor(parser: metadataParser.eraseToAnyParser())
|
||||
let metadataProcessor = MetadataStreamProcessor(parser: metadataParser.eraseToAnyParser())
|
||||
self.init(networking: networking,
|
||||
metadataStreamSource: metadataProccessor,
|
||||
metadataStreamSource: metadataProcessor,
|
||||
url: url,
|
||||
underlyingQueue: underlyingQueue,
|
||||
httpHeaders: httpHeaders)
|
||||
@@ -133,7 +133,7 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
.resume()
|
||||
|
||||
streamRequest = request
|
||||
metadataStreamProccessor.delegate = self
|
||||
metadataStreamProcessor.delegate = self
|
||||
}
|
||||
|
||||
// MARK: - Network Handle Methods
|
||||
@@ -163,8 +163,8 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
switch event {
|
||||
case let .success(value):
|
||||
if let data = value.data {
|
||||
if metadataStreamProccessor.canProccessMetadata {
|
||||
let extractedAudioData = metadataStreamProccessor.proccessMetadata(data: data)
|
||||
if metadataStreamProcessor.canProccessMetadata {
|
||||
let extractedAudioData = metadataStreamProcessor.proccessMetadata(data: data)
|
||||
delegate?.dataAvailable(source: self, data: extractedAudioData)
|
||||
} else {
|
||||
delegate?.dataAvailable(source: self, data: data)
|
||||
@@ -183,7 +183,7 @@ public class RemoteAudioSource: AudioStreamSource {
|
||||
parsedHeaderOutput = parser.parse(input: response)
|
||||
// check to see if we have metadata to proccess
|
||||
if let metadataStep = parsedHeaderOutput?.metadataStep {
|
||||
metadataStreamProccessor.metadataAvailable(step: metadataStep)
|
||||
metadataStreamProcessor.metadataAvailable(step: metadataStep)
|
||||
}
|
||||
// check for error
|
||||
if httpStatusCode == 416 { // range not satisfied error
|
||||
|
||||
Reference in New Issue
Block a user