part 2 of 3 of the 2.8 -> 3.0 merge

[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 497954092fcbd0a84eed493786bd912c171b8504..e023979ed8bdf8410c326491c39de399a7ed1722 100644 (file)
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -28,8 +28,9 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <map>
 
-#include <ardour/plugin.h>
+#include "ardour/plugin.h"
 
 #include <AudioUnit/AudioUnit.h>
 #include <appleutility/AUParamInfo.h>
@@ -69,7 +70,7 @@ class AUPlugin : public ARDOUR::Plugin
        const char * maker () const { return _info->creator.c_str(); }
        uint32_t parameter_count () const;
        float default_value (uint32_t port);
-       nframes_t signal_latency () const;
+       nframes_t latency () const;
        void set_parameter (uint32_t which, float val);
        float get_parameter (uint32_t which) const;
     
@@ -79,8 +80,7 @@ class AUPlugin : public ARDOUR::Plugin
        void deactivate ();
        void set_block_size (nframes_t nframes);
     
-       int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
-       
+       int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset);
        std::set<uint32_t> automatable() const;
        string describe_parameter (uint32_t);
        string state_node_name () const { return "audiounit"; }
@@ -97,15 +97,14 @@ class AUPlugin : public ARDOUR::Plugin
        bool save_preset (string name);
        bool load_preset (const string preset_label);
        std::vector<std::string> get_presets ();
-    
+       std::string current_preset() const;
+
        bool has_editor () 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;
+       int32_t can_do (int32_t in, int32_t& out);
+       uint32_t output_streams() const;
+       uint32_t input_streams() const;
+       int32_t configure_io (int32_t in, int32_t out);
 
        boost::shared_ptr<CAAudioUnit> get_au () { return unit; }
        boost::shared_ptr<CAComponent> get_comp () const { return comp; }
@@ -118,13 +117,18 @@ class AUPlugin : public ARDOUR::Plugin
   private:
         boost::shared_ptr<CAComponent> comp;
         boost::shared_ptr<CAAudioUnit> unit;
-
+       
         bool initialized;
        int32_t input_channels;
        int32_t output_channels;
        std::vector<std::pair<int,int> > io_configs;
        AudioBufferList* buffers;
-       
+
+       /* XXX this should really be shared across all AUPlugin instances */
+
+       typedef std::map<std::string,std::string> PresetMap;
+       PresetMap preset_map;
+
        UInt32 global_elements;
        UInt32 output_elements;
        UInt32 input_elements;
@@ -144,7 +148,6 @@ class AUPlugin : public ARDOUR::Plugin
        
        std::vector<AUParameterDescriptor> descriptors;
        void init ();
-
 };
        
 typedef boost::shared_ptr<AUPlugin> AUPluginPtr;
@@ -171,9 +174,10 @@ class AUPluginInfo : public PluginInfo {
   private:
        boost::shared_ptr<CAComponentDescription> descriptor;
        UInt32 version;
-
+       
        static void discover_music (PluginInfoList&);
        static void discover_fx (PluginInfoList&);
+       static void discover_generators (PluginInfoList&);
        static void discover_by_description (PluginInfoList&, CAComponentDescription&);
        static Glib::ustring au_cache_path ();