make ardour3 build and link on OS X (tiger, at least)

git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 94 insertions, 52 deletions

diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index 3ec17cda59..4d12df9bcf 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis
+    Copyright (C) 2006 Paul Davis 
     Written by Taybin Rutkin
 
     This program is free software; you can redistribute it and/or modify
@@ -30,14 +30,14 @@
 #include <vector>
 #include <map>
 
+#include "ardour/plugin.h"
+
 #include <AudioUnit/AudioUnit.h>
-#include <appleutility/AUParamInfo.h>
+#include <AudioUnit/AudioUnitProperties.h>
+#include "appleutility/AUParamInfo.h"
 
 #include <boost/shared_ptr.hpp>
 
-#include "ardour/plugin.h"
-#include "ardour/chan_mapping.h"
-
 class CAComponent;
 class CAAudioUnit;
 class CAComponentDescription;
@@ -64,102 +64,144 @@ class AUPlugin : public ARDOUR::Plugin
 	AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr<CAComponent> comp);
 	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 latency () const;
+	nframes_t signal_latency() const;
 	void set_parameter (uint32_t which, float val);
 	float get_parameter (uint32_t which) const;
-
+    
 	int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
 	uint32_t nth_parameter (uint32_t which, bool& ok) const;
 	void activate ();
 	void deactivate ();
-	void set_block_size (nframes_t nframes);
-
-	int connect_and_run (std::vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset);
-	std::set<uint32_t> automatable() const;
-	std::string describe_parameter (uint32_t);
+	void flush ();
+	int set_block_size (nframes_t nframes);
+    
+	int connect_and_run (BufferSet& bufs,
+			     ChanMapping in, ChanMapping out,
+			     nframes_t nframes, nframes_t offset);
+	std::set<Evoral::Parameter> automatable() const;
+	std::string describe_parameter (Evoral::Parameter);
 	std::string state_node_name () const { return "audiounit"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
-
+    
 	bool parameter_is_audio (uint32_t) const;
 	bool parameter_is_control (uint32_t) const;
 	bool parameter_is_input (uint32_t) const;
 	bool parameter_is_output (uint32_t) const;
-
+    
 	XMLNode& get_state();
-	int set_state(const XMLNode& node);
-
+	int set_state(const XMLNode& node, int);
+	
 	bool save_preset (std::string name);
 	bool load_preset (const std::string& preset_label);
-	std::vector<std::string> get_presets ();
+	std::vector<PresetRecord> 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;
+	bool configure_io (ChanCount in, ChanCount out);
+	bool requires_fixed_size_buffers() const;
 
-	int32_t can_do (int32_t in, int32_t& out);
-	ChanCount output_streams() const;
-	ChanCount input_streams() const;
-	int32_t configure_io (int32_t in, int32_t out);
+	void set_fixed_size_buffers (bool yn) { 
+		_requires_fixed_size_buffers = yn;
+	}
 
 	boost::shared_ptr<CAAudioUnit> get_au () { return unit; }
 	boost::shared_ptr<CAComponent> get_comp () const { return comp; }
+    
+        OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags,
+				 const AudioTimeStamp    *inTimeStamp,
+				 UInt32       inBusNumber,
+				 UInt32       inNumberFrames,
+				 AudioBufferList*       ioData);
 
-	OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags,
-			const AudioTimeStamp *inTimeStamp,
-			UInt32                inBusNumber,
-			UInt32                inNumberFrames,
-			AudioBufferList*      ioData);
-  private:
-	boost::shared_ptr<CAComponent> comp;
-	boost::shared_ptr<CAAudioUnit> unit;
+	/* "host" callbacks */
+
+	OSStatus get_beat_and_tempo_callback (Float64* outCurrentBeat, 
+					      Float64* outCurrentTempo);
+
+	OSStatus get_musical_time_location_callback (UInt32*  outDeltaSampleOffsetToNextBeat,
+						     Float32*  outTimeSig_Numerator,
+						     UInt32*   outTimeSig_Denominator,
+						     Float64*  outCurrentMeasureDownBeat);
 
-	bool initialized;
-	ChanCount input_channels;
-	ChanCount output_channels;
+	OSStatus get_transport_state_callback (Boolean*  outIsPlaying,
+					       Boolean*  outTransportStateChanged,
+					       Float64*  outCurrentSampleInTimeLine,
+					       Boolean*  outIsCycling,
+					       Float64*  outCycleStartBeat,
+					       Float64*  outCycleEndBeat);
+
+	static std::string maybe_fix_broken_au_id (const std::string&);
+
+  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;
+	nframes_t _current_block_size;
+	nframes_t _last_nframes;
+	bool _requires_fixed_size_buffers;
 	AudioBufferList* buffers;
 
-	/* XXX this should really be shared across all AUPlugin instances */
+	/* despite all the cool work that apple did on their AU preset
+	   system, they left factory presets and user presets as two
+	   entirely different kinds of things, handled by two entirely
+	   different parts of the API. Resolve this.
+	*/
 
-	typedef std::map<std::string,std::string> PresetMap;
-	PresetMap preset_map;
+	/* XXX these two maps should really be shared across all instances of this AUPlugin */
+
+	typedef std::map<std::string,std::string> UserPresetMap;
+	UserPresetMap user_preset_map;
+	typedef std::map<std::string,int> FactoryPresetMap;
+	FactoryPresetMap factory_preset_map;
 
 	UInt32 global_elements;
 	UInt32 output_elements;
 	UInt32 input_elements;
-
+	
 	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 ();
 
 	std::vector<std::pair<uint32_t, uint32_t> > parameter_map;
 	uint32_t current_maxbuf;
-	nframes_t current_offset;
-	nframes_t cb_offset;
-	std::vector<Sample*>* current_buffers;
-	nframes_t frames_processed;
-
+        nframes_t current_offset;
+        nframes_t cb_offset;
+        BufferSet* current_buffers;
+        nframes_t frames_processed;
+	
 	std::vector<AUParameterDescriptor> descriptors;
 	void init ();
-};
 
+	void discover_factory_presets ();
+
+	bool      last_transport_rolling;
+	float     last_transport_speed;
+};
+	
 typedef boost::shared_ptr<AUPlugin> AUPluginPtr;
 
-struct AUPluginCachedInfo {
+struct AUPluginCachedInfo { 
 	std::vector<std::pair<int,int> > io_configs;
 };
 
 class AUPluginInfo : public PluginInfo {
-  public:
-	AUPluginInfo (boost::shared_ptr<CAComponentDescription>);
+  public:	
+	 AUPluginInfo (boost::shared_ptr<CAComponentDescription>);
 	~AUPluginInfo ();
 
 	PluginPtr load (Session& session);
@@ -175,19 +217,19 @@ 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 std::string au_cache_path ();
+	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 ();
+	static void save_cached_info ();	
 };
 
 typedef boost::shared_ptr<AUPluginInfo> AUPluginInfoPtr;