X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_unit.h;h=448584251c31f010efa9a69b8cbcd64eab918829;hb=71a90399fe8561310b848fbfb8d28a65a395a6c1;hp=8233e208d34a59ccd4feb9cd60e212117c009fad;hpb=8c9749e42faf7808034ed8b7afce4a2fe6dc6f33;p=ardour.git

diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index 8233e208d3..448584251c 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -34,7 +34,7 @@
 
 #include <AudioUnit/AudioUnit.h>
 #include <AudioUnit/AudioUnitProperties.h>
-#include "appleutility/AUParamInfo.h"
+#include "AUParamInfo.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -48,14 +48,13 @@ namespace ARDOUR {
 class AudioEngine;
 class Session;
 
-struct LIBARDOUR_API AUParameterDescriptor : public Plugin::ParameterDescriptor {
+struct LIBARDOUR_API AUParameterDescriptor : public ParameterDescriptor {
 	// additional fields to make operations more efficient
 	AudioUnitParameterID id;
 	AudioUnitScope scope;
 	AudioUnitElement element;
-	float default_value;
 	bool automatable;
-	AudioUnitParameterUnit unit;
+	AudioUnitParameterUnit au_unit;
 };
 
 class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
@@ -75,6 +74,8 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 	void set_parameter (uint32_t which, float val);
 	float get_parameter (uint32_t which) const;
 
+	PluginOutputConfiguration possible_output () const { return _output_configs; }
+
 	int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
 	uint32_t nth_parameter (uint32_t which, bool& ok) const;
 	void activate ();
@@ -87,6 +88,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 			     pframes_t nframes, framecnt_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;
 	std::string state_node_name () const { return "audiounit"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
 
@@ -94,7 +96,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 	bool parameter_is_control (uint32_t) const;
 	bool parameter_is_input (uint32_t) const;
 	bool parameter_is_output (uint32_t) const;
-	
+
 	void set_info (PluginInfoPtr);
 
 	int set_state(const XMLNode& node, int);
@@ -104,7 +106,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 
 	bool has_editor () const;
 
-	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
+	bool can_support_io_configuration (const ChanCount& in, ChanCount& out, ChanCount* imprecise);
 	ChanCount output_streams() const;
 	ChanCount input_streams() const;
 	bool configure_io (ChanCount in, ChanCount out);
@@ -173,6 +175,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 	AudioBufferList* buffers;
 	bool _has_midi_input;
 	bool _has_midi_output;
+	PluginOutputConfiguration _output_configs;
 
 	/* despite all the cool work that apple did on their AU preset
 	   system, they left factory presets and user presets as two
@@ -191,9 +194,18 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 	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&);
+	bool variable_inputs;
+	bool variable_outputs;
+
+	uint32_t configured_input_busses;
+	uint32_t configured_output_busses;
+
+	uint32_t *bus_inputs;
+	uint32_t *bus_outputs;
+	std::vector <std::string> _bus_name_in;
+	std::vector <std::string> _bus_name_out;
+
+	int set_stream_format (int scope, uint32_t bus, AudioStreamBasicDescription&);
 	void discover_parameters ();
 	void add_state (XMLNode *) const;
 
@@ -201,9 +213,11 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
 	ParameterMap parameter_map;
 	uint32_t   input_maxbuf;
 	framecnt_t input_offset;
-	framecnt_t cb_offset;
+	framecnt_t *cb_offsets;
 	BufferSet* input_buffers;
+	ChanMapping * input_map;
 	framecnt_t frames_processed;
+	uint32_t   audio_input_cnt;
 
 	std::vector<AUParameterDescriptor> descriptors;
 	AUEventListenerRef _parameter_listener;
@@ -232,7 +246,9 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo {
 
 	PluginPtr load (Session& session);
 
-	bool needs_midi_input ();
+	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;
@@ -242,8 +258,9 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo {
 
 	bool reconfigurable_io() const { return true; }
 
-	static PluginInfoList* discover ();
-	static void get_names (CAComponentDescription&, std::string& name, std::string& maker);
+	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&);
 
 	static int load_cached_info ();
@@ -251,6 +268,12 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo {
   private:
 	boost::shared_ptr<CAComponentDescription> descriptor;
 	UInt32 version;
+	static FILE * _crashlog_fd;
+	static bool _scan_only;
+
+	static void au_start_crashlog (void);
+	static void au_remove_crashlog (void);
+	static void au_crashlog (std::string);
 
 	static void discover_music (PluginInfoList&);
 	static void discover_fx (PluginInfoList&);
@@ -262,7 +285,7 @@ class LIBARDOUR_API AUPluginInfo : public PluginInfo {
 	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 int 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 ();
 };