merge from 2.0-ongoing @ 3581

[ardour.git] / libs / ardour / ardour / audio_unit.h

diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index dc9a52d5d3c8d2336a0f3afe83170080a56a4cf4..497954092fcbd0a84eed493786bd912c171b8504 100644 (file)
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -100,11 +100,12 @@ class AUPlugin : public ARDOUR::Plugin
     
        bool has_editor () const;
        
-       bool fixed_io() const { return false; }
-       int32_t can_support_input_configuration (int32_t in);
-       int32_t compute_output_streams (int32_t nplugins);
-       uint32_t output_streams() const;
-       uint32_t input_streams() const;
+       bool reconfigurable_io() const { return true; }
+       bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
+       int32_t count_for_configuration (const ChanCount& in, ChanCount out) const;
+       bool configure_io (ChanCount in, ChanCount& out);
+       ChanCount output_streams() const;
+       ChanCount input_streams() const;
 
        boost::shared_ptr<CAAudioUnit> get_au () { return unit; }
        boost::shared_ptr<CAComponent> get_comp () const { return comp; }
@@ -118,18 +119,19 @@ class AUPlugin : public ARDOUR::Plugin
         boost::shared_ptr<CAComponent> comp;
         boost::shared_ptr<CAAudioUnit> unit;
 
-       AudioStreamBasicDescription streamFormat;
         bool initialized;
-        int format_set;
+       int32_t input_channels;
+       int32_t output_channels;
+       std::vector<std::pair<int,int> > io_configs;
        AudioBufferList* buffers;
        
        UInt32 global_elements;
        UInt32 output_elements;
        UInt32 input_elements;
        
-       int set_output_format ();
-       int set_input_format ();
-       int set_stream_format (int scope, uint32_t cnt);
+       int set_output_format (AudioStreamBasicDescription&);
+       int set_input_format (AudioStreamBasicDescription&);
+       int set_stream_format (int scope, uint32_t cnt, AudioStreamBasicDescription&);
         int _set_block_size (nframes_t nframes);
        void discover_parameters ();
 
@@ -142,10 +144,15 @@ class AUPlugin : public ARDOUR::Plugin
        
        std::vector<AUParameterDescriptor> descriptors;
        void init ();
+
 };
        
 typedef boost::shared_ptr<AUPlugin> AUPluginPtr;
 
+struct AUPluginCachedInfo { 
+       std::vector<std::pair<int,int> > io_configs;
+};
+
 class AUPluginInfo : public PluginInfo {
   public:      
         AUPluginInfo (boost::shared_ptr<CAComponentDescription>);
@@ -153,16 +160,29 @@ class AUPluginInfo : public PluginInfo {
 
        PluginPtr load (Session& session);
 
+       AUPluginCachedInfo cache;
+
        static PluginInfoList discover ();
        static void get_names (CAComponentDescription&, std::string& name, Glib::ustring& maker);
         static std::string stringify_descriptor (const CAComponentDescription&);
 
+       static int load_cached_info ();
+
   private:
        boost::shared_ptr<CAComponentDescription> descriptor;
+       UInt32 version;
 
        static void discover_music (PluginInfoList&);
        static void discover_fx (PluginInfoList&);
        static void discover_by_description (PluginInfoList&, CAComponentDescription&);
+       static Glib::ustring au_cache_path ();
+
+       typedef std::map<std::string,AUPluginCachedInfo> CachedInfoMap;
+       static CachedInfoMap cached_info;
+       
+       static bool cached_io_configuration (const std::string&, UInt32, CAComponent&, AUPluginCachedInfo&, const std::string& name);
+       static void add_cached_info (const std::string&, AUPluginCachedInfo&);
+       static void save_cached_info ();
 };
 
 typedef boost::shared_ptr<AUPluginInfo> AUPluginInfoPtr;