fix crash when copy'ing latent plugins
[ardour.git] / libs / ardour / audio_unit.cc
index 1c482736b8f905256d9d41193bf47414fe1ee32e..5c324b0be2139c03451810eaf5013896e2a1ab7f 100644 (file)
@@ -71,7 +71,7 @@
 #define ArdourFindNext AudioComponentFindNext
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -430,17 +430,27 @@ AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr<CAC
        , comp (_comp)
        , unit (new CAAudioUnit)
        , initialized (false)
-       , _current_block_size (0)
+       , _last_nframes (0)
+       , _current_latency (UINT_MAX)
        , _requires_fixed_size_buffers (false)
        , buffers (0)
+       , variable_inputs (false)
+       , variable_outputs (false)
+       , configured_input_busses (0)
+       , configured_output_busses (0)
+       , bus_inputs (0)
+       , bus_outputs (0)
        , input_maxbuf (0)
        , input_offset (0)
+       , cb_offsets (0)
        , input_buffers (0)
+       , input_map (0)
        , frames_processed (0)
        , audio_input_cnt (0)
        , _parameter_listener (0)
        , _parameter_listener_arg (0)
-       , last_transport_rolling (false)
+       , transport_frame (0)
+       , transport_speed (0)
        , last_transport_speed (0.0)
 {
        if (!preset_search_path_initialized) {
@@ -461,16 +471,27 @@ AUPlugin::AUPlugin (const AUPlugin& other)
        , comp (other.get_comp())
        , unit (new CAAudioUnit)
        , initialized (false)
-       , _current_block_size (0)
        , _last_nframes (0)
+       , _current_latency (UINT_MAX)
        , _requires_fixed_size_buffers (false)
        , buffers (0)
+       , variable_inputs (false)
+       , variable_outputs (false)
+       , configured_input_busses (0)
+       , configured_output_busses (0)
+       , bus_inputs (0)
+       , bus_outputs (0)
        , input_maxbuf (0)
        , input_offset (0)
+       , cb_offsets (0)
        , input_buffers (0)
+       , input_map (0)
        , frames_processed (0)
        , _parameter_listener (0)
        , _parameter_listener_arg (0)
+       , transport_frame (0)
+       , transport_speed (0)
+       , last_transport_speed (0.0)
 
 {
        init ();
@@ -491,9 +512,10 @@ AUPlugin::~AUPlugin ()
                unit->Uninitialize ();
        }
 
-       if (buffers) {
-               free (buffers);
-       }
+       free (buffers);
+       free (bus_inputs);
+       free (bus_outputs);
+       free (cb_offsets);
 }
 
 void
@@ -584,18 +606,56 @@ AUPlugin::init ()
        DEBUG_TRACE (DEBUG::AudioUnits, "count output elements\n");
        unit->GetElementCount (kAudioUnitScope_Output, output_elements);
 
-       if (input_elements > 0) {
-               /* setup render callback: the plugin calls this to get input data
-                */
+       cb_offsets = (framecnt_t*) calloc (input_elements, sizeof(uint32_t));
+       bus_inputs = (uint32_t*) calloc (input_elements, sizeof(uint32_t));
+       bus_outputs = (uint32_t*) calloc (output_elements, sizeof(uint32_t));
 
-               AURenderCallbackStruct renderCallbackInfo;
+       for (size_t i = 0; i < output_elements; ++i) {
+               unit->Reset (kAudioUnitScope_Output, i);
+               AudioStreamBasicDescription fmt;
+               err = unit->GetFormat (kAudioUnitScope_Output, i, fmt);
+               if (err == noErr) {
+                       bus_outputs[i] = fmt.mChannelsPerFrame;
+               }
+               CFStringRef name;
+               UInt32 sz = sizeof (CFStringRef);
+               if (AudioUnitGetProperty (unit->AU(), kAudioUnitProperty_ElementName, kAudioUnitScope_Output,
+                                       i, &name, &sz) == noErr
+                               && sz > 0) {
+                       _bus_name_out.push_back (CFStringRefToStdString (name));
+                       CFRelease(name);
+               } else {
+                       _bus_name_out.push_back (string_compose ("Audio-Bus %1", i));
+               }
+       }
 
+       for (size_t i = 0; i < input_elements; ++i) {
+               unit->Reset (kAudioUnitScope_Input, i);
+               AudioStreamBasicDescription fmt;
+               err = unit->GetFormat (kAudioUnitScope_Input, i, fmt);
+               if (err == noErr) {
+                       bus_inputs[i] = fmt.mChannelsPerFrame;
+               }
+               CFStringRef name;
+               UInt32 sz = sizeof (CFStringRef);
+               if (AudioUnitGetProperty (unit->AU(), kAudioUnitProperty_ElementName, kAudioUnitScope_Input,
+                                       i, &name, &sz) == noErr
+                               && sz > 0) {
+                       _bus_name_in.push_back (CFStringRefToStdString (name));
+                       CFRelease(name);
+               } else {
+                       _bus_name_in.push_back (string_compose ("Audio-Bus %1", i));
+               }
+       }
+
+       for (size_t i = 0; i < input_elements; ++i) {
+               /* setup render callback: the plugin calls this to get input data */
+               AURenderCallbackStruct renderCallbackInfo;
                renderCallbackInfo.inputProc = _render_callback;
                renderCallbackInfo.inputProcRefCon = this;
-
                DEBUG_TRACE (DEBUG::AudioUnits, "set render callback in input scope\n");
                if ((err = unit->SetProperty (kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input,
-                                             0, (void*) &renderCallbackInfo, sizeof(renderCallbackInfo))) != 0) {
+                                             i, (void*) &renderCallbackInfo, sizeof(renderCallbackInfo))) != 0) {
                        error << string_compose (_("cannot install render callback (err = %1)"), err) << endmsg;
                        throw failed_constructor();
                }
@@ -659,9 +719,9 @@ AUPlugin::discover_parameters ()
                        const CAAUParameter* param = param_info.GetParamInfo (d.id);
                        const AudioUnitParameterInfo& info (param->ParamInfo());
 
-                       const int len = CFStringGetLength (param->GetName());;
+                       const int len = CFStringGetLength (param->GetName());
                        char local_buffer[len*2];
-                       Boolean good = CFStringGetCString(param->GetName(),local_buffer,len*2,kCFStringEncodingMacRoman);
+                       Boolean good = CFStringGetCString (param->GetName(), local_buffer ,len*2 , kCFStringEncodingUTF8);
                        if (!good) {
                                d.label = "???";
                        } else {
@@ -895,7 +955,12 @@ AUPlugin::default_value (uint32_t port)
 framecnt_t
 AUPlugin::signal_latency () const
 {
-       return unit->Latency() * _session.frame_rate();
+       guint lat = g_atomic_int_get (&_current_latency);;
+       if (lat == UINT_MAX) {
+               lat = unit->Latency() * _session.frame_rate();
+               g_atomic_int_set (&_current_latency, lat);
+       }
+       return lat;
 }
 
 void
@@ -1022,8 +1087,6 @@ AUPlugin::set_block_size (pframes_t nframes)
                activate ();
        }
 
-       _current_block_size = nframes;
-
        return 0;
 }
 
