X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_unit.cc;h=d53a17ca35c4856fa7ff3866a60ae211eabc71c7;hb=7e8fda8431d1d5a577d654b6bc30093f31247994;hp=9e461c63466515cfa63aff5d12384b7b1f8083e0;hpb=d8329d855dab6199afef27cc8635472ddca0fe7b;p=ardour.git diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 9e461c6346..d53a17ca35 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -19,22 +19,23 @@ */ #include +#include #include #include #include #include +#include "pbd/gstdio_compat.h" #include "pbd/transmitter.h" #include "pbd/xml++.h" #include "pbd/convert.h" #include "pbd/whitespace.h" -#include "pbd/pathscanner.h" +#include "pbd/file_utils.h" #include "pbd/locale_guard.h" #include #include #include -#include #include "ardour/ardour.h" #include "ardour/audioengine.h" @@ -49,8 +50,8 @@ #include "ardour/tempo.h" #include "ardour/utils.h" -#include "appleutility/CAAudioUnit.h" -#include "appleutility/CAAUParameter.h" +#include "CAAudioUnit.h" +#include "CAAUParameter.h" #include #include @@ -60,6 +61,16 @@ #include #endif +#ifdef COREAUDIO105 +#define ArdourComponent Component +#define ArdourDescription ComponentDescription +#define ArdourFindNext FindNextComponent +#else +#define ArdourComponent AudioComponent +#define ArdourDescription AudioComponentDescription +#define ArdourFindNext AudioComponentFindNext +#endif + #include "i18n.h" using namespace std; @@ -71,6 +82,81 @@ AUPluginInfo::CachedInfoMap AUPluginInfo::cached_info; static string preset_search_path = "/Library/Audio/Presets:/Network/Library/Audio/Presets"; static string preset_suffix = ".aupreset"; static bool preset_search_path_initialized = false; +FILE * AUPluginInfo::_crashlog_fd = NULL; +bool AUPluginInfo::_scan_only = true; + + +static void au_blacklist (std::string id) +{ + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_blacklist.txt"); + FILE * blacklist_fd = NULL; + if (! (blacklist_fd = fopen(fn.c_str(), "a"))) { + PBD::error << "Cannot append to AU blacklist for '"<< id <<"'\n"; + return; + } + assert(id.find("\n") == string::npos); + fprintf(blacklist_fd, "%s\n", id.c_str()); + ::fclose(blacklist_fd); +} + +static void au_unblacklist (std::string id) +{ + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_blacklist.txt"); + if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) { + PBD::warning << "Expected Blacklist file does not exist.\n"; + return; + } + + std::string bl; + { + std::ifstream ifs(fn.c_str()); + bl.assign ((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); + } + + ::g_unlink (fn.c_str()); + + assert (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)); + assert(id.find("\n") == string::npos); + + id += "\n"; // add separator + const size_t rpl = bl.find(id); + if (rpl != string::npos) { + bl.replace(rpl, id.size(), ""); + } + if (bl.empty()) { + return; + } + + FILE * blacklist_fd = NULL; + if (! (blacklist_fd = fopen(fn.c_str(), "w"))) { + PBD::error << "Cannot open AU blacklist.\n"; + return; + } + fprintf(blacklist_fd, "%s", bl.c_str()); + ::fclose(blacklist_fd); +} + +static bool is_blacklisted (std::string id) +{ + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_blacklist.txt"); + if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) { + return false; + } + std::string bl; + std::ifstream ifs(fn.c_str()); + bl.assign ((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); + + assert(id.find("\n") == string::npos); + + id += "\n"; // add separator + const size_t rpl = bl.find(id); + if (rpl != string::npos) { + return true; + } + return false; +} + + static OSStatus _render_callback(void *userData, @@ -263,8 +349,8 @@ get_preset_name_in_plist (CFPropertyListRef plist) //-------------------------------------------------------------------------- // general implementation for ComponentDescriptionsMatch() and ComponentDescriptionsMatch_Loosely() // if inIgnoreType is true, then the type code is ignored in the ComponentDescriptions -Boolean ComponentDescriptionsMatch_General(const ComponentDescription * inComponentDescription1, const ComponentDescription * inComponentDescription2, Boolean inIgnoreType); -Boolean ComponentDescriptionsMatch_General(const ComponentDescription * inComponentDescription1, const ComponentDescription * inComponentDescription2, Boolean inIgnoreType) +Boolean ComponentDescriptionsMatch_General(const ArdourDescription * inComponentDescription1, const ArdourDescription * inComponentDescription2, Boolean inIgnoreType); +Boolean ComponentDescriptionsMatch_General(const ArdourDescription * inComponentDescription1, const ArdourDescription * inComponentDescription2, Boolean inIgnoreType) { if ( (inComponentDescription1 == NULL) || (inComponentDescription2 == NULL) ) return FALSE; @@ -286,17 +372,21 @@ Boolean ComponentDescriptionsMatch_General(const ComponentDescription * inCompon //-------------------------------------------------------------------------- // general implementation for ComponentAndDescriptionMatch() and ComponentAndDescriptionMatch_Loosely() // if inIgnoreType is true, then the type code is ignored in the ComponentDescriptions -Boolean ComponentAndDescriptionMatch_General(Component inComponent, const ComponentDescription * inComponentDescription, Boolean inIgnoreType); -Boolean ComponentAndDescriptionMatch_General(Component inComponent, const ComponentDescription * inComponentDescription, Boolean inIgnoreType) +Boolean ComponentAndDescriptionMatch_General(ArdourComponent inComponent, const ArdourDescription * inComponentDescription, Boolean inIgnoreType); +Boolean ComponentAndDescriptionMatch_General(ArdourComponent inComponent, const ArdourDescription * inComponentDescription, Boolean inIgnoreType) { OSErr status; - ComponentDescription desc; + ArdourDescription desc; if ( (inComponent == NULL) || (inComponentDescription == NULL) ) return FALSE; // get the ComponentDescription of the input Component +#ifdef COREAUDIO105 status = GetComponentInfo(inComponent, &desc, NULL, NULL, NULL); +#else + status = AudioComponentGetDescription (inComponent, &desc); +#endif if (status != noErr) return FALSE; @@ -308,28 +398,28 @@ Boolean ComponentAndDescriptionMatch_General(Component inComponent, const Compon // determine if 2 ComponentDescriptions are basically equal // (by that, I mean that the important identifying values are compared, // but not the ComponentDescription flags) -Boolean ComponentDescriptionsMatch(const ComponentDescription * inComponentDescription1, const ComponentDescription * inComponentDescription2) +Boolean ComponentDescriptionsMatch(const ArdourDescription * inComponentDescription1, const ArdourDescription * inComponentDescription2) { return ComponentDescriptionsMatch_General(inComponentDescription1, inComponentDescription2, FALSE); } //-------------------------------------------------------------------------- // determine if 2 ComponentDescriptions have matching sub-type and manufacturer codes -Boolean ComponentDescriptionsMatch_Loose(const ComponentDescription * inComponentDescription1, const ComponentDescription * inComponentDescription2) +Boolean ComponentDescriptionsMatch_Loose(const ArdourDescription * inComponentDescription1, const ArdourDescription * inComponentDescription2) { return ComponentDescriptionsMatch_General(inComponentDescription1, inComponentDescription2, TRUE); } //-------------------------------------------------------------------------- // determine if a ComponentDescription basically matches that of a particular Component -Boolean ComponentAndDescriptionMatch(Component inComponent, const ComponentDescription * inComponentDescription) +Boolean ComponentAndDescriptionMatch(ArdourComponent inComponent, const ArdourDescription * inComponentDescription) { return ComponentAndDescriptionMatch_General(inComponent, inComponentDescription, FALSE); } //-------------------------------------------------------------------------- // determine if a ComponentDescription matches only the sub-type and manufacturer codes of a particular Component -Boolean ComponentAndDescriptionMatch_Loosely(Component inComponent, const ComponentDescription * inComponentDescription) +Boolean ComponentAndDescriptionMatch_Loosely(ArdourComponent inComponent, const ArdourDescription * inComponentDescription) { return ComponentAndDescriptionMatch_General(inComponent, inComponentDescription, TRUE); } @@ -343,10 +433,19 @@ AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptrUninitialize (); } - if (buffers) { - free (buffers); - } + free (buffers); + free (bus_inputs); + free (bus_outputs); + free (cb_offsets); } void @@ -432,6 +543,7 @@ AUPlugin::discover_factory_presets () string name = CFStringRefToStdString (preset->presetName); factory_preset_map[name] = preset->presetNumber; + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Factory Preset: %1 > %2\n", name, preset->presetNumber)); } CFRelease (presets); @@ -441,6 +553,7 @@ void AUPlugin::init () { OSErr err; + CFStringRef itemName; /* these keep track of *configured* channel set up, not potential set ups. @@ -448,6 +561,24 @@ AUPlugin::init () input_channels = -1; output_channels = -1; + { + CAComponentDescription temp; +#ifdef COREAUDIO105 + GetComponentInfo (comp.get()->Comp(), &temp, NULL, NULL, NULL); +#else + AudioComponentGetDescription (comp.get()->Comp(), &temp); +#endif + CFStringRef compTypeString = UTCreateStringForOSType(temp.componentType); + CFStringRef compSubTypeString = UTCreateStringForOSType(temp.componentSubType); + CFStringRef compManufacturerString = UTCreateStringForOSType(temp.componentManufacturer); + itemName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ - %@ - %@"), + compTypeString, compManufacturerString, compSubTypeString); + if (compTypeString != NULL) CFRelease(compTypeString); + if (compSubTypeString != NULL) CFRelease(compSubTypeString); + if (compManufacturerString != NULL) CFRelease(compManufacturerString); + } + + au_blacklist(CFStringRefToStdString(itemName)); try { DEBUG_TRACE (DEBUG::AudioUnits, "opening AudioUnit\n"); @@ -469,18 +600,58 @@ 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)); + + for (size_t i = 0; i < output_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Output, i); + AudioStreamBasicDescription fmt; + UInt32 sz = sizeof(AudioStreamBasicDescription); + err = AudioUnitGetProperty(unit->AU(), kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, i, &fmt, &sz); + if (err == noErr) { + bus_outputs[i] = fmt.mChannelsPerFrame; + } + CFStringRef name; + 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) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Input, i); + AudioStreamBasicDescription fmt; + UInt32 sz = sizeof(AudioStreamBasicDescription); + err = AudioUnitGetProperty(unit->AU(), kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, i, &fmt, &sz); + if (err == noErr) { + bus_inputs[i] = fmt.mChannelsPerFrame; + } + CFStringRef name; + 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(); } @@ -513,6 +684,9 @@ AUPlugin::init () discover_factory_presets (); // Plugin::setup_controls (); + + au_unblacklist(CFStringRefToStdString(itemName)); + if (itemName != NULL) CFRelease(itemName); } void @@ -530,7 +704,7 @@ AUPlugin::discover_parameters () for (uint32_t i = 0; i < sizeof (scopes) / sizeof (scopes[0]); ++i) { - AUParamInfo param_info (unit->AU(), false, false, scopes[i]); + AUParamInfo param_info (unit->AU(), false, /* include read only */ true, scopes[i]); for (uint32_t i = 0; i < param_info.NumParams(); ++i) { @@ -541,9 +715,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 { @@ -604,24 +778,33 @@ AUPlugin::discover_parameters () d.lower = info.minValue; d.upper = info.maxValue; - d.default_value = info.defaultValue; + d.normal = info.defaultValue; d.integer_step = (info.unit == kAudioUnitParameterUnit_Indexed); d.toggled = (info.unit == kAudioUnitParameterUnit_Boolean) || (d.integer_step && ((d.upper - d.lower) == 1.0)); d.sr_dependent = (info.unit == kAudioUnitParameterUnit_SampleFrames); - d.automatable = !d.toggled && + d.automatable = /* !d.toggled && -- ardour can automate toggles, can AU ? */ !(info.flags & kAudioUnitParameterFlag_NonRealTime) && (info.flags & kAudioUnitParameterFlag_IsWritable); d.logarithmic = (info.flags & kAudioUnitParameterFlag_DisplayLogarithmic); - d.unit = info.unit; + d.au_unit = info.unit; + switch (info.unit) { + case kAudioUnitParameterUnit_Decibels: + d.unit = ParameterDescriptor::DB; + break; + case kAudioUnitParameterUnit_MIDINoteNumber: + d.unit = ParameterDescriptor::MIDI_NOTE; + break; + case kAudioUnitParameterUnit_Hertz: + d.unit = ParameterDescriptor::HZ; + break; + } - d.step = 1.0; - d.smallstep = 0.1; - d.largestep = 10.0; d.min_unbound = 0; // lower is bound d.max_unbound = 0; // upper is bound + d.update_steps(); descriptors.push_back (d); @@ -733,7 +916,7 @@ AUPlugin::maybe_fix_broken_au_id (const std::string& id) return s.str(); - err: +err: return string(); } @@ -759,7 +942,7 @@ float AUPlugin::default_value (uint32_t port) { if (port < descriptors.size()) { - return descriptors[port].default_value; + return descriptors[port].normal; } return 0; @@ -797,7 +980,8 @@ AUPlugin::set_parameter (uint32_t which, float val) theEvent.mArgument.mParameter.mElement = d.element; DEBUG_TRACE (DEBUG::AudioUnits, "notify about parameter change\n"); - AUEventListenerNotify (NULL, NULL, &theEvent); + /* Note the 1st argument, which means "Don't notify us about a change we made ourselves" */ + AUEventListenerNotify (_parameter_listener, NULL, &theEvent); Plugin::set_parameter (which, val); } @@ -904,15 +1088,18 @@ AUPlugin::configure_io (ChanCount in, ChanCount out) { AudioStreamBasicDescription streamFormat; bool was_initialized = initialized; - int32_t audio_in = in.n_audio(); int32_t audio_out = out.n_audio(); + if (audio_input_cnt > 0) { + in.set (DataType::AUDIO, audio_input_cnt); + } + 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 (); } @@ -932,50 +1119,112 @@ 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) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Output, i); + } + for (size_t i = 0; i < input_elements; ++i) { + AudioUnitReset (unit->AU(), kAudioUnitScope_Input, i); + } - if (set_input_format (streamFormat) != 0) { - return -1; + /* now assign the channels to available busses */ + uint32_t used_in = 0; + uint32_t used_out = 0; + + if (variable_inputs) { + // 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) { + 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; - - c.set (DataType::AUDIO, 1); - c.set (DataType::MIDI, 0); - if (input_channels < 0) { - warning << string_compose (_("AUPlugin: %1 input_streams() called without any format set!"), name()) << endmsg; + // force PluginIoReConfigure -- see also commit msg e38eb06 + c.set (DataType::AUDIO, 0); + c.set (DataType::MIDI, 0); } else { c.set (DataType::AUDIO, input_channels); c.set (DataType::MIDI, _has_midi_input ? 1 : 0); } - return c; } @@ -984,70 +1233,122 @@ ChanCount AUPlugin::output_streams() const { ChanCount c; - - c.set (DataType::AUDIO, 1); - c.set (DataType::MIDI, 0); - if (output_channels < 0) { - warning << string_compose (_("AUPlugin: %1 output_streams() called without any format set!"), name()) << endmsg; + // force PluginIoReConfigure - see also commit msg e38eb06 + c.set (DataType::AUDIO, 0); + c.set (DataType::MIDI, 0); } else { 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(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 >& io_configs = pinfo->cache.io_configs; - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n", + 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 0 + printf ("AU I/O Configs %s %d\n", name().c_str(), io_configs.size()); + for (vector >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) { + printf ("- I/O %d / %d\n", i->first, i->second); + } +#endif - audio_out = audio_in; + // 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 + * + * - both fields are -1 + * e.g. inChannels = -1 outChannels = -1 + * This is the default case. Any number of input and output channels, as long as the numbers match + * + * - one field is -1, the other field is positive + * e.g. inChannels = -1 outChannels = 2 + * Any number of input channels, exactly two output channels + * + * - one field is -1, the other field is -2 + * e.g. inChannels = -1 outChannels = -2 + * Any number of input channels, any number of output channels + * + * - both fields have non-negative values + * e.g. inChannels = 2 outChannels = 6 + * Exactly two input channels, exactly six output channels + * e.g. inChannels = 0 outChannels = 2 + * No input channels, exactly two output channels (such as for an instrument unit with stereo output) + * + * - both fields have negative values, neither of which is –1 or –2 + * e.g. inChannels = -4 outChannels = -8 + * Up to four input channels and up to eight output channels + */ for (vector >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) { int32_t possible_in = i->first; int32_t possible_out = i->second; - if ((possible_in == audio_in) && (possible_out == audio_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)); - - out.set (DataType::MIDI, 0); - out.set (DataType::AUDIO, 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)); - 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 >::iterator i = io_configs.begin(); i != io_configs.end(); ++i) { @@ -1063,259 +1364,224 @@ 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. - - Since Ardour can handle any configuration, - we have to somehow pick a number. - - We'll use the number of inputs - to the master bus, or 2 if there - is no master bus. - */ - boost::shared_ptr master = _session.master_out(); - if (master) { - audio_out = master->input()->n_ports().n_audio(); - } else { - 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. - - Since Ardour can handle any configuration, - we have to somehow pick a number. - - We'll use the number of inputs - to the master bus, or 2 if there - is no master bus. - */ - boost::shared_ptr master = _session.master_out(); - if (master) { - audio_out = master->input()->n_ports().n_audio(); - } else { - 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) { - break; - } + if (!found && imprecise) { + /* try harder */ + for (vector >::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 + + 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); + } + // ideally we'll also find the closest, best matching + // input configuration with minimal output penalty... + } } - if (found) { - 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; } - out.set (DataType::MIDI, 0); - out.set (DataType::AUDIO, audio_out); - - 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; } @@ -1333,101 +1599,142 @@ 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", - name(), input_channels, output_channels, _has_midi_input, - bufs.count(), bufs.available())); + /* 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 ()); + assert (outmap[DataType::AUDIO].size () > 0); + 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) Inplace: %7\n", + name(), input_channels, output_channels, _has_midi_input, + bufs.count(), bufs.available(), inplace)); /* 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 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; - - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 render flags=%2 time=%3 nframes=%4 buffers=%5\n", - name(), flags, frames_processed, nframes, buffers->mNumberBuffers)); + assert (input_maxbuf < 512); + std::bitset<512> used_outputs; + + 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 = 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 { + error << string_compose (_("AU: render error for %1, bus %2 status = %2"), 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; } @@ -1496,7 +1803,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe /* on the beat */ *outDeltaSampleOffsetToNextBeat = 0; } else { - *outDeltaSampleOffsetToNextBeat = (UInt32) + *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 } @@ -1629,6 +1936,58 @@ 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]; + 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]; + 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) { @@ -1652,27 +2011,42 @@ AUPlugin::parameter_is_audio (uint32_t) const } bool -AUPlugin::parameter_is_control (uint32_t) const +AUPlugin::parameter_is_control (uint32_t param) const { - return true; + assert(param < descriptors.size()); + if (descriptors[param].automatable) { + /* corrently ardour expects all controls to be automatable + * IOW ardour GUI elements mandate an Evoral::Parameter + * for all input+control ports. + */ + return true; + } + return false; } bool -AUPlugin::parameter_is_input (uint32_t) const +AUPlugin::parameter_is_input (uint32_t param) const { - return false; + /* AU params that are both readable and writeable, + * are listed in kAudioUnitScope_Global + */ + return (descriptors[param].scope == kAudioUnitScope_Input || descriptors[param].scope == kAudioUnitScope_Global); } bool -AUPlugin::parameter_is_output (uint32_t) const +AUPlugin::parameter_is_output (uint32_t param) const { - return false; + assert(param < descriptors.size()); + // TODO check if ardour properly handles ports + // that report is_input + is_output == true + // -> add || descriptors[param].scope == kAudioUnitScope_Global + return (descriptors[param].scope == kAudioUnitScope_Output); } void AUPlugin::add_state (XMLNode* root) const { - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (X_("C")); CFDataRef xmlData; CFPropertyListRef propertyList; @@ -1711,7 +2085,7 @@ AUPlugin::set_state(const XMLNode& node, int version) { int ret = -1; CFPropertyListRef propertyList; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (X_("C")); if (node.name() != state_node_name()) { error << _("Bad node sent to AUPlugin::set_state") << endmsg; @@ -1815,7 +2189,7 @@ AUPlugin::load_preset (PresetRecord r) } void -AUPlugin::do_remove_preset (std::string) +AUPlugin::do_remove_preset (std::string) { } @@ -1868,6 +2242,10 @@ AUPlugin::do_save_preset (string preset_name) CFRelease(propertyList); + user_preset_map[preset_name] = user_preset_path;; + + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Saving Preset to %1\n", user_preset_path)); + return string ("file:///") + user_preset_path; } @@ -1902,10 +2280,10 @@ GetDictionarySInt32Value(CFDictionaryRef inAUStateDictionary, CFStringRef inDict } static OSStatus -GetAUComponentDescriptionFromStateData(CFPropertyListRef inAUStateData, ComponentDescription * outComponentDescription) +GetAUComponentDescriptionFromStateData(CFPropertyListRef inAUStateData, ArdourDescription * outComponentDescription) { CFDictionaryRef auStateDictionary; - ComponentDescription tempDesc = {0,0,0,0,0}; + ArdourDescription tempDesc = {0,0,0,0,0}; SInt32 versionValue; Boolean gotValue; @@ -1959,16 +2337,16 @@ static bool au_preset_filter (const string& str, void* arg) include "/" in their path. */ - Plugin* p = (Plugin *) arg; - string match = p->maker(); + AUPluginInfo* p = (AUPluginInfo *) arg; + string match = p->creator; match += '/'; - match += p->name(); + match += p->name; ret = str.find (match) != string::npos; if (ret == false) { - string m = p->maker (); - string n = p->name (); + string m = p->creator; + string n = p->name; strip_whitespace_edges (m); strip_whitespace_edges (n); match = m; @@ -1982,12 +2360,12 @@ static bool au_preset_filter (const string& str, void* arg) return ret; } -bool -check_and_get_preset_name (Component component, const string& pathstr, string& preset_name) +static bool +check_and_get_preset_name (ArdourComponent component, const string& pathstr, string& preset_name) { OSStatus status; CFPropertyListRef plist; - ComponentDescription presetDesc; + ArdourDescription presetDesc; bool ret = false; plist = load_property_list (pathstr); @@ -2030,6 +2408,73 @@ check_and_get_preset_name (Component component, const string& pathstr, string& p return true; } + +static void +#ifdef COREAUDIO105 +get_names (CAComponentDescription& comp_desc, std::string& name, std::string& maker) +#else +get_names (ArdourComponent& comp, std::string& name, std::string& maker) +#endif +{ + CFStringRef itemName = NULL; + // Marc Poirier-style item name +#ifdef COREAUDIO105 + CAComponent auComponent (comp_desc); + if (auComponent.IsValid()) { + CAComponentDescription dummydesc; + Handle nameHandle = NewHandle(sizeof(void*)); + if (nameHandle != NULL) { + OSErr err = GetComponentInfo(auComponent.Comp(), &dummydesc, nameHandle, NULL, NULL); + if (err == noErr) { + ConstStr255Param nameString = (ConstStr255Param) (*nameHandle); + if (nameString != NULL) { + itemName = CFStringCreateWithPascalString(kCFAllocatorDefault, nameString, CFStringGetSystemEncoding()); + } + } + DisposeHandle(nameHandle); + } + } +#else + assert (comp); + AudioComponentCopyName (comp, &itemName); +#endif + + // if Marc-style fails, do the original way + if (itemName == NULL) { +#ifndef COREAUDIO105 + CAComponentDescription comp_desc; + AudioComponentGetDescription (comp, &comp_desc); +#endif + CFStringRef compTypeString = UTCreateStringForOSType(comp_desc.componentType); + CFStringRef compSubTypeString = UTCreateStringForOSType(comp_desc.componentSubType); + CFStringRef compManufacturerString = UTCreateStringForOSType(comp_desc.componentManufacturer); + + itemName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ - %@ - %@"), + compTypeString, compManufacturerString, compSubTypeString); + + if (compTypeString != NULL) + CFRelease(compTypeString); + if (compSubTypeString != NULL) + CFRelease(compSubTypeString); + if (compManufacturerString != NULL) + CFRelease(compManufacturerString); + } + + string str = CFStringRefToStdString(itemName); + string::size_type colon = str.find (':'); + + if (colon) { + name = str.substr (colon+1); + maker = str.substr (0, colon); + strip_whitespace_edges (maker); + strip_whitespace_edges (name); + } else { + name = str; + maker = "unknown"; + strip_whitespace_edges (name); + } +} + std::string AUPlugin::current_preset() const { @@ -2049,20 +2494,22 @@ AUPlugin::current_preset() const void AUPlugin::find_presets () { - vector* preset_files; - PathScanner scanner; + vector preset_files; user_preset_map.clear (); - preset_files = scanner (preset_search_path, au_preset_filter, this, true, true, -1, true); + PluginInfoPtr nfo = get_info(); + find_files_matching_filter (preset_files, preset_search_path, au_preset_filter, + boost::dynamic_pointer_cast (nfo).get(), + true, true, true); - if (!preset_files) { - return; + if (preset_files.empty()) { + DEBUG_TRACE (DEBUG::AudioUnits, "AU No Preset Files found for given plugin.\n"); } - for (vector::iterator x = preset_files->begin(); x != preset_files->end(); ++x) { + for (vector::iterator x = preset_files.begin(); x != preset_files.end(); ++x) { - string path = *(*x); + string path = *x; string preset_name; /* make an initial guess at the preset name using the path */ @@ -2077,17 +2524,18 @@ AUPlugin::find_presets () if (check_and_get_preset_name (get_comp()->Comp(), path, preset_name)) { user_preset_map[preset_name] = path; + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Preset File: %1 > %2\n", preset_name, path)); + } else { + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU INVALID Preset: %1 > %2\n", preset_name, path)); } - delete *x; } - delete preset_files; - /* now fill the vector with the names we have */ for (UserPresetMap::iterator i = user_preset_map.begin(); i != user_preset_map.end(); ++i) { _presets.insert (make_pair (i->second, Plugin::PresetRecord (i->second, i->first))); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Adding User Preset: %1 > %2\n", i->first, i->second)); } /* add factory presets */ @@ -2095,7 +2543,8 @@ AUPlugin::find_presets () for (FactoryPresetMap::iterator i = factory_preset_map.begin(); i != factory_preset_map.end(); ++i) { /* XXX: dubious */ string const uri = string_compose ("%1", _presets.size ()); - _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first, i->second))); + _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first, false))); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Adding Factory Preset: %1 > %2\n", i->first, i->second)); } } @@ -2109,6 +2558,7 @@ AUPlugin::has_editor () const AUPluginInfo::AUPluginInfo (boost::shared_ptr d) : descriptor (d) + , version (0) { type = ARDOUR::AudioUnit; } @@ -2146,20 +2596,111 @@ AUPluginInfo::load (Session& session) } } +std::vector +AUPluginInfo::get_presets (bool user_only) const +{ + std::vector p; + boost::shared_ptr comp; +#ifndef NO_PLUGIN_STATE + try { + comp = boost::shared_ptr(new CAComponent(*descriptor)); + if (!comp->IsValid()) { + throw failed_constructor(); + } + } catch (failed_constructor& err) { + return p; + } + + // user presets + + if (!preset_search_path_initialized) { + Glib::ustring p = Glib::get_home_dir(); + p += "/Library/Audio/Presets:"; + p += preset_search_path; + preset_search_path = p; + preset_search_path_initialized = true; + DEBUG_TRACE (DEBUG::AudioUnits, string_compose("AU Preset Path: %1\n", preset_search_path)); + } + + vector preset_files; + find_files_matching_filter (preset_files, preset_search_path, au_preset_filter, const_cast(this), true, true, true); + + for (vector::iterator x = preset_files.begin(); x != preset_files.end(); ++x) { + string path = *x; + string preset_name; + preset_name = Glib::path_get_basename (path); + preset_name = preset_name.substr (0, preset_name.find_last_of ('.')); + if (check_and_get_preset_name (comp.get()->Comp(), path, preset_name)) { + p.push_back (Plugin::PresetRecord (path, preset_name)); + } + } + + if (user_only) { + return p; + } + + // factory presets + + CFArrayRef presets; + UInt32 dataSize; + Boolean isWritable; + + boost::shared_ptr unit (new CAAudioUnit); + if (noErr != CAAudioUnit::Open (*(comp.get()), *unit)) { + return p; + } + if (noErr != unit->GetPropertyInfo (kAudioUnitProperty_FactoryPresets, kAudioUnitScope_Global, 0, &dataSize, &isWritable)) { + unit->Uninitialize (); + return p; + } + if (noErr != unit->GetProperty (kAudioUnitProperty_FactoryPresets, kAudioUnitScope_Global, 0, (void*) &presets, &dataSize)) { + unit->Uninitialize (); + return p; + } + if (!presets) { + unit->Uninitialize (); + return p; + } + + CFIndex cnt = CFArrayGetCount (presets); + for (CFIndex i = 0; i < cnt; ++i) { + AUPreset* preset = (AUPreset*) CFArrayGetValueAtIndex (presets, i); + string const uri = string_compose ("%1", i); + string name = CFStringRefToStdString (preset->presetName); + p.push_back (Plugin::PresetRecord (uri, name, false)); + } + CFRelease (presets); + unit->Uninitialize (); + +#endif // NO_PLUGIN_STATE + return p; +} + Glib::ustring AUPluginInfo::au_cache_path () { - return Glib::build_filename (ARDOUR::user_config_directory(), "au_cache"); + return Glib::build_filename (ARDOUR::user_cache_directory(), "au_cache"); } PluginInfoList* -AUPluginInfo::discover () +AUPluginInfo::discover (bool scan_only) { XMLTree tree; + /* AU require a CAComponentDescription pointer provided by the OS. + * Ardour only caches port and i/o config. It can't just 'scan' without + * 'discovering' (like we do for VST). + * + * "Scan Only" means + * "Iterate over all plugins. skip the ones where there's no io-cache". + */ + _scan_only = scan_only; + if (!Glib::file_test (au_cache_path(), Glib::FILE_TEST_EXISTS)) { ARDOUR::BootMessage (_("Discovering AudioUnit plugins (could take some time ...)")); } + // create crash log file + au_start_crashlog (); PluginInfoList* plugs = new PluginInfoList; @@ -2168,6 +2709,9 @@ AUPluginInfo::discover () discover_generators (*plugs); discover_instruments (*plugs); + // all fine if we get here + au_remove_crashlog (); + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("AU: discovered %1 plugins\n", plugs->size())); return plugs; @@ -2225,16 +2769,96 @@ AUPluginInfo::discover_instruments (PluginInfoList& plugs) discover_by_description (plugs, desc); } + +bool +AUPluginInfo::au_get_crashlog (std::string &msg) +{ + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_crashlog.txt"); + if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) { + return false; + } + std::ifstream ifs(fn.c_str()); + msg.assign ((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); + au_remove_crashlog (); + return true; +} + +void +AUPluginInfo::au_start_crashlog () +{ + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_crashlog.txt"); + assert(!_crashlog_fd); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("Creating AU Log: %1\n", fn)); + if (!(_crashlog_fd = fopen(fn.c_str(), "w"))) { + PBD::error << "Cannot create AU error-log" << fn << "\n"; + cerr << "Cannot create AU error-log" << fn << "\n"; + } +} + +void +AUPluginInfo::au_remove_crashlog () +{ + if (_crashlog_fd) { + ::fclose(_crashlog_fd); + _crashlog_fd = NULL; + } + string fn = Glib::build_filename (ARDOUR::user_cache_directory(), "au_crashlog.txt"); + ::g_unlink(fn.c_str()); + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("Remove AU Log: %1\n", fn)); +} + + +void +AUPluginInfo::au_crashlog (std::string msg) +{ + if (!_crashlog_fd) { + fprintf(stderr, "AU: %s\n", msg.c_str()); + } else { + fprintf(_crashlog_fd, "AU: %s\n", msg.c_str()); + ::fflush(_crashlog_fd); + } +} + void AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescription& desc) { - Component comp = 0; + ArdourComponent comp = 0; + au_crashlog(string_compose("Start AU discovery for Type: %1", (int)desc.componentType)); - comp = FindNextComponent (NULL, &desc); + comp = ArdourFindNext (NULL, &desc); while (comp != NULL) { CAComponentDescription temp; +#ifdef COREAUDIO105 GetComponentInfo (comp, &temp, NULL, NULL, NULL); +#else + AudioComponentGetDescription (comp, &temp); +#endif + CFStringRef itemName = NULL; + + { + if (itemName != NULL) CFRelease(itemName); + CFStringRef compTypeString = UTCreateStringForOSType(temp.componentType); + CFStringRef compSubTypeString = UTCreateStringForOSType(temp.componentSubType); + CFStringRef compManufacturerString = UTCreateStringForOSType(temp.componentManufacturer); + itemName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ - %@ - %@"), + compTypeString, compManufacturerString, compSubTypeString); + au_crashlog(string_compose("Scanning ID: %1", CFStringRefToStdString(itemName))); + if (compTypeString != NULL) + CFRelease(compTypeString); + if (compSubTypeString != NULL) + CFRelease(compSubTypeString); + if (compManufacturerString != NULL) + CFRelease(compManufacturerString); + } + + if (is_blacklisted(CFStringRefToStdString(itemName))) { + info << string_compose (_("Skipped blacklisted AU plugin %1 "), CFStringRefToStdString(itemName)) << endmsg; + comp = ArdourFindNext (comp, &desc); + continue; + } + + bool has_midi_in = false; AUPluginInfoPtr info (new AUPluginInfo (boost::shared_ptr (new CAComponentDescription(temp)))); @@ -2252,6 +2876,7 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip case kAudioUnitType_Panner: case kAudioUnitType_OfflineEffect: case kAudioUnitType_FormatConverter: + comp = ArdourFindNext (comp, &desc); continue; case kAudioUnitType_Output: @@ -2259,9 +2884,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"); @@ -2277,23 +2904,34 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip break; } - AUPluginInfo::get_names (temp, info->name, info->creator); + au_blacklist(CFStringRefToStdString(itemName)); +#ifdef COREAUDIO105 + get_names (temp, info->name, info->creator); +#else + get_names (comp, info->name, info->creator); +#endif ARDOUR::PluginScanMessage(_("AU"), info->name, false); + au_crashlog(string_compose("Plugin: %1", info->name)); 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); - if (cacomp.GetResourceVersion (info->version) != noErr) { +#ifdef COREAUDIO105 + if (cacomp.GetResourceVersion (info->version) != noErr) +#else + if (cacomp.GetVersion (info->version) != noErr) +#endif + { info->version = 0; } - if (cached_io_configuration (info->unique_id, info->version, cacomp, info->cache, info->name)) { + const int rv = cached_io_configuration (info->unique_id, info->version, cacomp, info->cache, info->name); + if (rv == 0) { /* here we have to map apple's wildcard system to a simple pair of values. in ::can_do() we use the whole system, but here we need a single pair of values. XXX probably means we should @@ -2309,13 +2947,15 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip int32_t possible_in = info->cache.io_configs.front().first; int32_t possible_out = info->cache.io_configs.front().second; - + if (possible_in > 0) { info->n_inputs.set (DataType::AUDIO, possible_in); } else { 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 { @@ -2327,15 +2967,20 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip plugs.push_back (info); - } else { + } + else if (rv == -1) { error << string_compose (_("Cannot get I/O configuration info for AU %1"), info->name) << endmsg; } - comp = FindNextComponent (comp, &desc); + au_unblacklist(CFStringRefToStdString(itemName)); + au_crashlog("Success."); + comp = ArdourFindNext (comp, &desc); + if (itemName != NULL) CFRelease(itemName); itemName = NULL; } + au_crashlog(string_compose("End AU discovery for Type: %1", (int)desc.componentType)); } -bool +int AUPluginInfo::cached_io_configuration (const std::string& unique_id, UInt32 version, CAComponent& comp, @@ -2359,7 +3004,12 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, if (cim != cached_info.end()) { cinfo = cim->second; - return true; + return 0; + } + + if (_scan_only) { + PBD::info << string_compose (_("Skipping AU %1 (not indexed. Discover new plugins to add)"), name) << endmsg; + return 1; } CAAudioUnit unit; @@ -2372,19 +3022,19 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, try { if (CAAudioUnit::Open (comp, unit) != noErr) { - return false; + return -1; } } catch (...) { warning << string_compose (_("Could not load AU plugin %1 - ignored"), name) << endmsg; - return false; + return -1; } DEBUG_TRACE (DEBUG::AudioUnits, "get AU channel info\n"); if ((ret = unit.GetChannelInfo (&channel_info, cnt)) < 0) { - return false; + return -1; } if (ret > 0) { @@ -2396,12 +3046,21 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, cinfo.io_configs.push_back (pair (-1, -1)); } else { - /* store each configuration */ - - for (uint32_t n = 0; n < cnt; ++n) { - cinfo.io_configs.push_back (pair (channel_info[n].inChannels, - channel_info[n].outChannels)); + if (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 (in, out)); + } + } else { + for (uint32_t n = 0; n < cnt; ++n) { + cinfo.io_configs.push_back (pair (channel_info[n].inChannels, + channel_info[n].outChannels)); + } } free (channel_info); @@ -2410,7 +3069,7 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id, add_cached_info (id, cinfo); save_cached_info (); - return true; + return 0; } void @@ -2559,59 +3218,6 @@ AUPluginInfo::load_cached_info () return 0; } -void -AUPluginInfo::get_names (CAComponentDescription& comp_desc, std::string& name, std::string& maker) -{ - CFStringRef itemName = NULL; - - // Marc Poirier-style item name - CAComponent auComponent (comp_desc); - if (auComponent.IsValid()) { - CAComponentDescription dummydesc; - Handle nameHandle = NewHandle(sizeof(void*)); - if (nameHandle != NULL) { - OSErr err = GetComponentInfo(auComponent.Comp(), &dummydesc, nameHandle, NULL, NULL); - if (err == noErr) { - ConstStr255Param nameString = (ConstStr255Param) (*nameHandle); - if (nameString != NULL) { - itemName = CFStringCreateWithPascalString(kCFAllocatorDefault, nameString, CFStringGetSystemEncoding()); - } - } - DisposeHandle(nameHandle); - } - } - - // if Marc-style fails, do the original way - if (itemName == NULL) { - CFStringRef compTypeString = UTCreateStringForOSType(comp_desc.componentType); - CFStringRef compSubTypeString = UTCreateStringForOSType(comp_desc.componentSubType); - CFStringRef compManufacturerString = UTCreateStringForOSType(comp_desc.componentManufacturer); - - itemName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ - %@ - %@"), - compTypeString, compManufacturerString, compSubTypeString); - - if (compTypeString != NULL) - CFRelease(compTypeString); - if (compSubTypeString != NULL) - CFRelease(compSubTypeString); - if (compManufacturerString != NULL) - CFRelease(compManufacturerString); - } - - string str = CFStringRefToStdString(itemName); - string::size_type colon = str.find (':'); - - if (colon) { - name = str.substr (colon+1); - maker = str.substr (0, colon); - strip_whitespace_edges (maker); - strip_whitespace_edges (name); - } else { - name = str; - maker = "unknown"; - strip_whitespace_edges (name); - } -} std::string AUPluginInfo::stringify_descriptor (const CAComponentDescription& desc) @@ -2633,7 +3239,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 (); } @@ -2666,7 +3272,7 @@ void AUPlugin::set_info (PluginInfoPtr info) { Plugin::set_info (info); - + AUPluginInfoPtr pinfo = boost::dynamic_pointer_cast(get_info()); _has_midi_input = pinfo->needs_midi_input (); _has_midi_output = false; @@ -2676,7 +3282,7 @@ int AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float interval_secs) { #ifdef WITH_CARBON - CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); + CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); #else CFRunLoopRef run_loop = CFRunLoopGetCurrent(); #endif @@ -2708,7 +3314,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2718,7 +3324,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2728,7 +3334,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } return 0; } @@ -2750,7 +3356,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2760,7 +3366,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2770,7 +3376,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } return 0; } @@ -2782,14 +3388,14 @@ 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) +AUPlugin::parameter_change_listener (void* /*arg*/, void* src, const AudioUnitEvent* event, UInt64 /*host_time*/, Float32 new_value) { ParameterMap::iterator i; if ((i = parameter_map.find (event->mArgument.mParameter.mParameterID)) == parameter_map.end()) { return; } - + switch (event->mEventType) { case kAudioUnitEvent_BeginParameterChangeGesture: StartTouch (i->second); @@ -2798,7 +3404,10 @@ AUPlugin::parameter_change_listener (void* /*arg*/, void* /*src*/, const AudioUn EndTouch (i->second); break; case kAudioUnitEvent_ParameterValueChange: - ParameterChanged (i->second, new_value); + /* whenever we change a parameter, we request that we are NOT notified of the change, so anytime we arrive here, it + means that something else (i.e. the plugin GUI) made the change. + */ + ParameterChangedExternally (i->second, new_value); break; default: break;