update slider rendering & set style for faders

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

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 998a03e3aa13a5583a4910dd25c6e8665236493e..c25f8962ace7ca8c752efd34bc7bb860bd8c320d 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -145,7 +145,7 @@ PluginInsert::output_streams() const
                ChanCount out = info->n_outputs;
                // DEBUG_TRACE (DEBUG::Processors, string_compose ("Plugin insert, static output streams = %1 for %2 plugins\n", out, _plugins.size()));
                out.set_audio (out.n_audio() * _plugins.size());
-               out.set_midi (out.n_midi() * _plugins.size());
+               out.set_midi (out.n_midi() * _plugins.size() + midi_bypass.n_midi());
                return out;
        }
 }
@@ -346,9 +346,8 @@ PluginInsert::connect_and_run (BufferSet& bufs, pframes_t nframes, framecnt_t of
                /* XXX: audio only */
                uint32_t first_idx = in_map.get (DataType::AUDIO, 0, &valid);
                if (valid) {
-                       Sample const * mono = bufs.get_audio (first_idx).data (offset);
                        for (uint32_t i = in_streams.n_audio(); i < natural_input_streams().n_audio(); ++i) {
-                               memcpy (bufs.get_audio (in_map.get (DataType::AUDIO, i, &valid)).data (offset), mono, sizeof (Sample) * nframes);
+                               bufs.get_audio(in_map.get (DataType::AUDIO, i, &valid)).read_from(bufs.get_audio(first_idx), nframes, offset, offset);
                        }
                }
        }
@@ -448,7 +447,7 @@ PluginInsert::silence (framecnt_t nframes)
        }
 
        for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
-               (*i)->connect_and_run (_session.get_silent_buffers ((*i)->get_info()->n_inputs), in_map, out_map, nframes, 0);
+               (*i)->connect_and_run (_session.get_scratch_buffers ((*i)->get_info()->n_inputs, true), in_map, out_map, nframes, 0);
        }
 }
 
@@ -465,7 +464,6 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
                }
 
        } else {
-
                if (has_no_audio_inputs()) {
 
                        /* silence all (audio) outputs. Should really declick
@@ -491,8 +489,9 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
 
                                /* not active, but something has make up for any channel count increase */
                                
-                               for (uint32_t n = out - in; n < out; ++n) {
-                                       memcpy (bufs.get_audio (n).data(), bufs.get_audio(in - 1).data(), sizeof (Sample) * nframes);
+                               // TODO: option round-robin (n % in) or silence additional buffers ??
+                               for (uint32_t n = in; n < out; ++n) {
+                                       bufs.get_audio(n).read_from(bufs.get_audio(in - 1), nframes);
                                }
                        }
 
@@ -506,7 +505,6 @@ PluginInsert::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end
         * all buffers appropriately.
         */
 
-       bufs.set_is_silent (false);
 }
 
 void
@@ -652,6 +650,8 @@ bool
 PluginInsert::configure_io (ChanCount in, ChanCount out)
 {
        Match old_match = _match;
+       ChanCount old_in = input_streams ();
+       ChanCount old_out = output_streams ();
 
        /* set the matching method and number of plugins that we will use to meet this configuration */
        _match = private_can_support_io_configuration (in, out);
@@ -659,9 +659,12 @@ PluginInsert::configure_io (ChanCount in, ChanCount out)
                return false;
        }
 
-       /* a signal needs emitting if we start or stop splitting */
-       if (old_match.method != _match.method && (old_match.method == Split || _match.method == Split)) {
-               SplittingChanged (); /* EMIT SIGNAL */
+       if (  (old_match.method != _match.method && (old_match.method == Split || _match.method == Split))
+                       || old_in != in
+                       || old_out != out
+                       )
+       {
+               PluginIoReConfigure (); /* EMIT SIGNAL */
        }
 
        /* configure plugins */
@@ -704,7 +707,7 @@ PluginInsert::configure_io (ChanCount in, ChanCount out)
  *  @return true if the given IO configuration can be supported.
  */
 bool
-PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        return private_can_support_io_configuration (in, out).method != Impossible;
 }
@@ -714,9 +717,11 @@ PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out)
  *  it can be.
  */
 PluginInsert::Match
-PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCount& out) const
+PluginInsert::private_can_support_io_configuration (ChanCount const & inx, ChanCount& out)
 {
        PluginInfoPtr info = _plugins.front()->get_info();
+       ChanCount in; in += inx;
+       midi_bypass.reset();
 
        if (info->reconfigurable_io()) {
                /* Plugin has flexible I/O, so delegate to it */
@@ -731,6 +736,15 @@ PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCo
        ChanCount inputs  = info->n_inputs;
        ChanCount outputs = info->n_outputs;
 
+       if (in.get(DataType::MIDI) == 1 && outputs.get(DataType::MIDI) == 0) {
+               DEBUG_TRACE ( DEBUG::Processors, string_compose ("bypassing midi-data around %1\n", name()));
+               midi_bypass.set(DataType::MIDI, 1);
+       }
+       if (in.get(DataType::MIDI) == 1 && inputs.get(DataType::MIDI) == 0) {
+               DEBUG_TRACE ( DEBUG::Processors, string_compose ("hiding midi-port from plugin %1\n", name()));
+               in.set(DataType::MIDI, 0);
+       }
+
        bool no_inputs = true;
        for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
                if (inputs.get (*t) != 0) {
@@ -741,13 +755,13 @@ PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCo
 
        if (no_inputs) {
                /* no inputs so we can take any input configuration since we throw it away */
-               out = outputs;
+               out = outputs + midi_bypass;
                return Match (NoInputs, 1);
        }
 
        /* Plugin inputs match requested inputs exactly */
        if (inputs == in) {
-               out = outputs;
+               out = outputs + midi_bypass;
                return Match (ExactMatch, 1);
        }
 
@@ -789,6 +803,7 @@ PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCo
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
                        out.set (*t, outputs.get(*t) * f);
                }
+               out += midi_bypass;
                return Match (Replicate, f);
        }
 
@@ -812,7 +827,7 @@ PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCo
        }
 
        if (can_split) {
-               out = outputs;
+               out = outputs + midi_bypass;
                return Match (Split, 1);
        }
 
@@ -836,10 +851,11 @@ PluginInsert::private_can_support_io_configuration (ChanCount const & in, ChanCo
        }
 
        if (could_hide && !cannot_hide) {
-               out = outputs;
+               out = outputs + midi_bypass;
                return Match (Hide, 1, hide_channels);
        }
 
+       midi_bypass.reset();
        return Match (Impossible, 0);
 }