@@ -1036,14 +1099,14 @@ AUPlugin::configure_io (ChanCount in, ChanCount out)
        if (audio_input_cnt > 0) {
                in.set (DataType::AUDIO, audio_input_cnt);
        }
-       int32_t audio_in = in.n_audio();
+       const int32_t audio_in = in.n_audio();
 
        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("configure %1 for %2 in %3 out\n", name(), in, out));
 
        if (initialized) {
                //if we are already running with the requested i/o config, bail out here
                if ( (audio_in==input_channels) && (audio_out==output_channels) ) {
-                       return 0;
+                       return true;
                } else {
                        deactivate ();
                }
@@ -1063,41 +1126,104 @@ AUPlugin::configure_io (ChanCount in, ChanCount out)
        streamFormat.mFramesPerPacket = 1;
 
        /* apple says that for non-interleaved data, these
-          values always refer to a single channel.
-       */
+        * values always refer to a single channel.
+        */
        streamFormat.mBytesPerPacket = 4;
        streamFormat.mBytesPerFrame = 4;
 
-       streamFormat.mChannelsPerFrame = audio_in;
+       configured_input_busses = 0;
+       configured_output_busses = 0;
+       /* reset busses */
+       for (size_t i = 0; i < output_elements; ++i) {
+               unit->Reset (kAudioUnitScope_Output, i);
+       }
+       for (size_t i = 0; i < input_elements; ++i) {
+               unit->Reset (kAudioUnitScope_Input, i);
+       }
+
+       /* now assign the channels to available busses */
+       uint32_t used_in = 0;
+       uint32_t used_out = 0;
 
-       if (set_input_format (streamFormat) != 0) {
-               return -1;
+       if (variable_inputs || input_elements == 1) {
+               // we only ever use the first bus
+               if (input_elements > 1) {
+                       warning << string_compose (_("AU %1 has multiple input busses and variable port count."), name()) << endmsg;
+               }
+               streamFormat.mChannelsPerFrame = audio_in;
+               if (set_stream_format (kAudioUnitScope_Input, 0, streamFormat) != 0) {
+                       return false;
+               }
+               configured_input_busses = 1;
+               used_in = audio_in;
+       } else {
+               configured_input_busses = 0;
+               uint32_t remain = audio_in;
+               for (uint32_t bus = 0; remain > 0 && bus < input_elements; ++bus) {
+                       uint32_t cnt = std::min (remain, bus_inputs[bus]);
+                       if (cnt == 0) { continue; }
+                       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 configure input bus: %2 chn: %3", name(), bus, cnt));
+
+                       streamFormat.mChannelsPerFrame = cnt;
+                       if (set_stream_format (kAudioUnitScope_Input, bus, streamFormat) != 0) {
+                               return false;
+                       }
+                       used_in += cnt;
+                       ++configured_input_busses;
+                       remain -= cnt;
+               }
        }
 
-       streamFormat.mChannelsPerFrame = audio_out;
+       if (variable_outputs || output_elements == 1) {
+               if (output_elements > 1) {
+                       warning << string_compose (_("AU %1 has multiple output busses and variable port count."), name()) << endmsg;
+               }
 
-       if (set_output_format (streamFormat) != 0) {
-               return -1;
+               streamFormat.mChannelsPerFrame = audio_out;
+               if (set_stream_format (kAudioUnitScope_Output, 0, streamFormat) != 0) {
+                       return false;
+               }
+               configured_output_busses = 1;
+               used_out = audio_out;
+       } else {
+               uint32_t remain = audio_out;
+               configured_output_busses = 0;
+               for (uint32_t bus = 0; remain > 0 && bus < output_elements; ++bus) {
+                       uint32_t cnt = std::min (remain, bus_outputs[bus]);
+                       if (cnt == 0) { continue; }
+                       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 configure output bus: %2 chn: %3", name(), bus, cnt));
+                       streamFormat.mChannelsPerFrame = cnt;
+                       if (set_stream_format (kAudioUnitScope_Output, bus, streamFormat) != 0) {
+                               return false;
+                       }
+                       used_out += cnt;
+                       remain -= cnt;
+                       ++configured_output_busses;
+               }
        }
 
+       free (buffers);
+       buffers = (AudioBufferList *) malloc (offsetof(AudioBufferList, mBuffers) +
+                                             used_out * sizeof(::AudioBuffer));
+
+       input_channels = used_in;
+       output_channels = used_out;
        /* reset plugin info to show currently configured state */
 
-       _info->n_inputs = in;
-       _info->n_outputs = out;
+       _info->n_inputs = ChanCount (DataType::AUDIO, used_in) + ChanCount (DataType::MIDI, _has_midi_input ? 1 : 0);
+       _info->n_outputs = ChanCount (DataType::AUDIO, used_out);
 
        if (was_initialized) {
                activate ();
        }
 
-       return 0;
+       return true;
 }
 
 ChanCount
 AUPlugin::input_streams() const
 {
        ChanCount c;
-
-
        if (input_channels < 0) {
                // force PluginIoReConfigure -- see also commit msg e38eb06
                c.set (DataType::AUDIO, 0);
@@ -1106,7 +1232,6 @@ AUPlugin::input_streams() const
                c.set (DataType::AUDIO, input_channels);
                c.set (DataType::MIDI, _has_midi_input ? 1 : 0);
        }
-
        return c;
 }
 
@@ -1115,7 +1240,6 @@ ChanCount
 AUPlugin::output_streams() const
 {
        ChanCount c;
-
        if (output_channels < 0) {
                // force PluginIoReConfigure - see also commit msg e38eb06
                c.set (DataType::AUDIO, 0);
@@ -1124,43 +1248,73 @@ AUPlugin::output_streams() const
                c.set (DataType::AUDIO, output_channels);
                c.set (DataType::MIDI, _has_midi_output ? 1 : 0);
        }
-
        return c;
 }
 
 bool
-AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out)
+AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out, ChanCount* imprecise)
 {
-       // Note: We never attempt to multiply-instantiate plugins to meet io configurations.
-
-       int32_t audio_in = in.n_audio();
-       int32_t audio_out;
-       bool found = false;
+       _output_configs.clear ();
+       const int32_t audio_in = in.n_audio();
        AUPluginInfoPtr pinfo = boost::dynamic_pointer_cast<AUPluginInfo>(get_info());
 
        /* lets check MIDI first */
 
-       if (in.n_midi() > 0) {
-               if (!_has_midi_input) {
-                       return false;
+       if (in.n_midi() > 0 && !_has_midi_input && !imprecise) {
+               return false;
+       }
+
+       vector<pair<int,int> > io_configs = pinfo->cache.io_configs;
+
+       if (input_elements > 1) {
+               const vector<pair<int,int> >& ioc (pinfo->cache.io_configs);
+               for (vector<pair<int,int> >::const_iterator i = ioc.begin(); i != ioc.end(); ++i) {
+                       int32_t possible_in = i->first;
+                       int32_t possible_out = i->second;
+                       if (possible_in < 1 || possible_out < 1) {
+                               continue;
+                       }
+                       for (uint32_t i = 1; i < input_elements; ++i) {
+                               // can't use up-to bus_inputs[]
+                               // waves' SC-C6(s) for example fails to configure with only 1 input
+                               // on the 2nd bus.
+                               io_configs.push_back (pair<int,int> (possible_in + bus_inputs[i], possible_out));
+                       }
                }
        }
 
-       vector<pair<int,int> >& io_configs = pinfo->cache.io_configs;
+       if (output_elements > 1) {
+               const vector<pair<int,int> >& ioc (pinfo->cache.io_configs);
+               for (vector<pair<int,int> >::const_iterator i = ioc.begin(); i != ioc.end(); ++i) {
+                       int32_t possible_in = i->first;
+                       int32_t possible_out = i->second;
+                       if (possible_in < 1 || possible_out < 1) {
+                               continue;
+                       }
+                       for (uint32_t i = 1; i < output_elements; ++i) {
+                               int32_t c = bus_outputs[i];
+                               for (uint32_t j = 1; j < i; ++j) {
+                                       c += bus_outputs [j];
+                               }
+                               io_configs.push_back (pair<int,int> (possible_in, possible_out + c));
+                       }
+               }
+       }
 
        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n",
                                                        name(), io_configs.size(), in, out));
 
-       //Ardour expects the plugin to tell it the output
-       //configuration but AU plugins can have multiple I/O
-       //configurations in most cases. so first lets see
-       //if there's a configuration that keeps out==in
-
-       if (in.n_midi() > 0 && audio_in == 0) {
-               audio_out = 2; // prefer stereo version if available.
-       } else {
-               audio_out = audio_in;
+#if 0
+       printf ("AU I/O Configs %s %d\n", name(), io_configs.size());
+       for (vector<pair<int,int> >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) {
+               printf ("- I/O  %d / %d\n", i->first, i->second);
        }
+#endif
+
+       // preferred setting (provided by plugin_insert)
+       const int preferred_out = out.n_audio ();
+       bool found = false;
+       bool exact_match = false;
 
        /* kAudioUnitProperty_SupportedNumChannels
         * https://developer.apple.com/library/mac/documentation/MusicAudio/Conceptual/AudioUnitProgrammingGuide/TheAudioUnit/TheAudioUnit.html#//apple_ref/doc/uid/TP40003278-CH12-SW20
@@ -1193,21 +1347,50 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out)
                int32_t possible_in = i->first;
                int32_t possible_out = i->second;
 
-               if ((possible_in == audio_in) && (possible_out == audio_out)) {
+               if ((possible_in == audio_in) && (possible_out == preferred_out)) {
                        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: %1 in %2 out to match in %3 out %4\n",
-                                                                       possible_in, possible_out,
-                                                                       in, out));
+                                               possible_in, possible_out,
+                                               in, out));
 
-                       out.set (DataType::MIDI, 0);
-                       out.set (DataType::AUDIO, audio_out);
-
-                       return 1;
+                       // exact match
+                       _output_configs.insert (preferred_out);
+                       exact_match = true;
+                       found = true;
+                       break;
                }
        }
 
        /* now allow potentially "imprecise" matches */
+       int32_t audio_out = -1;
+       float penalty = 9999;
+       int used_possible_in = 0;
+#if defined (__clang__)
+#      pragma clang diagnostic push
+#      pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+
+#define FOUNDCFG(nch) {                            \
+  float p = fabsf ((float)(nch) - preferred_out);  \
+  _output_configs.insert (nch);                    \
+  if ((nch) > preferred_out) { p *= 1.1; }         \
+  if (p < penalty) {                               \
+    used_possible_in = possible_in;                \
+    audio_out = (nch);                             \
+    penalty = p;                                   \
+    found = true;                                  \
+    variable_inputs = possible_in < 0;             \
+    variable_outputs = possible_out < 0;           \
+  }                                                \
+}
 
-       audio_out = -1;
+#define ANYTHINGGOES                               \
+  _output_configs.insert (0);
+
+#define UPTO(nch) {                                \
+  for (int n = 1; n <= nch; ++n) {                 \
+    _output_configs.insert (n);                    \
+  }                                                \
+}
 
        for (vector<pair<int,int> >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) {
 
@@ -1223,252 +1406,237 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out)
                }
 
                if (possible_in == 0) {
-
-                       /* instrument plugin, always legal but throws away inputs ...
-                       */
-
+                       /* no inputs, generators & instruments */
                        if (possible_out == -1) {
                                /* any configuration possible, provide stereo output */
-                               audio_out = 2;
-                               found = true;
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out == -2) {
-                               /* plugins shouldn't really use (0,-2) but might.
-                                  any configuration possible, provide stereo output
-                               */
-                               audio_out = 2;
-                               found = true;
+                               /* invalid, should be (0, -1) */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs.
-                                *
-                                * We really need to ask the user in this case.
-                                * stereo will be correct in 99.9% of all cases.
-                                */
-                               audio_out = 2;
-                               found = true;
+                               /* variable number of outputs up to -N, */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                               UPTO (-possible_out);
                        } else {
                                /* exact number of outputs */
-                               audio_out = possible_out;
-                               found = true;
+                               FOUNDCFG (possible_out);
                        }
                }
 
                if (possible_in == -1) {
-
                        /* wildcard for input */
-
                        if (possible_out == -1) {
-                               /* out much match in */
-                               audio_out = audio_in;
-                               found = true;
+                               /* out must match in */
+                               FOUNDCFG (audio_in);
                        } else if (possible_out == -2) {
                                /* any configuration possible, pick matching */
-                               audio_out = audio_in;
-                               found = true;
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out < -2) {
                                /* explicitly variable number of outputs, pick maximum */
-                               audio_out = -possible_out;
-                               found = true;
+                               FOUNDCFG (max (-possible_out, preferred_out));
+                               /* and try min, too, in case the penalty is lower */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                               UPTO (-possible_out)
                        } else {
                                /* exact number of outputs */
-                               audio_out = possible_out;
-                               found = true;
+                               FOUNDCFG (possible_out);
                        }
                }
 
                if (possible_in == -2) {
-
                        if (possible_out == -1) {
                                /* any configuration possible, pick matching */
-                               audio_out = audio_in;
-                               found = true;
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out == -2) {
-                               /* plugins shouldn't really use (-2,-2) but might.
-                                  interpret as (-1,-1).
-                               */
-                               audio_out = audio_in;
-                               found = true;
+                               /* invalid. interpret as (-1, -1) */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs, pick maximum */
-                               audio_out = -possible_out;
-                               found = true;
+                               /* invalid,  interpret as (<-2, <-2)
+                                * variable number of outputs up to -N, */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                               UPTO (-possible_out)
                        } else {
                                /* exact number of outputs */
-                               audio_out = possible_out;
-                               found = true;
+                               FOUNDCFG (possible_out);
                        }
                }
 
                if (possible_in < -2) {
-
                        /* explicit variable number of inputs */
-
-                       if (audio_in > -possible_in) {
-                               /* request is too large */
+                       if (audio_in > -possible_in && imprecise != NULL) {
+                               // hide inputs ports
+                               imprecise->set (DataType::AUDIO, -possible_in);
                        }
 
-
-                       if (possible_out == -1) {
-                               /* any output configuration possible, provide stereo out */
-                               audio_out = 2;
-                               found = true;
+                       if (audio_in > -possible_in && imprecise == NULL) {
+                               /* request is too large */
+                       } else if (possible_out == -1) {
+                               /* any output configuration possible */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out == -2) {
-                               /* plugins shouldn't really use (<-2,-2) but might.
-                                  interpret as (<-2,-1): any configuration possible, provide stereo output
-                               */
-                               audio_out = 2;
-                               found = true;
+                               /* invalid. interpret as (<-2, -1) */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs.
-                                *
-                                * We really need to ask the user in this case.
-                                * stereo will be correct in 99.9% of all cases.
-                                */
-                               audio_out = 2;
-                               found = true;
+                               /* variable number of outputs up to -N, */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                               UPTO (-possible_out)
                        } else {
                                /* exact number of outputs */
-                               audio_out = possible_out;
-                               found = true;
+                               FOUNDCFG (possible_out);
                        }
                }
 
                if (possible_in && (possible_in == audio_in)) {
-
                        /* exact number of inputs ... must match obviously */
-
                        if (possible_out == -1) {
-                               /* any output configuration possible, provide stereo output */
-                               audio_out = 2;
-                               found = true;
+                               /* any output configuration possible */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out == -2) {
-                               /* plugins shouldn't really use (>0,-2) but might.
-                                  interpret as (>0,-1):
-                                  any output configuration possible, provide stereo output
-                               */
-                               audio_out = 2;
-                               found = true;
+                               /* plugins shouldn't really use (>0,-2), interpret as (>0,-1) */
+                               FOUNDCFG (preferred_out);
+                               ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs, pick maximum */
-                               audio_out = -possible_out;
-                               found = true;
+                               /* > 0, < -2 is not specified
+                                * interpret as up to -N */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                               UPTO (-possible_out)
                        } else {
                                /* exact number of outputs */
-                               audio_out = possible_out;
-                               found = true;
+                               FOUNDCFG (possible_out);
                        }
                }
+       }
+
+       if (!found && imprecise) {
+               /* try harder */
+               for (vector<pair<int,int> >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) {
+                       int32_t possible_in = i->first;
+                       int32_t possible_out = i->second;
+
+                       assert (possible_in > 0); // all other cases will have been matched above
+                       assert (possible_out !=0 || possible_in !=0); // already handled above
 
-               if (found) {
-                       if (possible_in < -2 && audio_in == 0) {
-                               // input-port count cannot be zero, use as many ports
-                               // as outputs, but at most abs(possible_in)
-                               audio_input_cnt = max (1, min (audio_out, -possible_in));
+                       imprecise->set (DataType::AUDIO, possible_in);
+                       if (possible_out == -1 || possible_out == -2) {
+                               FOUNDCFG (2);
+                       } else if (possible_out < -2) {
+                               /* explicitly variable number of outputs, pick maximum */
+                               FOUNDCFG (min (-possible_out, preferred_out));
+                       } else {
+                               /* exact number of outputs */
+                               FOUNDCFG (possible_out);
                        }
-                       break;
+                       // ideally we'll also find the closest, best matching
+                       // input configuration with minimal output penalty...
                }
-
        }
 
-       if (found) {
-               out.set (DataType::MIDI, 0); /// XXX
-               out.set (DataType::AUDIO, audio_out);
-               DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: in %1 out %2\n", in, out));
-       } else {
+       if (!found) {
                DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tFAIL: no io configs match %1\n", in));
                return false;
        }
 
-       return true;
-}
-
-int
-AUPlugin::set_input_format (AudioStreamBasicDescription& fmt)
-{
-       return set_stream_format (kAudioUnitScope_Input, input_elements, fmt);
-}
-
-int
-AUPlugin::set_output_format (AudioStreamBasicDescription& fmt)
-{
-       if (set_stream_format (kAudioUnitScope_Output, output_elements, fmt) != 0) {
-               return -1;
-       }
-
-       if (buffers) {
-               free (buffers);
-               buffers = 0;
+       if (exact_match) {
+               out.set (DataType::MIDI, 0); // currently always zero
+               out.set (DataType::AUDIO, preferred_out);
+       } else {
+               if (used_possible_in < -2 && audio_in == 0) {
+                       // input-port count cannot be zero, use as many ports
+                       // as outputs, but at most abs(possible_in)
+                       audio_input_cnt = max (1, min (audio_out, -used_possible_in));
+               }
+               out.set (DataType::MIDI, 0); /// XXX
+               out.set (DataType::AUDIO, audio_out);
        }
+       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: in %1 out %2\n", in, out));
 
-       buffers = (AudioBufferList *) malloc (offsetof(AudioBufferList, mBuffers) +
-                                             fmt.mChannelsPerFrame * sizeof(::AudioBuffer));
-
-       return 0;
+#if defined (__clang__)
+#      pragma clang diagnostic pop
+#endif
+       return true;
 }
 
 int
-AUPlugin::set_stream_format (int scope, uint32_t cnt, AudioStreamBasicDescription& fmt)
+AUPlugin::set_stream_format (int scope, uint32_t bus, AudioStreamBasicDescription& fmt)
 {
        OSErr result;
 
-       for (uint32_t i = 0; i < cnt; ++i) {
-               DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set stream format for %1, scope = %2 element %3\n",
-                                                               (scope == kAudioUnitScope_Input ? "input" : "output"),
-                                                               scope, cnt));
-               if ((result = unit->SetFormat (scope, i, fmt)) != 0) {
-                       error << string_compose (_("AUPlugin: could not set stream format for %1/%2 (err = %3)"),
-                                                (scope == kAudioUnitScope_Input ? "input" : "output"), i, result) << endmsg;
-                       return -1;
-               }
-       }
-
-       if (scope == kAudioUnitScope_Input) {
-               input_channels = fmt.mChannelsPerFrame;
-       } else {
-               output_channels = fmt.mChannelsPerFrame;
+       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set stream format for %1, scope = %2 element %3\n",
+                               (scope == kAudioUnitScope_Input ? "input" : "output"),
+                               scope, bus));
+       if ((result = unit->SetFormat (scope, bus, fmt)) != 0) {
+               error << string_compose (_("AUPlugin: could not set stream format for %1/%2 (err = %3)"),
+                               (scope == kAudioUnitScope_Input ? "input" : "output"), bus, result) << endmsg;
+               return -1;
        }
-
        return 0;
 }
 
 OSStatus
 AUPlugin::render_callback(AudioUnitRenderActionFlags*,
                          const AudioTimeStamp*,
-                         UInt32,
-                         UInt32       inNumberFrames,
-                         AudioBufferList*       ioData)
+                         UInt32 bus,
+                         UInt32 inNumberFrames,
+                         AudioBufferList* ioData)
 {
        /* not much to do with audio - the data is already in the buffers given to us in connect_and_run() */
 
-       // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: render callback, frames %2 bufs %3\n",
-       // name(), inNumberFrames, ioData->mNumberBuffers));
+       // DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: render callback, frames %2 bus %3 bufs %4\n",
+       // name(), inNumberFrames, bus, ioData->mNumberBuffers));
 
        if (input_maxbuf == 0) {
+               DEBUG_TRACE (DEBUG::AudioUnits, "AUPlugin: render callback called illegally!");
                error << _("AUPlugin: render callback called illegally!") << endmsg;
                return kAudioUnitErr_CannotDoInCurrentContext;
        }
+
+       assert (bus < input_elements);
+       uint32_t busoff = 0;
+       for (uint32_t i = 0; i < bus; ++i) {
+               busoff += bus_inputs[i];
+       }
+
        uint32_t limit = min ((uint32_t) ioData->mNumberBuffers, input_maxbuf);
 
+       ChanCount bufs_count (DataType::AUDIO, 1);
+       BufferSet& silent_bufs = _session.get_silent_buffers(bufs_count);
+
+       /* apply bus offsets */
+
        for (uint32_t i = 0; i < limit; ++i) {
                ioData->mBuffers[i].mNumberChannels = 1;
                ioData->mBuffers[i].mDataByteSize = sizeof (Sample) * inNumberFrames;
 
-               /* we don't use the channel mapping because audiounits are
-                * never replicated. one plugin instance uses all channels/buffers
-                * passed to PluginInsert::connect_and_run()
-                */
-
-               ioData->mBuffers[i].mData = input_buffers->get_audio (i).data (cb_offset + input_offset);
+               bool valid = false;
+               uint32_t idx = input_map->get (DataType::AUDIO, i + busoff, &valid);
+               if (valid) {
+                       ioData->mBuffers[i].mData = input_buffers->get_audio (idx).data (cb_offsets[bus] + input_offset);
+               } else {
+                       ioData->mBuffers[i].mData = silent_bufs.get_audio(0).data (cb_offsets[bus] + input_offset);
+               }
        }
-
-       cb_offset += inNumberFrames;
-
+       cb_offsets[bus] += inNumberFrames;
        return noErr;
 }
 
 int
-AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_map, pframes_t nframes, framecnt_t offset)
+AUPlugin::connect_and_run (BufferSet& bufs,
+               framepos_t start, framepos_t end, double speed,
+               ChanMapping in_map, ChanMapping out_map,
+               pframes_t nframes, framecnt_t offset)
 {
-       Plugin::connect_and_run (bufs, in_map, out_map, nframes, offset);
+       Plugin::connect_and_run(bufs, start, end, speed, in_map, out_map, nframes, offset);
+
+       transport_frame = start;
+       transport_speed = speed;
 
        AudioUnitRenderActionFlags flags = 0;
        AudioTimeStamp ts;
@@ -1479,101 +1647,151 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_
                _last_nframes = nframes;
        }
 
-       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6)\n",
+       /* test if we can run in-place; only compare audio buffers */
+       bool inplace = true; // TODO check plugin-insert in-place ?
+       ChanMapping::Mappings inmap (in_map.mappings ());
+       ChanMapping::Mappings outmap (out_map.mappings ());
+       if (outmap[DataType::AUDIO].size () == 0) {
+               inplace = false;
+       }
+       if (inmap[DataType::AUDIO].size() > 0 && inmap != outmap) {
+               inplace = false;
+       }
+
+       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6) InBus %7 OutBus %8 Inplace: %9 var-i/o %10 %11\n",
                                name(), input_channels, output_channels, _has_midi_input,
