fix invalid mapping detection

[ardour.git] / libs / ardour / vst_plugin.cc

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index f04aa2bce199101a123b51a688adbfc1d1080e12..32690f84d21f33226d0487f705f8f6cc4d5807c0 100644 (file)
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -565,7 +565,12 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 
        uint32_t out_index = 0;
        for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) {
-               outs[i] = scratch_bufs.get_audio(i).data(offset);
+               uint32_t  index;
+               bool      valid = false;
+               index = out_map.get(DataType::AUDIO, out_index++, &valid);
+               outs[i] = (valid)
+                       ? bufs.get_audio(index).data(offset)
+                       : scratch_bufs.get_audio(0).data(offset);
        }
 
        if (bufs.count().n_midi() > 0) {
@@ -592,16 +597,6 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
        _plugin->processReplacing (_plugin, &ins[0], &outs[0], nframes);
        _midi_out_buf = 0;
 
-       out_index = 0;
-       for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) {
-               uint32_t  index;
-               bool      valid = false;
-               index = out_map.get(DataType::AUDIO, out_index++, &valid);
-               if (!valid) {
-                       continue;
-               }
-               copy_vector (bufs.get_audio(index).data(offset), outs[i], nframes);
-       }
        return 0;
 }