Add bypass to AutoPan allowing Stereo EXS sources

AudioKit · Mar 1, 2018 · 59fb808 · 59fb808
1 parent f353e25
commit 59fb808
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Video introduction for this app and project:
 The AudioKit FM Player is built with this code:  
 [Download in App Store here](https://itunes.apple.com/us/app/fm-player-classic-dx-synths/id1307785646?ls=1&mt=8).
 
-**Update Feb 2, 23, 2018**  
+**Update Feb 23, 2018**  
 I made a video tutorial on how to add Attack & Release to EXS and AUSampler instruments:  
 [Video Tutorial: Building iOS Sample Instruments Visually w/ Attack & Release](https://audiokitpro.com/rom-player-tutorial-video-envelopes/)
 

diff --git a/RomPlayer/AudioSystem/AutoPan.swift b/RomPlayer/AudioSystem/AutoPan.swift
@@ -16,7 +16,7 @@ class AutoPan: AKNode {
         }
     }
 
-    var mix = 0.0 {
+    var mix = 1.0 {
         didSet {
             output.parameters = [freq, mix]
         }

diff --git a/RomPlayer/AudioSystem/Conductor.swift b/RomPlayer/AudioSystem/Conductor.swift
@@ -19,9 +19,7 @@ class Conductor {
     var fatten: Fatten
     var filterSection: FilterSection
 
-    // AutoPan Section
     var autoPanMixer: AKDryWetMixer
-    var limiter: AKStereoFieldLimiter
     var autopan: AutoPan
 
     var multiDelay: PingPongDelay
@@ -57,14 +55,11 @@ class Conductor {
         filterSection = FilterSection(decimator)
         filterSection.output.stop()
 
-        limiter = AKStereoFieldLimiter(filterSection)
-        limiter.amount = 1
-        autopan = AutoPan(limiter)
-
+        autopan = AutoPan(filterSection)
         autoPanMixer = AKDryWetMixer(filterSection, autopan)
-        autoPanMixer.balance = 0
+        autoPanMixer.balance = 0 
 
-        fatten = Fatten(autopan)
+        fatten = Fatten(autoPanMixer)
 
         multiDelay = PingPongDelay(fatten)
 

diff --git a/RomPlayer/Controllers/AUMainController.swift b/RomPlayer/Controllers/AUMainController.swift
@@ -268,10 +268,10 @@ class AUMainController: UIViewController {
         autoPanToggle.callback = { value in
             if value == 0 {
                 self.outputLabel.text = "Auto Pan Off"
-                self.conductor.autopan.mix = 0
+                self.conductor.autoPanMixer.balance = 0
             } else {
                 self.outputLabel.text = "Auto Pan On"
-                self.conductor.autopan.mix = 1
+                self.conductor.autoPanMixer.balance = 1
             }
         }