-                               bufs.count(), bufs.available()));
+                               bufs.count(), bufs.available(),
+                               configured_input_busses, configured_output_busses, inplace, variable_inputs, variable_outputs));
 
        /* the apparent number of buffers matches our input configuration, but we know that the bufferset
-          has the capacity to handle our outputs.
-          */
+        * has the capacity to handle our outputs.
+        */
 
        assert (bufs.available() >= ChanCount (DataType::AUDIO, output_channels));
 
        input_buffers = &bufs;
+       input_map = &in_map;
        input_maxbuf = bufs.count().n_audio(); // number of input audio buffers
        input_offset = offset;
-       cb_offset = 0;
-
-       buffers->mNumberBuffers = output_channels;
-
-       for (int32_t i = 0; i < output_channels; ++i) {
-               buffers->mBuffers[i].mNumberChannels = 1;
-               buffers->mBuffers[i].mDataByteSize = nframes * sizeof (Sample);
-               /* setting this to 0 indicates to the AU that it can provide buffers here
-                * if necessary. if it can process in-place, it will use the buffers provided
-                * as input by ::render_callback() above.
-                *
-                * a non-null values tells the plugin to render into the buffer pointed
-                * at by the value.
-                */
-               buffers->mBuffers[i].mData = 0;
+       for (size_t i = 0; i < input_elements; ++i) {
+               cb_offsets[i] = 0;
        }
 
-       if (_has_midi_input) {
+       ChanCount bufs_count (DataType::AUDIO, 1);
+       BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count);
 
+       if (_has_midi_input) {
                uint32_t nmidi = bufs.count().n_midi();
-
                for (uint32_t i = 0; i < nmidi; ++i) {
-
                        /* one MIDI port/buffer only */
-
                        MidiBuffer& m = bufs.get_midi (i);
-
                        for (MidiBuffer::iterator i = m.begin(); i != m.end(); ++i) {
                                Evoral::MIDIEvent<framepos_t> ev (*i);
-
                                if (ev.is_channel_event()) {
                                        const uint8_t* b = ev.buffer();
                                        DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1: MIDI event %2\n", name(), ev));
                                        unit->MIDIEvent (b[0], b[1], b[2], ev.time());
                                }
-
                                /* XXX need to handle sysex and other message types */
                        }
                }
        }
 
-       /* does this really mean anything ?
-       */
-
-       ts.mSampleTime = frames_processed;
-       ts.mFlags = kAudioTimeStampSampleTimeValid;
+       assert (input_maxbuf < 512);
+       std::bitset<512> used_outputs;
 
-       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 buffers=%5\n",
-                               name(), flags, frames_processed, nframes, buffers->mNumberBuffers));
+       bool ok = true;
+       uint32_t busoff = 0;
+       uint32_t remain = output_channels;
+       for (uint32_t bus = 0; remain > 0 && bus < configured_output_busses; ++bus) {
+               uint32_t cnt;
+               if (variable_outputs || (output_elements == configured_output_busses && configured_output_busses == 1)) {
+                       cnt = output_channels;
+               } else {
+                       cnt = std::min (remain, bus_outputs[bus]);
+               }
+               assert (cnt > 0);
+
+               buffers->mNumberBuffers = cnt;
+
+               for (uint32_t i = 0; i < cnt; ++i) {
+                       buffers->mBuffers[i].mNumberChannels = 1;
+                       buffers->mBuffers[i].mDataByteSize = nframes * sizeof (Sample);
+                       /* setting this to 0 indicates to the AU that it can provide buffers here
+                        * if necessary. if it can process in-place, it will use the buffers provided
+                        * as input by ::render_callback() above.
+                        *
+                        * a non-null values tells the plugin to render into the buffer pointed
+                        * at by the value.
+                        */
+                       if (inplace) {
+                               buffers->mBuffers[i].mData = 0;
+                       } else {
+                               bool valid = false;
+                               uint32_t idx = out_map.get (DataType::AUDIO, i + busoff, &valid);
+                               if (valid) {
+                                       buffers->mBuffers[i].mData = bufs.get_audio (idx).data (offset);
+                               } else {
+                                       buffers->mBuffers[i].mData = scratch_bufs.get_audio(0).data(offset);
+                               }
+                       }
+               }
 
-       if ((err = unit->Render (&flags, &ts, 0, nframes, buffers)) == noErr) {
+               /* does this really mean anything ?  */
+               ts.mSampleTime = frames_processed;
+               ts.mFlags = kAudioTimeStampSampleTimeValid;
 
-               input_maxbuf = 0;
-               frames_processed += nframes;
+               DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 bus=%5 buffers=%6\n",
+                                       name(), flags, frames_processed, nframes, bus, buffers->mNumberBuffers));
 
