Skip to content

Commit

Permalink
au -> auAudioUnit
Browse files Browse the repository at this point in the history
  • Loading branch information
@aure
aure committed Jun 12, 2023
1 parent c9ae7cb commit ffb8e16
Show file tree
Hide file tree
Showing 23 changed files with 79 additions and 79 deletions.
10 changes: 5 additions & 5 deletions Sources/Audio/Internals/Engine/EngineAudioUnit.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ public class EngineAudioUnit: AUAudioUnit {
NodeEnginesManager.shared.set(engine: self, for: node)

// Activate input busses.
for busIndex in 0 ..< node.au.inputBusses.count {
let bus = node.au.inputBusses[busIndex]
for busIndex in 0 ..< node.auAudioUnit.inputBusses.count {
let bus = node.auAudioUnit.inputBusses[busIndex]
try! bus.setFormat(format)
bus.isEnabled = true
}

if !node.au.renderResourcesAllocated {
try! node.au.allocateRenderResources()
if !node.auAudioUnit.renderResourcesAllocated {
try! node.auAudioUnit.allocateRenderResources()
}

let nodeBuffer = buffers[ObjectIdentifier(node)]!
Expand Down Expand Up @@ -247,7 +247,7 @@ public class EngineAudioUnit: AUAudioUnit {
}

let job = RenderJob(outputBuffer: nodeBuffer,
renderBlock: node.au.renderBlock,
renderBlock: node.auAudioUnit.renderBlock,
inputBlock: inputBlock,
inputIndices: node.connections.map { nodeJobs[ObjectIdentifier($0)]! })

Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Delay.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Utilities
/// AudioKit version of Apple's Delay Audio Unit
///
public class Delay: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -84,8 +84,8 @@ public class Delay: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_Delay)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.dryWetMix = dryWetMix
self.time = time
Expand Down
8 changes: 4 additions & 4 deletions Sources/Audio/Nodes/Effects/Distortion.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's Distortion Audio Unit
///
public class Distortion: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -226,7 +226,7 @@ public class Distortion: Node {
public func loadFactoryPreset(_ preset: DistortionPreset) {
let auPreset = AUAudioUnitPreset()
auPreset.number = preset.rawValue
au.currentPreset = auPreset
auAudioUnit.currentPreset = auPreset
}

/// Initialize the distortion node
Expand Down Expand Up @@ -271,8 +271,8 @@ public class Distortion: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_Distortion)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.delay = delay
self.decay = decay
Expand Down
14 changes: 7 additions & 7 deletions Sources/Audio/Nodes/Effects/DynamicsProcessor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's DynamicsProcessor Audio Unit
///
public class DynamicsProcessor: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -107,24 +107,24 @@ public class DynamicsProcessor: Node {

/// Compression Amount (dB) read only
public var compressionAmount: AUValue {
return au.parameterTree?.allParameters[7].value ?? 0
return auAudioUnit.parameterTree?.allParameters[7].value ?? 0
}

/// Input Amplitude (dB) read only
public var inputAmplitude: AUValue {
return au.parameterTree?.allParameters[8].value ?? 0
return auAudioUnit.parameterTree?.allParameters[8].value ?? 0
}

/// Output Amplitude (dB) read only
public var outputAmplitude: AUValue {
return au.parameterTree?.allParameters[9].value ?? 0
return auAudioUnit.parameterTree?.allParameters[9].value ?? 0
}

/// Load an Apple Factory Preset
public func loadFactoryPreset(_ preset: DynamicsProcessorPreset) {
let auPreset = AUAudioUnitPreset()
auPreset.number = preset.rawValue
au.currentPreset = auPreset
auAudioUnit.currentPreset = auPreset
}

/// Initialize the dynamics processor node
Expand All @@ -151,8 +151,8 @@ public class DynamicsProcessor: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_DynamicsProcessor)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.threshold = threshold
self.headRoom = headRoom
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Filters/BandPassFilter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's BandPassFilter Audio Unit
///
public class BandPassFilter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -54,8 +54,8 @@ public class BandPassFilter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_BandPassFilter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.centerFrequency = centerFrequency
self.bandwidth = bandwidth
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Filters/HighPassFilter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's HighPassFilter Audio Unit
///
public class HighPassFilter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -54,8 +54,8 @@ public class HighPassFilter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_HighPassFilter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.cutoffFrequency = cutoffFrequency
self.resonance = resonance
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Filters/HighShelfFilter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's HighShelfFilter Audio Unit
///
public class HighShelfFilter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -54,8 +54,8 @@ public class HighShelfFilter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_HighShelfFilter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.cutOffFrequency = cutOffFrequency
self.gain = gain
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Filters/LowPassFilter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's LowPassFilter Audio Unit
///
public class LowPassFilter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -54,8 +54,8 @@ public class LowPassFilter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_LowPassFilter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.cutoffFrequency = cutoffFrequency
self.resonance = resonance
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/Filters/LowShelfFilter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's LowShelfFilter Audio Unit
///
public class LowShelfFilter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -54,8 +54,8 @@ public class LowShelfFilter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_LowShelfFilter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.cutoffFrequency = cutoffFrequency
self.gain = gain
Expand Down
8 changes: 4 additions & 4 deletions Sources/Audio/Nodes/Effects/MatrixReverb.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Utilities
/// AudioKit version of Apple's Reverb Audio Unit
///
public class MatrixReverb: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -204,7 +204,7 @@ public class MatrixReverb: Node {
public func loadFactoryPreset(_ preset: ReverbPreset) {
let auPreset = AUAudioUnitPreset()
auPreset.number = preset.rawValue
au.currentPreset = auPreset
auAudioUnit.currentPreset = auPreset
}

/// Initialize the reverb node
Expand Down Expand Up @@ -232,8 +232,8 @@ public class MatrixReverb: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_MatrixReverb)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.dryWetMix = dryWetMix
self.smallLargeMix = smallLargeMix
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/ParametricEQ.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's ParametricEQ Audio Unit
///
public class ParametricEQ: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -69,8 +69,8 @@ public class ParametricEQ: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_ParametricEQ)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.centerFreq = centerFreq
self.q = q
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Effects/PeakLimiter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Utilities
/// AudioKit version of Apple's PeakLimiter Audio Unit
///
public class PeakLimiter: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand Down Expand Up @@ -69,8 +69,8 @@ public class PeakLimiter: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_PeakLimiter)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.attackTime = attackTime
self.decayTime = decayTime
Expand Down
8 changes: 4 additions & 4 deletions Sources/Audio/Nodes/Effects/Reverb.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Utilities
/// AudioKit version of Apple's Reverb Audio Unit
///
public class Reverb: Node {
public var au: AUAudioUnit
public var auAudioUnit: AUAudioUnit

let input: Node

Expand All @@ -32,7 +32,7 @@ public class Reverb: Node {
public func loadFactoryPreset(_ preset: ReverbPreset) {
let auPreset = AUAudioUnitPreset()
auPreset.number = preset.rawValue
au.currentPreset = auPreset
auAudioUnit.currentPreset = auPreset
}

/// Initialize the reverb node
Expand All @@ -45,8 +45,8 @@ public class Reverb: Node {
self.input = input

let desc = AudioComponentDescription(appleEffect: kAudioUnitSubType_Reverb2)
au = instantiateAU(componentDescription: desc)
associateParams(with: au)
auAudioUnit = instantiateAU(componentDescription: desc)
associateParams(with: auAudioUnit)

self.wetDryMix = wetDryMix
AudioEngine.nodeInstanceCount.wrappingIncrement(ordering: .relaxed)
Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Generators/Noise.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Atomics
public class Noise: Node {
public let connections: [Node] = []

public let au: AUAudioUnit
public let auAudioUnit: AUAudioUnit

let noiseAU: NoiseAudioUnit

Expand All @@ -31,8 +31,8 @@ public class Noise: Node {
as: componentDescription,
name: "NoiseGenerator AU",
version: .max)
au = instantiateAU(componentDescription: componentDescription)
noiseAU = au as! NoiseAudioUnit
auAudioUnit = instantiateAU(componentDescription: componentDescription)
noiseAU = auAudioUnit as! NoiseAudioUnit
noiseAU.amplitudeParam.value = amplitude
self.amplitude = amplitude

Expand Down
6 changes: 3 additions & 3 deletions Sources/Audio/Nodes/Generators/Oscillator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ enum OscillatorCommand {
public class Oscillator: Node {
public let connections: [Node] = []

public let au: AUAudioUnit
public let auAudioUnit: AUAudioUnit

let oscAU: OscillatorAudioUnit

Expand Down Expand Up @@ -51,8 +51,8 @@ public class Oscillator: Node {
as: componentDescription,
name: "Oscillator AU",
version: .max)
au = instantiateAU(componentDescription: componentDescription)
oscAU = au as! OscillatorAudioUnit
auAudioUnit = instantiateAU(componentDescription: componentDescription)
oscAU = auAudioUnit as! OscillatorAudioUnit
self.waveform = waveform
oscAU.amplitudeParam.value = amplitude
self.amplitude = amplitude
Expand Down
8 changes: 4 additions & 4 deletions Sources/Audio/Nodes/Mixing/Mixer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Utilities

/// AudioKit version of Apple's Mixer Node. Mixes a variadic list of Nodes.
public class Mixer: Node, NamedNode {
public let au: AUAudioUnit
public let auAudioUnit: AUAudioUnit

var inputs: [Node] = []

Expand Down Expand Up @@ -45,8 +45,8 @@ public class Mixer: Node, NamedNode {
name: "Volume AU",
version: .max)

au = instantiateAU(componentDescription: volumeCD)
volumeAU = au as! VolumeAudioUnit
auAudioUnit = instantiateAU(componentDescription: volumeCD)
volumeAU = auAudioUnit as! VolumeAudioUnit
volumeAU.volumeParam.value = volume
self.volume = volume
self.name = name ?? MemoryAddress(of: self).description
Expand Down Expand Up @@ -137,7 +137,7 @@ public class Mixer: Node, NamedNode {
/// - Returns: new input busses array size or its current size in case it's less than required
/// and resize failed, or can't be done.
public func resizeInputBussesArray(requiredSize: Int) -> Int {
let busses = au.inputBusses
let busses = auAudioUnit.inputBusses
guard busses.isCountChangeable else {
// input busses array is not changeable
return min(busses.count, requiredSize)
Expand Down

0 comments on commit ffb8e16

Please sign in to comment.