merge master into devel

CMakeLists.txt

@@ -371,6 +371,14 @@ target_link_libraries(al PUBLIC
   Gamma glfw glad rtmidi cpptoml dr_libs
   nlohmann_json::nlohmann_json imgui oscpack stb serial)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # On macOS if jack is present, RtMidi will link to jack but not provide the
+    # /usr/local/lib location as link directory. This statement only serves the
+    # purpose of working around that bug. Perhaps can be removed on future
+    # updates of RtMidi
+    link_directories("/usr/local/lib")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
 macro(Copy_dlls dest_path target DLLS_TO_COPY)
   if (DLLS_TO_COPY)
     foreach(LIBRARY ${DLLS_TO_COPY})

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();
 

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:

readme.md

@@ -1,5 +1,8 @@
 
 # Allolib C/C++ Libraries  {#mainpage}
+
+Library for interactive multimedia application development
+
 Developed by:
 
 AlloSphere Research Group

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();
 }

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);