Skip to content

Commit

Permalink
Always split before preposition
Browse files Browse the repository at this point in the history
  • Loading branch information
@DougGregor
DougGregor committed Feb 9, 2016
1 parent eeca3ac commit da7e512
Show file tree
Hide file tree
Showing 1,372 changed files with 7,622 additions and 7,622 deletions.
26 changes: 13 additions & 13 deletions Platforms/OSX/AVFoundation/AVAsset.swift
View file
Expand Up @@ -10,9 +10,9 @@ class AVAsset : Object, Copying, AVAsynchronousKeyValueLoading {
@available(OSX 10.7, *) @available(OSX 10.7, *)
func copyWith(zone: Zone = nil) -> AnyObject func copyWith(zone: Zone = nil) -> AnyObject
@available(OSX 10.7, *) @available(OSX 10.7, *)
func statusOfValueFor(key key: String, error outError: ErrorPointer) -> AVKeyValueStatus func statusOfValue(forKey key: String, error outError: ErrorPointer) -> AVKeyValueStatus
@available(OSX 10.7, *) @available(OSX 10.7, *)
func loadValuesAsynchronouslyFor(keys keys: [String], completionHandler handler: (() -> Void)? = nil) func loadValuesAsynchronously(forKeys keys: [String], completionHandler handler: (() -> Void)? = nil)
} }
extension AVAsset { extension AVAsset {
var providesPreciseDurationAndTiming: Bool { get } var providesPreciseDurationAndTiming: Bool { get }
Expand All @@ -34,9 +34,9 @@ struct AVAssetReferenceRestrictions : OptionSetType {
} }
extension AVAsset { extension AVAsset {
var tracks: [AVAssetTrack] { get } var tracks: [AVAssetTrack] { get }
func trackWith(trackID trackID: CMPersistentTrackID) -> AVAssetTrack? func track(withTrackID trackID: CMPersistentTrackID) -> AVAssetTrack?
func tracksWith(mediaType mediaType: String) -> [AVAssetTrack] func tracks(withMediaType mediaType: String) -> [AVAssetTrack]
func tracksWith(mediaCharacteristic mediaCharacteristic: String) -> [AVAssetTrack] func tracks(withMediaCharacteristic mediaCharacteristic: String) -> [AVAssetTrack]
@available(OSX 10.9, *) @available(OSX 10.9, *)
var trackGroups: [AVAssetTrackGroup] { get } var trackGroups: [AVAssetTrackGroup] { get }
} }
Expand All @@ -48,21 +48,21 @@ extension AVAsset {
@available(OSX 10.10, *) @available(OSX 10.10, *)
var metadata: [AVMetadataItem] { get } var metadata: [AVMetadataItem] { get }
var availableMetadataFormats: [String] { get } var availableMetadataFormats: [String] { get }
func metadataFor(format format: String) -> [AVMetadataItem] func metadata(forFormat format: String) -> [AVMetadataItem]
} }
extension AVAsset { extension AVAsset {
@available(OSX 10.7, *) @available(OSX 10.7, *)
var availableChapterLocales: [Locale] { get } var availableChapterLocales: [Locale] { get }
@available(OSX 10.7, *) @available(OSX 10.7, *)
func chapterMetadataGroupsWith(titleLocale locale: Locale, containingItemsWithCommonKeys commonKeys: [String]?) -> [AVTimedMetadataGroup] func chapterMetadataGroups(withTitleLocale locale: Locale, containingItemsWithCommonKeys commonKeys: [String]?) -> [AVTimedMetadataGroup]
@available(OSX 10.8, *) @available(OSX 10.8, *)
func chapterMetadataGroupsBestMatching(preferredLanguages preferredLanguages: [String]) -> [AVTimedMetadataGroup] func chapterMetadataGroupsBest(matchingPreferredLanguages preferredLanguages: [String]) -> [AVTimedMetadataGroup]

This comment has been minimized.

Sign in to view

Copy link
@masters3d

masters3d Feb 10, 2016

Contributor

Should this be bestMatching
} }
extension AVAsset { extension AVAsset {
@available(OSX 10.8, *) @available(OSX 10.8, *)
var availableMediaCharacteristicsWithMediaSelectionOptions: [String] { get } var availableMediaCharacteristicsWithMediaSelectionOptions: [String] { get }
@available(OSX 10.8, *) @available(OSX 10.8, *)
func mediaSelectionGroupFor(mediaCharacteristic mediaCharacteristic: String) -> AVMediaSelectionGroup? func mediaSelectionGroup(forMediaCharacteristic mediaCharacteristic: String) -> AVMediaSelectionGroup?
@available(OSX 10.11, *) @available(OSX 10.11, *)
var preferredMediaSelection: AVMediaSelection { get } var preferredMediaSelection: AVMediaSelection { get }
} }
Expand Down Expand Up @@ -109,7 +109,7 @@ extension AVURLAsset {
var resourceLoader: AVAssetResourceLoader { get } var resourceLoader: AVAssetResourceLoader { get }
} }
extension AVURLAsset { extension AVURLAsset {
func compatibleTrackFor(compositionTrack: AVCompositionTrack) -> AVAssetTrack? func compatibleTrack(forCompositionTrack compositionTrack: AVCompositionTrack) -> AVAssetTrack?
} }
@available(OSX 10.11, *) @available(OSX 10.11, *)
let AVAssetDurationDidChangeNotification: String let AVAssetDurationDidChangeNotification: String
Expand All @@ -134,9 +134,9 @@ class AVFragmentedAsset : AVURLAsset, AVFragmentMinding {
var isAssociatedWithFragmentMinder: Bool { get } var isAssociatedWithFragmentMinder: Bool { get }
} }
extension AVFragmentedAsset { extension AVFragmentedAsset {
func trackWith(trackID trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack? func track(withTrackID trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
func tracksWith(mediaType mediaType: String) -> [AVFragmentedAssetTrack] func tracks(withMediaType mediaType: String) -> [AVFragmentedAssetTrack]
func tracksWith(mediaCharacteristic mediaCharacteristic: String) -> [AVFragmentedAssetTrack] func tracks(withMediaCharacteristic mediaCharacteristic: String) -> [AVFragmentedAssetTrack]
} }
@available(OSX 10.11, *) @available(OSX 10.11, *)
class AVFragmentedAssetMinder : Object { class AVFragmentedAssetMinder : Object {
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAssetExportSession.swift
View file
Expand Up @@ -62,14 +62,14 @@ class AVAssetExportSession : Object {
} }
extension AVAssetExportSession { extension AVAssetExportSession {
class func allExportPresets() -> [String] class func allExportPresets() -> [String]
class func exportPresetsCompatibleWith(asset: AVAsset) -> [String] class func exportPresetsCompatible(withAsset asset: AVAsset) -> [String]
@available(OSX 10.9, *) @available(OSX 10.9, *)
class func determineCompatibilityOfExportPreset(presetName: String, withAsset asset: AVAsset, outputFileType: String?, completionHandler handler: (Bool) -> Void) class func determineCompatibilityOfExportPreset(presetName: String, withAsset asset: AVAsset, outputFileType: String?, completionHandler handler: (Bool) -> Void)
} }
extension AVAssetExportSession { extension AVAssetExportSession {
var supportedFileTypes: [String] { get } var supportedFileTypes: [String] { get }
@available(OSX 10.9, *) @available(OSX 10.9, *)
func determineCompatibleFileTypesWith(completionHandler handler: ([String]) -> Void) func determineCompatibleFileTypes(withCompletionHandler handler: ([String]) -> Void)
} }
extension AVAssetExportSession { extension AVAssetExportSession {
var timeRange: CMTimeRange var timeRange: CMTimeRange
Expand Down
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAssetImageGenerator.swift
View file
Expand Up @@ -28,7 +28,7 @@ class AVAssetImageGenerator : Object {
var requestedTimeToleranceAfter: CMTime var requestedTimeToleranceAfter: CMTime
init(asset: AVAsset) init(asset: AVAsset)
func copyCGImageAt(requestedTime: CMTime, actualTime: UnsafeMutablePointer<CMTime>) throws -> CGImage func copyCGImageAt(requestedTime: CMTime, actualTime: UnsafeMutablePointer<CMTime>) throws -> CGImage
func generateCGImagesAsynchronouslyFor(times requestedTimes: [Value], completionHandler handler: AVAssetImageGeneratorCompletionHandler) func generateCGImagesAsynchronously(forTimes requestedTimes: [Value], completionHandler handler: AVAssetImageGeneratorCompletionHandler)
func cancelAllCGImageGeneration() func cancelAllCGImageGeneration()
} }
typealias AVAssetImageGeneratorCompletionHandler = (CMTime, CGImage?, CMTime, AVAssetImageGeneratorResult, Error?) -> Void typealias AVAssetImageGeneratorCompletionHandler = (CMTime, CGImage?, CMTime, AVAssetImageGeneratorResult, Error?) -> Void
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAssetResourceLoader.swift
View file
Expand Up @@ -53,14 +53,14 @@ class AVAssetResourceLoadingDataRequest : Object {
@available(OSX 10.11, *) @available(OSX 10.11, *)
var requestsAllDataToEndOfResource: Bool { get } var requestsAllDataToEndOfResource: Bool { get }
var currentOffset: Int64 { get } var currentOffset: Int64 { get }
func respondWith(data: Data) func respond(withData data: Data)
} }
extension AVAssetResourceLoader { extension AVAssetResourceLoader {
@available(OSX 10.11, *) @available(OSX 10.11, *)
var preloadsEligibleContentKeys: Bool var preloadsEligibleContentKeys: Bool
} }
extension AVAssetResourceLoadingRequest { extension AVAssetResourceLoadingRequest {
func streamingContentKeyRequestDataFor(app appIdentifier: Data, contentIdentifier: Data, options: [String : AnyObject]? = [:]) throws -> Data func streamingContentKeyRequestData(forApp appIdentifier: Data, contentIdentifier: Data, options: [String : AnyObject]? = [:]) throws -> Data
} }
extension AVAssetResourceLoadingRequest { extension AVAssetResourceLoadingRequest {
} }
8 changes: 4 additions & 4 deletions Platforms/OSX/AVFoundation/AVAssetTrack.swift
View file
Expand Up @@ -6,9 +6,9 @@ class AVAssetTrack : Object, Copying, AVAsynchronousKeyValueLoading {
@available(OSX 10.7, *) @available(OSX 10.7, *)
func copyWith(zone: Zone = nil) -> AnyObject func copyWith(zone: Zone = nil) -> AnyObject
@available(OSX 10.7, *) @available(OSX 10.7, *)
func statusOfValueFor(key key: String, error outError: ErrorPointer) -> AVKeyValueStatus func statusOfValue(forKey key: String, error outError: ErrorPointer) -> AVKeyValueStatus
@available(OSX 10.7, *) @available(OSX 10.7, *)
func loadValuesAsynchronouslyFor(keys keys: [String], completionHandler handler: (() -> Void)? = nil) func loadValuesAsynchronously(forKeys keys: [String], completionHandler handler: (() -> Void)? = nil)
} }
extension AVAssetTrack { extension AVAssetTrack {
var mediaType: String { get } var mediaType: String { get }
Expand Down Expand Up @@ -53,13 +53,13 @@ extension AVAssetTrack {
@available(OSX 10.10, *) @available(OSX 10.10, *)
var metadata: [AVMetadataItem] { get } var metadata: [AVMetadataItem] { get }
var availableMetadataFormats: [String] { get } var availableMetadataFormats: [String] { get }
func metadataFor(format format: String) -> [AVMetadataItem] func metadata(forFormat format: String) -> [AVMetadataItem]
} }
extension AVAssetTrack { extension AVAssetTrack {
@available(OSX 10.9, *) @available(OSX 10.9, *)
var availableTrackAssociationTypes: [String] { get } var availableTrackAssociationTypes: [String] { get }
@available(OSX 10.9, *) @available(OSX 10.9, *)
func associatedTracksOf(type trackAssociationType: String) -> [AVAssetTrack] func associatedTracks(ofType trackAssociationType: String) -> [AVAssetTrack]
} }
@available(OSX 10.9, *) @available(OSX 10.9, *)
let AVTrackAssociationTypeAudioFallback: String let AVTrackAssociationTypeAudioFallback: String
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAssetWriterInput.swift
View file
Expand Up @@ -44,9 +44,9 @@ extension AVAssetWriterInput {
} }
extension AVAssetWriterInput { extension AVAssetWriterInput {
@available(OSX 10.9, *) @available(OSX 10.9, *)
func canAddTrackAssociationWithTrackOf(input: AVAssetWriterInput, type trackAssociationType: String) -> Bool func canAddTrackAssociationWithTrack(of input: AVAssetWriterInput, type trackAssociationType: String) -> Bool
@available(OSX 10.9, *) @available(OSX 10.9, *)
func addTrackAssociationWithTrackOf(input: AVAssetWriterInput, type trackAssociationType: String) func addTrackAssociationWithTrack(of input: AVAssetWriterInput, type trackAssociationType: String)
} }
extension AVAssetWriterInput { extension AVAssetWriterInput {
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAsynchronousKeyValueLoading.swift
View file
Expand Up @@ -9,6 +9,6 @@ enum AVKeyValueStatus : Int {
case cancelled case cancelled
} }
protocol AVAsynchronousKeyValueLoading { protocol AVAsynchronousKeyValueLoading {
func statusOfValueFor(key key: String, error outError: ErrorPointer) -> AVKeyValueStatus func statusOfValue(forKey key: String, error outError: ErrorPointer) -> AVKeyValueStatus
func loadValuesAsynchronouslyFor(keys keys: [String], completionHandler handler: (() -> Void)? = nil) func loadValuesAsynchronously(forKeys keys: [String], completionHandler handler: (() -> Void)? = nil)
} }
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioConverter.swift
View file
Expand Up @@ -44,8 +44,8 @@ class AVAudioConverter : Object {
var sampleRateConverterAlgorithm: String var sampleRateConverterAlgorithm: String
var primeMethod: AVAudioConverterPrimeMethod var primeMethod: AVAudioConverterPrimeMethod
var primeInfo: AVAudioConverterPrimeInfo var primeInfo: AVAudioConverterPrimeInfo
func convertTo(outputBuffer: AVAudioPCMBuffer, from inputBuffer: AVAudioPCMBuffer) throws func convert(to outputBuffer: AVAudioPCMBuffer, from inputBuffer: AVAudioPCMBuffer) throws
func convertTo(outputBuffer: AVAudioBuffer, error outError: ErrorPointer, withInputFrom inputBlock: AVAudioConverterInputBlock) -> AVAudioConverterOutputStatus func convert(to outputBuffer: AVAudioBuffer, error outError: ErrorPointer, withInputFrom inputBlock: AVAudioConverterInputBlock) -> AVAudioConverterOutputStatus
init() init()
} }
extension AVAudioConverter { extension AVAudioConverter {
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioEngine.swift
View file
Expand Up @@ -18,9 +18,9 @@ class AVAudioEngine : Object {
func reset() func reset()
func stop() func stop()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func inputConnectionPointFor(node: AVAudioNode, inputBus bus: AVAudioNodeBus) -> AVAudioConnectionPoint? func inputConnectionPoint(forNode node: AVAudioNode, inputBus bus: AVAudioNodeBus) -> AVAudioConnectionPoint?
@available(OSX 10.11, *) @available(OSX 10.11, *)
func outputConnectionPointsFor(node: AVAudioNode, outputBus bus: AVAudioNodeBus) -> [AVAudioConnectionPoint] func outputConnectionPoints(forNode node: AVAudioNode, outputBus bus: AVAudioNodeBus) -> [AVAudioConnectionPoint]
var musicSequence: MusicSequence var musicSequence: MusicSequence
var outputNode: AVAudioOutputNode { get } var outputNode: AVAudioOutputNode { get }
var inputNode: AVAudioInputNode? { get } var inputNode: AVAudioInputNode? { get }
Expand Down
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAudioEnvironmentNode.swift
View file
Expand Up @@ -35,7 +35,7 @@ class AVAudioEnvironmentNode : AVAudioNode, AVAudioMixing {
var applicableRenderingAlgorithms: [Number] { get } var applicableRenderingAlgorithms: [Number] { get }
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
6 changes: 3 additions & 3 deletions Platforms/OSX/AVFoundation/AVAudioFile.swift
View file
Expand Up @@ -5,9 +5,9 @@ class AVAudioFile : Object {
init(forReading fileURL: URL, commonFormat format: AVAudioCommonFormat, interleaved: Bool) throws init(forReading fileURL: URL, commonFormat format: AVAudioCommonFormat, interleaved: Bool) throws
init(forWriting fileURL: URL, settings: [String : AnyObject]) throws init(forWriting fileURL: URL, settings: [String : AnyObject]) throws
init(forWriting fileURL: URL, settings: [String : AnyObject], commonFormat format: AVAudioCommonFormat, interleaved: Bool) throws init(forWriting fileURL: URL, settings: [String : AnyObject], commonFormat format: AVAudioCommonFormat, interleaved: Bool) throws
func readInto(buffer: AVAudioPCMBuffer) throws func read(into buffer: AVAudioPCMBuffer) throws
func readInto(buffer: AVAudioPCMBuffer, frameCount frames: AVAudioFrameCount) throws func read(into buffer: AVAudioPCMBuffer, frameCount frames: AVAudioFrameCount) throws
func writeFrom(buffer: AVAudioPCMBuffer) throws func write(from buffer: AVAudioPCMBuffer) throws
var url: URL { get } var url: URL { get }
var fileFormat: AVAudioFormat { get } var fileFormat: AVAudioFormat { get }
var processingFormat: AVAudioFormat { get } var processingFormat: AVAudioFormat { get }
Expand Down
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAudioIONode.swift
View file
Expand Up @@ -9,7 +9,7 @@ class AVAudioIONode : AVAudioNode {
class AVAudioInputNode : AVAudioIONode, AVAudioMixing { class AVAudioInputNode : AVAudioIONode, AVAudioMixing {
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAudioMixerNode.swift
View file
Expand Up @@ -5,7 +5,7 @@ class AVAudioMixerNode : AVAudioNode, AVAudioMixing {
var nextAvailableInputBus: AVAudioNodeBus { get } var nextAvailableInputBus: AVAudioNodeBus { get }
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioMixing.swift
View file
Expand Up @@ -2,7 +2,7 @@
@available(OSX 10.10, *) @available(OSX 10.10, *)
protocol AVAudioMixing : AVAudioStereoMixing, AVAudio3DMixing { protocol AVAudioMixing : AVAudioStereoMixing, AVAudio3DMixing {
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
var volume: Float { get set } var volume: Float { get set }
} }
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down Expand Up @@ -33,7 +33,7 @@ class AVAudioMixingDestination : Object, AVAudioMixing {
var connectionPoint: AVAudioConnectionPoint { get } var connectionPoint: AVAudioConnectionPoint { get }
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
12 changes: 6 additions & 6 deletions Platforms/OSX/AVFoundation/AVAudioNode.swift
View file
Expand Up @@ -3,12 +3,12 @@ typealias AVAudioNodeTapBlock = (AVAudioPCMBuffer, AVAudioTime) -> Void
@available(OSX 10.10, *) @available(OSX 10.10, *)
class AVAudioNode : Object { class AVAudioNode : Object {
func reset() func reset()
func inputFormatFor(bus bus: AVAudioNodeBus) -> AVAudioFormat func inputFormat(forBus bus: AVAudioNodeBus) -> AVAudioFormat
func outputFormatFor(bus bus: AVAudioNodeBus) -> AVAudioFormat func outputFormat(forBus bus: AVAudioNodeBus) -> AVAudioFormat
func nameFor(inputBus bus: AVAudioNodeBus) -> String func name(forInputBus bus: AVAudioNodeBus) -> String
func nameFor(outputBus bus: AVAudioNodeBus) -> String func name(forOutputBus bus: AVAudioNodeBus) -> String
func installTapOn(bus bus: AVAudioNodeBus, bufferSize: AVAudioFrameCount, format: AVAudioFormat?, block tapBlock: AVAudioNodeTapBlock) func installTap(onBus bus: AVAudioNodeBus, bufferSize: AVAudioFrameCount, format: AVAudioFormat?, block tapBlock: AVAudioNodeTapBlock)
func removeTapOn(bus bus: AVAudioNodeBus) func removeTap(onBus bus: AVAudioNodeBus)
var engine: AVAudioEngine? { get } var engine: AVAudioEngine? { get }
var numberOfInputs: Int { get } var numberOfInputs: Int { get }
var numberOfOutputs: Int { get } var numberOfOutputs: Int { get }
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioPlayer.swift
View file
Expand Up @@ -34,8 +34,8 @@ class AVAudioPlayer : Object {
var settings: [String : AnyObject] { get } var settings: [String : AnyObject] { get }
var isMeteringEnabled: Bool var isMeteringEnabled: Bool
func updateMeters() func updateMeters()
func peakPowerFor(channel channelNumber: Int) -> Float func peakPower(forChannel channelNumber: Int) -> Float
func averagePowerFor(channel channelNumber: Int) -> Float func averagePower(forChannel channelNumber: Int) -> Float
init() init()
} }
protocol AVAudioPlayerDelegate : ObjectProtocol { protocol AVAudioPlayerDelegate : ObjectProtocol {
Expand Down
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAudioPlayerNode.swift
View file
Expand Up @@ -23,7 +23,7 @@ class AVAudioPlayerNode : AVAudioNode, AVAudioMixing {
var isPlaying: Bool { get } var isPlaying: Bool { get }
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down
6 changes: 3 additions & 3 deletions Platforms/OSX/AVFoundation/AVAudioRecorder.swift
View file
Expand Up @@ -4,7 +4,7 @@ class AVAudioRecorder : Object {
init(url: URL, settings: [String : AnyObject]) throws init(url: URL, settings: [String : AnyObject]) throws
func prepareToRecord() -> Bool func prepareToRecord() -> Bool
func record() -> Bool func record() -> Bool
func recordFor(duration duration: TimeInterval) -> Bool func record(forDuration duration: TimeInterval) -> Bool
func pause() func pause()
func stop() func stop()
func deleteRecording() -> Bool func deleteRecording() -> Bool
Expand All @@ -15,8 +15,8 @@ class AVAudioRecorder : Object {
var currentTime: TimeInterval { get } var currentTime: TimeInterval { get }
var isMeteringEnabled: Bool var isMeteringEnabled: Bool
func updateMeters() func updateMeters()
func peakPowerFor(channel channelNumber: Int) -> Float func peakPower(forChannel channelNumber: Int) -> Float
func averagePowerFor(channel channelNumber: Int) -> Float func averagePower(forChannel channelNumber: Int) -> Float
init() init()
} }
protocol AVAudioRecorderDelegate : ObjectProtocol { protocol AVAudioRecorderDelegate : ObjectProtocol {
Expand Down
14 changes: 7 additions & 7 deletions Platforms/OSX/AVFoundation/AVAudioSequencer.swift
View file
Expand Up @@ -19,12 +19,12 @@ func AVMakeBeatRange(startBeat: AVMusicTimeStamp, _ lengthInBeats: AVMusicTimeSt
class AVAudioSequencer : Object { class AVAudioSequencer : Object {
init() init()
init(audioEngine engine: AVAudioEngine) init(audioEngine engine: AVAudioEngine)
func loadFrom(fileURL: URL, options: AVMusicSequenceLoadOptions = []) throws func load(from fileURL: URL, options: AVMusicSequenceLoadOptions = []) throws
func loadFrom(data: Data, options: AVMusicSequenceLoadOptions = []) throws func load(from data: Data, options: AVMusicSequenceLoadOptions = []) throws
func writeTo(fileURL: URL, smpteResolution resolution: Int, replaceExisting replace: Bool) throws func write(to fileURL: URL, smpteResolution resolution: Int, replaceExisting replace: Bool) throws
func dataWith(smpteResolution SMPTEResolution: Int, error outError: ErrorPointer) -> Data func data(withSMPTEResolution SMPTEResolution: Int, error outError: ErrorPointer) -> Data
func secondsFor(beats beats: AVMusicTimeStamp) -> TimeInterval func seconds(forBeats beats: AVMusicTimeStamp) -> TimeInterval
func beatsFor(seconds seconds: TimeInterval) -> AVMusicTimeStamp func beats(forSeconds seconds: TimeInterval) -> AVMusicTimeStamp
var tracks: [AVMusicTrack] { get } var tracks: [AVMusicTrack] { get }
var tempoTrack: AVMusicTrack { get } var tempoTrack: AVMusicTrack { get }
var userInfo: [String : AnyObject] { get } var userInfo: [String : AnyObject] { get }
Expand All @@ -34,7 +34,7 @@ extension AVAudioSequencer {
var currentPositionInBeats: TimeInterval var currentPositionInBeats: TimeInterval
var isPlaying: Bool { get } var isPlaying: Bool { get }
var rate: Float var rate: Float
func hostTimeFor(beats inBeats: AVMusicTimeStamp, error outError: ErrorPointer) -> UInt64 func hostTime(forBeats inBeats: AVMusicTimeStamp, error outError: ErrorPointer) -> UInt64
func beatsForHostTime(inHostTime: UInt64, error outError: ErrorPointer) -> AVMusicTimeStamp func beatsForHostTime(inHostTime: UInt64, error outError: ErrorPointer) -> AVMusicTimeStamp
func prepareToPlay() func prepareToPlay()
func start() throws func start() throws
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioTime.swift
View file
Expand Up @@ -5,9 +5,9 @@ class AVAudioTime : Object {
init(hostTime: UInt64) init(hostTime: UInt64)
init(sampleTime: AVAudioFramePosition, atRate sampleRate: Double) init(sampleTime: AVAudioFramePosition, atRate sampleRate: Double)
init(hostTime: UInt64, sampleTime: AVAudioFramePosition, atRate sampleRate: Double) init(hostTime: UInt64, sampleTime: AVAudioFramePosition, atRate sampleRate: Double)
class func hostTimeFor(seconds seconds: TimeInterval) -> UInt64 class func hostTime(forSeconds seconds: TimeInterval) -> UInt64
class func secondsForHostTime(hostTime: UInt64) -> TimeInterval class func secondsForHostTime(hostTime: UInt64) -> TimeInterval
func extrapolateTimeFrom(anchor anchorTime: AVAudioTime) -> AVAudioTime func extrapolateTime(fromAnchor anchorTime: AVAudioTime) -> AVAudioTime
var isHostTimeValid: Bool { get } var isHostTimeValid: Bool { get }
var hostTime: UInt64 { get } var hostTime: UInt64 { get }
var isSampleTimeValid: Bool { get } var isSampleTimeValid: Bool { get }
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioUnit.swift
View file
Expand Up @@ -2,8 +2,8 @@
@available(OSX 10.10, *) @available(OSX 10.10, *)
class AVAudioUnit : AVAudioNode { class AVAudioUnit : AVAudioNode {
@available(OSX 10.11, *) @available(OSX 10.11, *)
class func instantiateWith(audioComponentDescription: AudioComponentDescription, options: AudioComponentInstantiationOptions = [], completionHandler: (AVAudioUnit?, Error?) -> Void) class func instantiate(withComponentDescription audioComponentDescription: AudioComponentDescription, options: AudioComponentInstantiationOptions = [], completionHandler: (AVAudioUnit?, Error?) -> Void)
func loadPresetAt(url: URL) throws func loadPreset(at url: URL) throws
var audioComponentDescription: AudioComponentDescription { get } var audioComponentDescription: AudioComponentDescription { get }
var audioUnit: AudioUnit { get } var audioUnit: AudioUnit { get }
@available(OSX 10.11, *) @available(OSX 10.11, *)
Expand Down
4 changes: 2 additions & 2 deletions Platforms/OSX/AVFoundation/AVAudioUnitComponent.swift
View file
Expand Up @@ -62,8 +62,8 @@ class AVAudioUnitComponentManager : Object {
var tagNames: [String] { get } var tagNames: [String] { get }
var standardLocalizedTagNames: [String] { get } var standardLocalizedTagNames: [String] { get }
class func shared() -> Self class func shared() -> Self
func componentsMatching(predicate: Predicate) -> [AVAudioUnitComponent] func components(matching predicate: Predicate) -> [AVAudioUnitComponent]
func componentsPassingTest(testHandler: (AVAudioUnitComponent, UnsafeMutablePointer<ObjCBool>) -> Bool) -> [AVAudioUnitComponent] func componentsPassingTest(testHandler: (AVAudioUnitComponent, UnsafeMutablePointer<ObjCBool>) -> Bool) -> [AVAudioUnitComponent]
func componentsMatching(desc: AudioComponentDescription) -> [AVAudioUnitComponent] func components(matching desc: AudioComponentDescription) -> [AVAudioUnitComponent]
init() init()
} }
2 changes: 1 addition & 1 deletion Platforms/OSX/AVFoundation/AVAudioUnitGenerator.swift
View file
Expand Up @@ -5,7 +5,7 @@ class AVAudioUnitGenerator : AVAudioUnit, AVAudioMixing {
var bypass: Bool var bypass: Bool
init() init()
@available(OSX 10.11, *) @available(OSX 10.11, *)
func destinationFor(mixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination? func destination(forMixer mixer: AVAudioNode, bus: AVAudioNodeBus) -> AVAudioMixingDestination?
@available(OSX 10.10, *) @available(OSX 10.10, *)
var volume: Float var volume: Float
@available(OSX 10.10, *) @available(OSX 10.10, *)
Expand Down

0 comments on commit da7e512

Please sign in to comment.