-               DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 rendered %2 buffers of %3\n",
-                                       name(), buffers->mNumberBuffers, output_channels));
+               if ((err = unit->Render (&flags, &ts, bus, nframes, buffers)) == noErr) {
 
-               int32_t limit = min ((int32_t) buffers->mNumberBuffers, output_channels);
-               int32_t i;
+                       DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 rendered %2 buffers of %3\n",
+                                               name(), buffers->mNumberBuffers, output_channels));
 
-               for (i = 0; i < limit; ++i) {
-                       Sample* expected_buffer_address= bufs.get_audio (i).data (offset);
-                       if (expected_buffer_address != buffers->mBuffers[i].mData) {
-                               /* plugin provided its own buffer for output so copy it back to where we want it
-                               */
-                               memcpy (expected_buffer_address, buffers->mBuffers[i].mData, nframes * sizeof (Sample));
+                       uint32_t limit = std::min ((uint32_t) buffers->mNumberBuffers, cnt);
+                       for (uint32_t i = 0; i < limit; ++i) {
+                               bool valid = false;
+                               uint32_t idx = out_map.get (DataType::AUDIO, i + busoff, &valid);
+                               if (!valid) continue;
+                               used_outputs.set (i + busoff);
+                               Sample* expected_buffer_address = bufs.get_audio (idx).data (offset);
+                               if (expected_buffer_address != buffers->mBuffers[i].mData) {
+                                       /* plugin provided its own buffer for output so copy it back to where we want it */
+                                       memcpy (expected_buffer_address, buffers->mBuffers[i].mData, nframes * sizeof (Sample));
+                               }
                        }
+               } else {
+                       DEBUG_TRACE (DEBUG::AudioUnits, string_compose (_("AU: render error for %1, bus %2 status = %3\n"), name(), bus, err));
+                       error << string_compose (_("AU: render error for %1, bus %2 status = %3"), name(), bus, err) << endmsg;
+                       ok = false;
+                       break;
                }
 
-               /* now silence any buffers that were passed in but the that the plugin
-                * did not fill/touch/use.
-                */
+               remain -= cnt;
+               busoff += bus_outputs[bus];
+       }
 
