4 files changed, 28 insertions, 17 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index a356da81ca..e023979ed8 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -28,6 +28,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <map>
 
 #include "ardour/plugin.h"
 
@@ -63,13 +64,13 @@ class AUPlugin : public ARDOUR::Plugin
 	AUPlugin (const AUPlugin& other);
 	virtual ~AUPlugin ();
 	
-	std::string unique_id () const;
+        std::string unique_id () const;
 	const char * label () const;
 	const char * name () const { return _info->name.c_str(); }
 	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 ();
 
diff --git a/libs/ardour/ardour/audioanalyser.h b/libs/ardour/ardour/audioanalyser.h
index fefcd23a0e..824e63d312 100644
--- a/libs/ardour/ardour/audioanalyser.h
+++ b/libs/ardour/ardour/audioanalyser.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <ostream>
 #include <fstream>
-#include <vamp-sdk/Plugin.h>
+#include "vamp-sdk/Plugin.h"
 #include <boost/utility.hpp>
 #include "ardour/audioregion.h"
 
diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index 38cc04b977..ff70be6bb6 100644
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_chan_count_h__
 #define __ardour_chan_count_h__
 
+#include <ostream>
+
 #include "ardour/data_type.h"
 #include <cassert>
 
@@ -109,8 +111,9 @@ private:
 	uint32_t _counts[DataType::num_types];
 };
 
-
 } // namespace ARDOUR
 
+std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
+
 #endif // __ardour_chan_count_h__
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 6114cf8062..dc43e08a2d 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1054,6 +1054,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	void process_export         (nframes_t);
 	int  process_export_fw      (nframes_t);
 
+	void block_processing() { g_atomic_int_set (&processing_prohibited, 1); }
+	void unblock_processing() { g_atomic_int_set (&processing_prohibited, 0); }
+	bool processing_blocked() const { return g_atomic_int_get (&processing_prohibited); }
+
 	/* slave tracking */
 
 	static const int delta_accumulator_size = 25;