add app configureAudio that takes both devIn and devOut for configuri…

…ng separate input output devices
AlloSphere-Research-Group · Feb 27, 2024 · 32dfac3 · 32dfac3
1 parent c761666
commit 32dfac3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/include/al/app/al_App.hpp b/include/al/app/al_App.hpp
@@ -145,6 +145,10 @@ class App {
                       int audioBlockSize = 512, int audioOutputs = -1,
                       int audioInputs = -1);
 
+  void configureAudio(AudioDevice &devIn, AudioDevice &devOut, double audioRate = -1,
+                      int audioBlockSize = 512, int audioOutputs = -1,
+                      int audioInputs = -1);
+
   // Access to OSC domain
   ParameterServer &parameterServer();
 

diff --git a/include/al/app/al_AudioDomain.hpp b/include/al/app/al_AudioDomain.hpp
@@ -40,6 +40,9 @@ class AudioDomain : public AsynchronousDomain {
   void configure(AudioDevice &dev, double audioRate, int audioBlockSize,
                  int audioOutputs, int audioInputs);
 
+  void configure(AudioDevice &devIn, AudioDevice &devOut, double audioRate, int audioBlockSize,
+                 int audioOutputs, int audioInputs);
+
   std::function<void(AudioIOData &io)> onSound = [](AudioIOData &) {};
 
 protected:

diff --git a/src/app/al_App.cpp b/src/app/al_App.cpp
@@ -252,6 +252,15 @@ void App::configureAudio(AudioDevice &dev, double audioRate, int audioBlockSize,
                            audioInputs);
 }
 
+void App::configureAudio(AudioDevice &devIn, AudioDevice &devOut, double audioRate, int audioBlockSize,
+                         int audioOutputs, int audioInputs) {
+  if (audioRate < 0) {
+    audioRate = AudioBackend::devicePreferredSamplingRate(devIn.id());
+  }
+  audioDomain()->configure(devIn, devOut, audioRate, audioBlockSize, audioOutputs,
+                           audioInputs);
+}
+
 ParameterServer &App::parameterServer() {
   return oscDomain()->parameterServer();
 }

diff --git a/src/app/al_AudioDomain.cpp b/src/app/al_AudioDomain.cpp
@@ -40,8 +40,9 @@ bool AudioDomain::cleanup(ComputationDomain * /*parent*/) {
 
 void AudioDomain::configure(double audioRate, int audioBlockSize,
                             int audioOutputs, int audioInputs) {
-  AudioDevice dev = AudioDevice::defaultOutput();
-  configure(dev, audioRate, audioBlockSize, audioOutputs, audioInputs);
+  AudioDevice devIn = AudioDevice::defaultInput();
+  AudioDevice devOut = AudioDevice::defaultOutput();
+  configure(devIn, devOut, audioRate, audioBlockSize, audioOutputs, audioInputs);
 }
 
 void AudioDomain::configure(AudioDevice &dev, double audioRate,
@@ -55,6 +56,19 @@ void AudioDomain::configure(AudioDevice &dev, double audioRate,
   audioIO().channelsOut(audioOutputs);
 }
 
+void AudioDomain::configure(AudioDevice &devIn, AudioDevice &devOut, double audioRate,
+                            int audioBlockSize, int audioOutputs,
+                            int audioInputs) {
+  audioIO().init(AudioDomain::AppAudioCB, this, audioBlockSize, audioRate,
+                 audioOutputs, audioInputs);
+  audioIO().deviceIn(devIn);
+  audioIO().deviceOut(devOut);
+
+  // mAudioIO.device() resets the channels to the device default number
+  audioIO().channelsIn(audioInputs);
+  audioIO().channelsOut(audioOutputs);
+}
+
 void AudioDomain::AppAudioCB(AudioIOData &io) {
   AudioDomain &app = io.user<AudioDomain>();
   io.frame(0);