-               for (;i < output_channels; ++i) {
-                       memset (bufs.get_audio (i).data (offset), 0, nframes * sizeof (Sample));
-               }
+       /* now silence any buffers that were passed in but the that the plugin
+        * did not fill/touch/use.
+        *
+        * TODO: optimize, when plugin-insert is processing in-place
+        * unconnected buffers are (also) cleared there.
+        */
+       for (uint32_t i = 0; i < input_maxbuf; ++i) {
+               if (used_outputs.test (i)) { continue; }
+               bool valid = false;
+               uint32_t idx = out_map.get (DataType::AUDIO, i, &valid);
+               if (!valid) continue;
+               memset (bufs.get_audio (idx).data (offset), 0, nframes * sizeof (Sample));
+       }
+
+       input_maxbuf = 0;
 
+       if (ok) {
+               frames_processed += nframes;
                return 0;
        }
-
-       error << string_compose (_("AU: render error for %1, status = %2"), name(), err) << endmsg;
        return -1;
 }
 
@@ -1594,16 +1812,16 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat,
                return kAudioUnitErr_CannotDoInCurrentContext;
        }
 
-       Timecode::BBT_Time bbt;
-       TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset);
-       tmap.bbt_time (_session.transport_frame() + input_offset, bbt);
+       TempoMetric metric = tmap.metric_at (transport_frame + input_offset);
+       Timecode::BBT_Time bbt = _session.tempo_map().bbt_at_frame (transport_frame + input_offset);
 
        if (outCurrentBeat) {
+               const double ppq_scaling = metric.meter().note_divisor() / 4.0;
                float beat;
-               beat = metric.meter().divisions_per_bar() * bbt.bars;
-               beat += bbt.beats;
+               beat = metric.meter().divisions_per_bar() * (bbt.bars - 1);
+               beat += (bbt.beats - 1);
                beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat;
-               *outCurrentBeat = beat;
+               *outCurrentBeat = beat * ppq_scaling;
        }
 
        if (outCurrentTempo) {
@@ -1633,18 +1851,16 @@ AUPlugin::get_musical_time_location_callback (UInt32*   outDeltaSampleOffsetToNe
                return kAudioUnitErr_CannotDoInCurrentContext;
        }
 
-       Timecode::BBT_Time bbt;
-       TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset);
-       tmap.bbt_time (_session.transport_frame() + input_offset, bbt);
+       TempoMetric metric = tmap.metric_at (transport_frame + input_offset);
+       Timecode::BBT_Time bbt = _session.tempo_map().bbt_at_frame (transport_frame + input_offset);
 
        if (outDeltaSampleOffsetToNextBeat) {
                if (bbt.ticks == 0) {
                        /* on the beat */
                        *outDeltaSampleOffsetToNextBeat = 0;
                } else {
-                       *outDeltaSampleOffsetToNextBeat = (UInt32)
-                               floor (((Timecode::BBT_Time::ticks_per_beat - bbt.ticks)/Timecode::BBT_Time::ticks_per_beat) * // fraction of a beat to next beat
-                                      metric.tempo().frames_per_beat (_session.frame_rate())); // frames per beat
+                       double const beat_frac_to_next = (Timecode::BBT_Time::ticks_per_beat - bbt.ticks) / Timecode::BBT_Time::ticks_per_beat;
+                       *outDeltaSampleOffsetToNextBeat = tmap.frame_at_beat (tmap.beat_at_frame (transport_frame + input_offset) + beat_frac_to_next);
                }
        }
 
