Optimize Plugin connect & run API, use const maps

[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 20bf2c849a6cb59dab15d16fd39bcbade1e48fda..3a01349dd36887e7e771a93b3cc23b8cc424c8ae 100644 (file)
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -70,7 +70,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
        const char * maker () const { return _info->creator.c_str(); }
        uint32_t parameter_count () const;
        float default_value (uint32_t port);
-       framecnt_t signal_latency() const;
+       samplecnt_t signal_latency() const;
        void set_parameter (uint32_t which, float val);
        float get_parameter (uint32_t which) const;
 
@@ -84,8 +84,9 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
        int set_block_size (pframes_t nframes);
 
        int connect_and_run (BufferSet& bufs,
-                            ChanMapping in, ChanMapping out,
-                            pframes_t nframes, framecnt_t offset);
+                       samplepos_t start, samplepos_t end, double speed,
+                       ChanMapping const& in, ChanMapping const& out,
+                       pframes_t nframes, samplecnt_t offset);
        std::set<Evoral::Parameter> automatable() const;
        std::string describe_parameter (Evoral::Parameter);
        IOPortDescription describe_io_port (DataType dt, bool input, uint32_t id) const;
@@ -122,7 +123,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
        OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags,
                                 const AudioTimeStamp       *inTimeStamp,
                                 UInt32                      inBusNumber,
-                                UInt32                      inNumberFrames,
+                                UInt32                      inNumberSamples,
                                 AudioBufferList*            ioData);
 
        /* "host" callbacks */
@@ -169,8 +170,8 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
        int32_t input_channels;
        int32_t output_channels;
        std::vector<std::pair<int,int> > io_configs;
-       pframes_t _current_block_size;
-       framecnt_t _last_nframes;
+       samplecnt_t _last_nframes;
+       mutable volatile guint _current_latency;
        bool _requires_fixed_size_buffers;
        AudioBufferList* buffers;
        bool _has_midi_input;
@@ -212,11 +213,11 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
        typedef std::map<uint32_t, uint32_t> ParameterMap;
        ParameterMap parameter_map;
        uint32_t   input_maxbuf;
-       framecnt_t input_offset;
-       framecnt_t cb_offset;
+       samplecnt_t input_offset;
+       samplecnt_t *cb_offsets;
        BufferSet* input_buffers;
        ChanMapping * input_map;
-       framecnt_t frames_processed;
+       samplecnt_t samples_processed;
        uint32_t   audio_input_cnt;
 
        std::vector<AUParameterDescriptor> descriptors;
@@ -226,8 +227,9 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 
        void discover_factory_presets ();
 
-       bool      last_transport_rolling;
-       float     last_transport_speed;
+       samplepos_t transport_sample;
+       float      transport_speed;
+       float      last_transport_speed;
 
        static void _parameter_change_listener (void* /*arg*/, void* /*src*/, const AudioUnitEvent* event, UInt64 host_time, Float32 new_value);
        void parameter_change_listener (void* /*arg*/, void* /*src*/, const AudioUnitEvent* event, UInt64 host_time, Float32 new_value);
@@ -249,15 +251,19 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo {
        std::vector<Plugin::PresetRecord> get_presets (bool user_only) const;
 
        bool needs_midi_input () const;
-       bool is_effect () const;
        bool is_effect_without_midi_input () const;
        bool is_effect_with_midi_input () const;
+
+       /* note: AU's have an explicit way to prompt for instrument/fx category */
+       bool is_effect () const;
        bool is_instrument () const;
+       bool is_utility () const;
 
        AUPluginCachedInfo cache;
 
        bool reconfigurable_io() const { return true; }
 
+       static void clear_cache ();
        static PluginInfoList* discover (bool scan_only);
        static bool au_get_crashlog (std::string &msg);
        static std::string stringify_descriptor (const CAComponentDescription&);