WIP allowing devices to use more channels

Author: julianstorer

modules/tracktion_engine/playback/devices/tracktion_WaveDeviceDescription.h

@@ -82,4 +82,4 @@ struct WaveDeviceDescriptionList
 };
 
 
-}} // namespace tracktion::inline engine
+} // namespace tracktion::inline engine

modules/tracktion_engine/playback/devices/tracktion_WaveInputDevice.cpp

@@ -390,7 +390,7 @@ class WaveInputDeviceInstance  : public InputDeviceInstance
             auto& wi = getWaveInput();
 
             rc->fileWriter = std::make_unique<AudioFileWriter> (AudioFile (edit.engine, recordedFile), format,
-                                                                wi.isStereoPair() ? 2 : 1,
+                                                                (int) wi.getChannels().getNumChannels(),
                                                                 rc->sampleRate, wi.bitDepth, metadata, 0);
 
             if (rc->fileWriter->isOpen())
@@ -431,7 +431,7 @@ class WaveInputDeviceInstance  : public InputDeviceInstance
                 {
                     if ((rc->thumbnail = edit.engine.getRecordingThumbnailManager().getThumbnailFor (recordedFile)))
                     {
-                        rc->thumbnail->reset (wi.isStereoPair() ? 2 : 1, rc->sampleRate);
+                        rc->thumbnail->reset ((int) wi.getChannels().getNumChannels(), rc->sampleRate);
                         rc->thumbnail->punchInTime = punchRange.getStart();
                     }
                 }

modules/tracktion_engine/playback/devices/tracktion_WaveOutputDevice.cpp

@@ -113,12 +113,15 @@ WaveOutputDeviceInstance::WaveOutputDeviceInstance (WaveOutputDevice& d, EditPla
 
 void WaveOutputDeviceInstance::prepareToPlay (double, int blockSize)
 {
-    outputBuffer.setSize (2, blockSize);
+    const auto numChannels = (int) getWaveOutput().getChannels().getNumChannels();
+    outputBuffer.setSize (numChannels, blockSize);
 
     int ditherDepth = juce::jlimit (16, 32, edit.engine.getDeviceManager().getBitDepth());
 
-    ditherers[0].reset (ditherDepth);
-    ditherers[1].reset (ditherDepth);
+    ditherers.resize ((size_t) numChannels);
+
+    for (auto& d : ditherers)
+        d.reset (ditherDepth);
 }
 
 //==============================================================================

modules/tracktion_engine/playback/devices/tracktion_WaveOutputDevice.h

@@ -79,7 +79,7 @@ class WaveOutputDeviceInstance   : public OutputDeviceInstance
     void prepareToPlay (double sampleRate, int blockSizeSamples);
 
 protected:
-    Ditherer ditherers[2];
+    std::vector<Ditherer> ditherers;
     MidiMessageArray midiBuffer;
     juce::AudioBuffer<float> outputBuffer;
 

modules/tracktion_engine/playback/graph/tracktion_EditNodeBuilder.cpp

@@ -1243,7 +1243,10 @@ std::unique_ptr<tracktion::graph::Node> createNodeForPlugin (Plugin& plugin, con
     // If there's a channel count mismatch, wrap in ChannelRemappingNode to handle:
     // - Passthrough (input > processor): extra channels pass through unprocessed
     // - Expansion (input < processor): processor outputs its full channel count
-    if (incomingChannels != pluginInputChannels)
+    // Skip if either config is empty - ChannelRemappingNode requires valid channel configs
+    if (incomingChannels != pluginInputChannels
+        && incomingChannels > 0
+        && pluginInputChannels > 0)
     {
         return tracktion::graph::makeNode<ChannelRemappingNode> (std::move (pluginNode),
                                                                  ChannelConfiguration::discreteChannels (incomingChannels),

modules/tracktion_engine/playback/graph/tracktion_WaveInputDeviceNode.cpp

@@ -35,7 +35,7 @@ tracktion::graph::NodeProperties WaveInputDeviceNode::getNodeProperties()
 
 void WaveInputDeviceNode::prepareToPlay (const tracktion::graph::PlaybackInitialisationInfo& info)
 {
-    auto numIncomingChannels = (waveInputDevice.isStereoPair()) ? 2u : 1u;
+    auto numIncomingChannels = (uint32_t) waveInputDevice.getChannels().getNumChannels();
     audioFifo.setSize (numIncomingChannels, (uint32_t) info.blockSize * 8);
     lastCallbackTime = juce::Time::getMillisecondCounter();
 

modules/tracktion_engine/playback/tracktion_DeviceManager.h

@@ -234,7 +234,7 @@ class DeviceManager     : public juce::ChangeBroadcaster,
     */
     std::function<void(InputDevice*)> warnOfWastedMidiMessagesFunction;
 
-    static constexpr uint32_t maxNumChannelsPerDevice = 2; // Temporary limit until we support multichannel
+    static constexpr uint32_t maxNumChannelsPerDevice = 2;
 
 private:
     //==============================================================================

modules/tracktion_engine/tracktion_engine.h

@@ -74,7 +74,7 @@
  #include "../3rd_party/choc/containers/choc_Value.h"
  #include "../3rd_party/choc/containers/choc_SmallVector.h"
  #include "../3rd_party/choc/text/choc_JSON.h"
-#else
+#endif
 
 #include "../3rd_party/expected/expected.hpp"
 

modules/tracktion_engine/tracktion_engine_playback.cpp

@@ -160,7 +160,6 @@ namespace tracktion
 
 #include "../3rd_party/choc/choc/platform/choc_ReenableAllWarnings.h"
 #include "../3rd_party/crill/seqlock_object.h"
-#include "../3rd_party/choc/text/choc_JSON.h"
 
 //==============================================================================
 #if JUCE_LINUX || JUCE_WINDOWS