@@ -1678,22 +1894,20 @@ AUPlugin::get_transport_state_callback (Boolean*  outIsPlaying,
                                        Float64*  outCycleStartBeat,
                                        Float64*  outCycleEndBeat)
 {
-       bool rolling;
-       float speed;
+       const bool rolling = (transport_speed != 0);
+       const bool last_transport_rolling = (last_transport_speed != 0);
 
        DEBUG_TRACE (DEBUG::AudioUnits, "AU calls ardour transport state callback\n");
 
-       rolling = _session.transport_rolling();
-       speed = _session.transport_speed ();
 
        if (outIsPlaying) {
-               *outIsPlaying = _session.transport_rolling();
+               *outIsPlaying = rolling;
        }
 
        if (outTransportStateChanged) {
                if (rolling != last_transport_rolling) {
                        *outTransportStateChanged = true;
-               } else if (speed != last_transport_speed) {
+               } else if (transport_speed != last_transport_speed) {
                        *outTransportStateChanged = true;
                } else {
                        *outTransportStateChanged = false;
@@ -1704,13 +1918,14 @@ AUPlugin::get_transport_state_callback (Boolean*  outIsPlaying,
                /* this assumes that the AU can only call this host callback from render context,
                   where input_offset is valid.
                */
-               *outCurrentSampleInTimeLine = _session.transport_frame() + input_offset;
+               *outCurrentSampleInTimeLine = transport_frame + input_offset;
        }
 
        if (outIsCycling) {
+               // TODO check bounce-processing
                Location* loc = _session.locations()->auto_loop_location();
 
-               *outIsCycling = (loc && _session.transport_rolling() && _session.get_play_loop());
+               *outIsCycling = (loc && rolling && _session.get_play_loop());
 
                if (*outIsCycling) {
 
@@ -1730,7 +1945,7 @@ AUPlugin::get_transport_state_callback (Boolean*  outIsPlaying,
 
                                if (outCycleStartBeat) {
                                        TempoMetric metric = tmap.metric_at (loc->start() + input_offset);
-                                       _session.tempo_map().bbt_time (loc->start(), bbt);
+                                       bbt = _session.tempo_map().bbt_at_frame (loc->start() + input_offset);
 
                                        float beat;
                                        beat = metric.meter().divisions_per_bar() * bbt.bars;
@@ -1742,7 +1957,7 @@ AUPlugin::get_transport_state_callback (Boolean*  outIsPlaying,
 
                                if (outCycleEndBeat) {
                                        TempoMetric metric = tmap.metric_at (loc->end() + input_offset);
-                                       _session.tempo_map().bbt_time (loc->end(), bbt);
+                                       bbt = _session.tempo_map().bbt_at_frame (loc->end() + input_offset);
 
                                        float beat;
                                        beat = metric.meter().divisions_per_bar() * bbt.bars;
@@ -1755,8 +1970,7 @@ AUPlugin::get_transport_state_callback (Boolean*  outIsPlaying,
                }
        }
 
-       last_transport_rolling = rolling;
-       last_transport_speed = speed;
+       last_transport_speed = transport_speed;
 
        return noErr;
 }
@@ -1775,6 +1989,60 @@ AUPlugin::automatable() const
        return automates;
 }
 
+Plugin::IOPortDescription
+AUPlugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const
+{
+       std::stringstream ss;
+       switch (dt) {
+               case DataType::AUDIO:
+                       break;
+               case DataType::MIDI:
+                       ss << _("Midi");
+                       break;
+               default:
+                       ss << _("?");
+                       break;
+       }
+
+       if (dt == DataType::AUDIO) {
+               if (input) {
+                       uint32_t pid = id;
+                       for (uint32_t bus = 0; bus < input_elements; ++bus) {
+                               if (pid < bus_inputs[bus]) {
+                                       id = pid;
+                                       ss << _bus_name_in[bus];
+                                       ss << " / Bus " << (1 + bus);
+                                       break;
+                               }
+                               pid -= bus_inputs[bus];
+                       }
+               }
+               else {
+                       uint32_t pid = id;
+                       for (uint32_t bus = 0; bus < output_elements; ++bus) {
+                               if (pid < bus_outputs[bus]) {
+                                       id = pid;
+                                       ss << _bus_name_out[bus];
+                                       ss << " / Bus " << (1 + bus);
+                                       break;
+                               }
+                               pid -= bus_outputs[bus];
+                       }
+               }
+       }
+
+       if (input) {
+               ss << " " << _("In") << " ";
+       } else {
+               ss << " " << _("Out") << " ";
+       }
+
+       ss << (id + 1);
+
+       Plugin::IOPortDescription iod (ss.str());
+       return iod;
+}
+
 string
 AUPlugin::describe_parameter (Evoral::Parameter param)
 {
@@ -1833,7 +2101,7 @@ AUPlugin::parameter_is_output (uint32_t param) const
 void
 AUPlugin::add_state (XMLNode* root) const
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        CFDataRef xmlData;
        CFPropertyListRef propertyList;
 
@@ -1872,7 +2140,7 @@ AUPlugin::set_state(const XMLNode& node, int version)
 {
        int ret = -1;
        CFPropertyListRef propertyList;
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        if (node.name() != state_node_name()) {
                error << _("Bad node sent to AUPlugin::set_state") << endmsg;
@@ -2410,7 +2678,7 @@ AUPluginInfo::get_presets (bool user_only) const
        }
 
        vector<string> preset_files;
-       find_files_matching_filter (preset_files, preset_search_path, au_preset_filter, this, true, true, true);
+       find_files_matching_filter (preset_files, preset_search_path, au_preset_filter, const_cast<AUPluginInfo*>(this), true, true, true);
 
        for (vector<string>::iterator x = preset_files.begin(); x != preset_files.end(); ++x) {
                string path = *x;
@@ -2485,6 +2753,8 @@ AUPluginInfo::discover (bool scan_only)
 
        if (!Glib::file_test (au_cache_path(), Glib::FILE_TEST_EXISTS)) {
                ARDOUR::BootMessage (_("Discovering AudioUnit plugins (could take some time ...)"));
+               // flush RAM cache -- after clear_cache()
+               cached_info.clear();
        }
        // create crash log file
        au_start_crashlog ();
@@ -2645,6 +2915,8 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
                        continue;
                }
 
+               bool has_midi_in = false;
+
                AUPluginInfoPtr info (new AUPluginInfo
                                      (boost::shared_ptr<CAComponentDescription> (new CAComponentDescription(temp))));
 
@@ -2669,9 +2941,11 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
                        break;
                case kAudioUnitType_MusicDevice:
                        info->category = _("AudioUnit Instruments");
+                       has_midi_in = true;
                        break;
                case kAudioUnitType_MusicEffect:
                        info->category = _("AudioUnit MusicEffects");
+                       has_midi_in = true;
                        break;
                case kAudioUnitType_Effect:
                        info->category = _("AudioUnit Effects");
@@ -2699,8 +2973,7 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
                info->type = ARDOUR::AudioUnit;
                info->unique_id = stringify_descriptor (*info->descriptor);
 
-               /* XXX not sure of the best way to handle plugin versioning yet
-                */
+               /* XXX not sure of the best way to handle plugin versioning yet */
 
                CAComponent cacomp (*info->descriptor);
 
@@ -2738,6 +3011,8 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
                                info->n_inputs.set (DataType::AUDIO, 1);
                        }
 
+                       info->n_inputs.set (DataType::MIDI, has_midi_in ? 1 : 0);
+
                        if (possible_out > 0) {
                                info->n_outputs.set (DataType::AUDIO, possible_out);
                        } else {
@@ -2820,20 +3095,34 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id,
        }
 
        if (ret > 0) {
-
-               /* no explicit info available, so default to 1in/1out */
-
-               /* XXX this is wrong. we should be indicating wildcard values */
-
+               /* AU is expected to deal with same channel valance in and out */
                cinfo.io_configs.push_back (pair<int,int> (-1, -1));
-
        } else {
-
-               /* store each configuration */
-
-               for (uint32_t n = 0; n < cnt; ++n) {
-                       cinfo.io_configs.push_back (pair<int,int> (channel_info[n].inChannels,
-                                                                  channel_info[n].outChannels));
+               /* CAAudioUnit::GetChannelInfo silently merges bus formats
+                * check if this was the case and if so, add
+                * bus configs as incremental options.
+                */
+               Boolean* isWritable = 0;
+               UInt32  dataSize = 0;
+               OSStatus result = AudioUnitGetPropertyInfo (unit.AU(),
+                               kAudioUnitProperty_SupportedNumChannels,
+                               kAudioUnitScope_Global, 0,
+                               &dataSize, isWritable);
+               if (result != noErr && (comp.Desc().IsGenerator() || comp.Desc().IsMusicDevice())) {
+                       /* incrementally add busses */
+                       int in = 0;
+                       int out = 0;
+                       for (uint32_t n = 0; n < cnt; ++n) {
+                               in += channel_info[n].inChannels;
+                               out += channel_info[n].outChannels;
+                               cinfo.io_configs.push_back (pair<int,int> (in, out));
+                       }
+               } else {
+                       /* store each configuration */
+                       for (uint32_t n = 0; n < cnt; ++n) {
+                               cinfo.io_configs.push_back (pair<int,int> (channel_info[n].inChannels,
+                                                       channel_info[n].outChannels));
+                       }
                }
 
                free (channel_info);
@@ -2845,6 +3134,17 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id,
        return 0;
 }
 
+void
+AUPluginInfo::clear_cache ()
+{
+       const string& fn = au_cache_path();
+       if (Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) {
+               ::g_unlink(fn.c_str());
+       }
+       // keep cached_info in RAM until restart or re-scan
+       cached_info.clear();
+}
+
 void
 AUPluginInfo::add_cached_info (const std::string& id, AUPluginCachedInfo& cinfo)
 {
@@ -2913,7 +3213,7 @@ AUPluginInfo::load_cached_info ()
        }
 
        //initial version has incorrectly stored i/o info, and/or garbage chars.
-       const XMLProperty* version = root->property(X_("version"));
+       XMLProperty const * version = root->property(X_("version"));
        if (! ((version != NULL) && (version->value() == X_(AU_CACHE_VERSION)))) {
                error << "au_cache is not correct version.  AU plugins will be re-scanned" << endmsg;
                return -1;
@@ -2931,7 +3231,7 @@ AUPluginInfo::load_cached_info ()
 
                        const XMLNode* gchild;
                        const XMLNodeList gchildren = child->children();
-                       const XMLProperty* prop = child->property (X_("id"));
+                       XMLProperty const * prop = child->property (X_("id"));
 
                        if (!prop) {
                                continue;
@@ -2969,8 +3269,8 @@ AUPluginInfo::load_cached_info ()
 
                                        int in;
                                        int out;
-                                       const XMLProperty* iprop;
-                                       const XMLProperty* oprop;
+                                       XMLProperty const * iprop;
+                                       XMLProperty const * oprop;
 
                                        if (((iprop = gchild->property (X_("in"))) != 0) &&
                                            ((oprop = gchild->property (X_("out"))) != 0)) {
@@ -3012,7 +3312,7 @@ AUPluginInfo::stringify_descriptor (const CAComponentDescription& desc)
 }
 
 bool
-AUPluginInfo::needs_midi_input ()
+AUPluginInfo::needs_midi_input () const
 {
        return is_effect_with_midi_input () || is_instrument ();
 }
@@ -3067,6 +3367,19 @@ AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float in
 
        _parameter_listener_arg = arg;
 
+       // listen for latency changes
+       AudioUnitEvent event;
+       event.mEventType = kAudioUnitEvent_PropertyChange;
+       event.mArgument.mProperty.mAudioUnit = unit->AU();
+       event.mArgument.mProperty.mPropertyID = kAudioUnitProperty_Latency;
+       event.mArgument.mProperty.mScope = kAudioUnitScope_Global;
+       event.mArgument.mProperty.mElement = 0;
+
+       if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) {
+               PBD::error << "Failed to create latency event listener\n";
+               // TODO don't cache _current_latency
+       }
+
        return 0;
 }
 
@@ -3163,6 +3476,15 @@ AUPlugin::_parameter_change_listener (void* arg, void* src, const AudioUnitEvent
 void
 AUPlugin::parameter_change_listener (void* /*arg*/, void* src, const AudioUnitEvent* event, UInt64 /*host_time*/, Float32 new_value)
 {
+       if (event->mEventType == kAudioUnitEvent_PropertyChange) {
+               if (event->mArgument.mProperty.mPropertyID == kAudioUnitProperty_Latency) {
+                       DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Latency Change Event %1 <> %2\n", new_value, unit->Latency()));
+                       guint lat = unit->Latency() * _session.frame_rate();
+                       g_atomic_int_set (&_current_latency, lat);
+               }
+               return;
+       }
+
         ParameterMap::iterator i;
 
         if ((i = parameter_map.find (event->mArgument.mParameter.mParameterID)) == parameter_map.end()) {