tentative changes to extend port engine shared impl to coreaudio

3 files changed, 73 insertions, 464 deletions

diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h
index a2d32ba4fd..bc4370e6c9 100644
--- a/libs/backends/alsa/alsa_audiobackend.h
+++ b/libs/backends/alsa/alsa_audiobackend.h
@@ -182,34 +182,6 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl
 
 		bool can_set_systemic_midi_latencies () const { return true; }
 
-	/* PortEngine API - forwarded to PortEngineSharedImpl */
-
-	bool        port_is_physical (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_is_physical (ph); }
-	void        get_physical_outputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_outputs (type, results); }
-	void        get_physical_inputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_inputs (type, results); }
-	ChanCount   n_physical_outputs () const { return PortEngineSharedImpl::n_physical_outputs (); }
-	ChanCount   n_physical_inputs () const { return PortEngineSharedImpl::n_physical_inputs (); }
-	uint32_t    port_name_size () const { return PortEngineSharedImpl::port_name_size(); }
-	int         set_port_name (PortEngine::PortHandle ph, const std::string& name) { return PortEngineSharedImpl::set_port_name (ph, name); }
-	std::string get_port_name (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_name (ph); }
-	PortFlags   get_port_flags (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_flags (ph); }
-	PortEngine::PortHandle  get_port_by_name (std::string const & name) const { return PortEngineSharedImpl::get_port_by_name (name); }
-	int         get_port_property (PortEngine::PortHandle ph, const std::string& key, std::string& value, std::string& type) const { return PortEngineSharedImpl::get_port_property (ph, key, value, type); }
-	int         set_port_property (PortEngine::PortHandle ph, const std::string& key, const std::string& value, const std::string& type) { return PortEngineSharedImpl::set_port_property (ph, key, value, type); }
-	int         get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>& results) const { return PortEngineSharedImpl::get_ports (port_name_pattern, type, flags, results); }
-	DataType    port_data_type (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_data_type (ph); }
-	PortEngine::PortHandle register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags) { return PortEngineSharedImpl::register_port (shortname, type, flags); }
-	void        unregister_port (PortHandle ph) { if (!_run) return; PortEngineSharedImpl::unregister_port (ph); }
-	int         connect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::connect (src, dst); }
-	int         disconnect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::disconnect (src, dst); }
-	int         connect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::connect (ph, other); }
-	int         disconnect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::disconnect (ph, other); }
-	int         disconnect_all (PortEngine::PortHandle ph) { return PortEngineSharedImpl::disconnect_all (ph); }
-	bool        connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::connected (ph, process_callback_safe); }
-	bool        connected_to (PortEngine::PortHandle ph, const std::string& other, bool process_callback_safe) { return PortEngineSharedImpl::connected_to (ph, other, process_callback_safe); }
-	bool        physically_connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::physically_connected (ph, process_callback_safe); }
-	int         get_connections (PortEngine::PortHandle ph, std::vector<std::string>& results, bool process_callback_safe) { return PortEngineSharedImpl::get_connections (ph, results, process_callback_safe); }
-
 		/* External control app */
 		std::string control_app_name () const { return std::string (); }
 		void launch_control_app () {}
@@ -249,6 +221,34 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl
 		void* private_handle () const;
 		const std::string& my_name () const;
 
+	/* PortEngine API - forwarded to PortEngineSharedImpl */
+
+	bool        port_is_physical (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_is_physical (ph); }
+	void        get_physical_outputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_outputs (type, results); }
+	void        get_physical_inputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_inputs (type, results); }
+	ChanCount   n_physical_outputs () const { return PortEngineSharedImpl::n_physical_outputs (); }
+	ChanCount   n_physical_inputs () const { return PortEngineSharedImpl::n_physical_inputs (); }
+	uint32_t    port_name_size () const { return PortEngineSharedImpl::port_name_size(); }
+	int         set_port_name (PortEngine::PortHandle ph, const std::string& name) { return PortEngineSharedImpl::set_port_name (ph, name); }
+	std::string get_port_name (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_name (ph); }
+	PortFlags   get_port_flags (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_flags (ph); }
+	PortEngine::PortHandle  get_port_by_name (std::string const & name) const { return PortEngineSharedImpl::get_port_by_name (name); }
+	int         get_port_property (PortEngine::PortHandle ph, const std::string& key, std::string& value, std::string& type) const { return PortEngineSharedImpl::get_port_property (ph, key, value, type); }
+	int         set_port_property (PortEngine::PortHandle ph, const std::string& key, const std::string& value, const std::string& type) { return PortEngineSharedImpl::set_port_property (ph, key, value, type); }
+	int         get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>& results) const { return PortEngineSharedImpl::get_ports (port_name_pattern, type, flags, results); }
+	DataType    port_data_type (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_data_type (ph); }
+	PortEngine::PortHandle register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags) { return PortEngineSharedImpl::register_port (shortname, type, flags); }
+	void        unregister_port (PortHandle ph) { if (!_run) return; PortEngineSharedImpl::unregister_port (ph); }
+	int         connect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::connect (src, dst); }
+	int         disconnect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::disconnect (src, dst); }
+	int         connect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::connect (ph, other); }
+	int         disconnect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::disconnect (ph, other); }
+	int         disconnect_all (PortEngine::PortHandle ph) { return PortEngineSharedImpl::disconnect_all (ph); }
+	bool        connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::connected (ph, process_callback_safe); }
+	bool        connected_to (PortEngine::PortHandle ph, const std::string& other, bool process_callback_safe) { return PortEngineSharedImpl::connected_to (ph, other, process_callback_safe); }
+	bool        physically_connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::physically_connected (ph, process_callback_safe); }
+	int         get_connections (PortEngine::PortHandle ph, std::vector<std::string>& results, bool process_callback_safe) { return PortEngineSharedImpl::get_connections (ph, results, process_callback_safe); }
+
 	/* MIDI */
 		int midi_event_get (pframes_t& timestamp, size_t& size, uint8_t const** buf, void* port_buffer, uint32_t event_index);
 		int midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size);
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index 13d739ebf6..8001a095bc 100644
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -936,194 +936,6 @@ CoreAudioBackend::my_name () const
 	return _instance_name;
 }
 
-uint32_t
-CoreAudioBackend::port_name_size () const
-{
-	return 256;
-}
-
-int
-CoreAudioBackend::set_port_name (PortEngine::PortHandle port, const std::string& name)
-{
-	std::string newname (_instance_name + ":" + name);
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::set_port_name: Invalid Port(s)") << endmsg;
-		return -1;
-	}
-	if (find_port (newname)) {
-		PBD::error << _("CoreAudioBackend::set_port_name: Port with given name already exists") << endmsg;
-		return -1;
-	}
-
-	CoreBackendPort* p = static_cast<CoreBackendPort*>(port);
-	pthread_mutex_lock (&_port_registration_mutex);
-	_portmap.erase (p->name());
-	_portmap.insert (make_pair (newname, p));
-	pthread_mutex_unlock (&_port_registration_mutex);
-	return p->set_name (newname);
-}
-
-std::string
-CoreAudioBackend::get_port_name (PortEngine::PortHandle port) const
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::get_port_name: Invalid Port(s)") << endmsg;
-		return std::string ();
-	}
-	return static_cast<CoreBackendPort*>(port)->name ();
-}
-
-PortFlags
-CoreAudioBackend::get_port_flags (PortEngine::PortHandle port) const
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::get_port_flags: Invalid Port(s)") << endmsg;
-		return PortFlags (0);
-	}
-	return static_cast<CoreBackendPort*>(port)->flags ();
-}
-
-int
-CoreAudioBackend::get_port_property (PortHandle port, const std::string& key, std::string& value, std::string& type) const
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::get_port_property: Invalid Port(s)") << endmsg;
-		return -1;
-	}
-	if (key == "http://jackaudio.org/metadata/pretty-name") {
-		type = "";
-		value = static_cast<CoreBackendPort*>(port)->pretty_name ();
-		if (!value.empty()) {
-			return 0;
-		}
-	}
-	return -1;
-}
-
-int
-CoreAudioBackend::set_port_property (PortHandle port, const std::string& key, const std::string& value, const std::string& type)
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::set_port_property: Invalid Port(s)") << endmsg;
-		return -1;
-	}
-	if (key == "http://jackaudio.org/metadata/pretty-name" && type.empty ()) {
-		static_cast<CoreBackendPort*>(port)->set_pretty_name (value);
-		return 0;
-	}
-	return -1;
-}
-
-PortEngine::PortHandle
-CoreAudioBackend::get_port_by_name (const std::string& name) const
-{
-	PortHandle port = (PortHandle) find_port (name);
-	return port;
-}
-
-int
-CoreAudioBackend::get_ports (
-	const std::string& port_name_pattern,
-	DataType type, PortFlags flags,
-	std::vector<std::string>& port_names) const
-{
-	int rv = 0;
-	regex_t port_regex;
-	bool use_regexp = false;
-	if (port_name_pattern.size () > 0) {
-		if (!regcomp (&port_regex, port_name_pattern.c_str (), REG_EXTENDED|REG_NOSUB)) {
-			use_regexp = true;
-		}
-	}
-
-	for (PortIndex::const_iterator i = _ports.begin (); i != _ports.end (); ++i) {
-		CoreBackendPort* port = *i;
-		if ((port->type () == type) && flags == (port->flags () & flags)) {
-			if (!use_regexp || !regexec (&port_regex, port->name ().c_str (), 0, NULL, 0)) {
-				port_names.push_back (port->name ());
-				++rv;
-			}
-		}
-	}
-	if (use_regexp) {
-		regfree (&port_regex);
-	}
-	return rv;
-}
-
-DataType
-CoreAudioBackend::port_data_type (PortEngine::PortHandle port) const
-{
-	if (!valid_port (port)) {
-		return DataType::NIL;
-	}
-	return static_cast<CoreBackendPort*>(port)->type ();
-}
-
-PortEngine::PortHandle
-CoreAudioBackend::register_port (
-	const std::string& name,
-	ARDOUR::DataType type,
-	ARDOUR::PortFlags flags)
-{
-	if (name.size () == 0) { return 0; }
-	if (flags & IsPhysical) { return 0; }
-	return add_port (_instance_name + ":" + name, type, flags);
-}
-
-PortEngine::PortHandle
-CoreAudioBackend::add_port (
-	const std::string& name,
-	ARDOUR::DataType type,
-	ARDOUR::PortFlags flags)
-{
-	assert(name.size ());
-	if (find_port (name)) {
-		PBD::warning << _("CoreAudioBackend::register_port: Port already exists:")
-		             << " (" << name << ")" << endmsg;
-		return 0;
-	}
-	CoreBackendPort* port = NULL;
-	switch (type) {
-	case DataType::AUDIO:
-		port = new CoreAudioPort (*this, name, flags);
-		break;
-	case DataType::MIDI:
-		port = new CoreMidiPort (*this, name, flags);
-		break;
-	default:
-		PBD::error << _("CoreAudioBackend::register_port: Invalid Data Type.") << endmsg;
-		return 0;
-	}
-
-	pthread_mutex_lock (&_port_registration_mutex);
-	_ports.insert (port);
-	_portmap.insert (make_pair (name, port));
-	pthread_mutex_unlock (&_port_registration_mutex);
-
-	return port;
-}
-
-void
-CoreAudioBackend::unregister_port (PortEngine::PortHandle port_handle)
-{
-	if (!_run) {
-		return;
-	}
-	CoreBackendPort* port = static_cast<CoreBackendPort*>(port_handle);
-	PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast<CoreBackendPort*>(port_handle));
-	if (i == _ports.end ()) {
-		PBD::warning << _("CoreAudioBackend::unregister_port: Failed to find port") << endmsg;
-		return;
-	}
-	disconnect_all(port_handle);
-	pthread_mutex_lock (&_port_registration_mutex);
-	_portmap.erase (port->name());
-	_ports.erase (i);
-	pthread_mutex_unlock (&_port_registration_mutex);
-	delete port;
-}
-
 int
 CoreAudioBackend::register_system_audio_ports()
 {
@@ -1287,146 +1099,24 @@ CoreAudioBackend::coremidi_rediscover()
 	pthread_mutex_unlock (&_process_callback_mutex);
 }
 
-void
-CoreAudioBackend::unregister_ports (bool system_only)
-{
-	_system_inputs.clear();
-	_system_outputs.clear();
-	_system_midi_in.clear();
-	_system_midi_out.clear();
-
-	for (PortIndex::iterator i = _ports.begin (); i != _ports.end ();) {
-		PortIndex::iterator cur = i++;
-		CoreBackendPort* port = *cur;
-		if (! system_only || (port->is_physical () && port->is_terminal ())) {
-			port->disconnect_all ();
-			_portmap.erase (port->name());
-			delete port;
-			_ports.erase (cur);
-		}
-	}
-}
-
-int
-CoreAudioBackend::connect (const std::string& src, const std::string& dst)
-{
-	CoreBackendPort* src_port = find_port (src);
-	CoreBackendPort* dst_port = find_port (dst);
-
-	if (!src_port) {
-		PBD::warning << _("CoreAudioBackend::connect: Invalid Source port:")
-		             << " (" << src <<")" << endmsg;
-		return -1;
-	}
-	if (!dst_port) {
-		PBD::warning << _("CoreAudioBackend::connect: Invalid Destination port:")
-		             << " (" << dst <<")" << endmsg;
-		return -1;
-	}
-	return src_port->connect (dst_port);
-}
-
-int
-CoreAudioBackend::disconnect (const std::string& src, const std::string& dst)
-{
-	CoreBackendPort* src_port = find_port (src);
-	CoreBackendPort* dst_port = find_port (dst);
-
-	if (!src_port || !dst_port) {
-		PBD::warning << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
-		return -1;
-	}
-	return src_port->disconnect (dst_port);
-}
-
-int
-CoreAudioBackend::connect (PortEngine::PortHandle src, const std::string& dst)
-{
-	CoreBackendPort* dst_port = find_port (dst);
-	if (!valid_port (src)) {
-		PBD::warning << _("CoreAudioBackend::connect: Invalid Source Port Handle") << endmsg;
-		return -1;
-	}
-	if (!dst_port) {
-		PBD::warning << _("CoreAudioBackend::connect: Invalid Destination Port")
-		             << " (" << dst << ")" << endmsg;
-		return -1;
-	}
-	return static_cast<CoreBackendPort*>(src)->connect (dst_port);
-}
-
-int
-CoreAudioBackend::disconnect (PortEngine::PortHandle src, const std::string& dst)
-{
-	CoreBackendPort* dst_port = find_port (dst);
-	if (!valid_port (src) || !dst_port) {
-		PBD::warning << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
-		return -1;
-	}
-	return static_cast<CoreBackendPort*>(src)->disconnect (dst_port);
-}
-
-int
-CoreAudioBackend::disconnect_all (PortEngine::PortHandle port)
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
-		return -1;
-	}
-	static_cast<CoreBackendPort*>(port)->disconnect_all ();
-	return 0;
-}
-
-bool
-CoreAudioBackend::connected (PortEngine::PortHandle port, bool /* process_callback_safe*/)
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
-		return false;
-	}
-	return static_cast<CoreBackendPort*>(port)->is_connected ();
-}
-
-bool
-CoreAudioBackend::connected_to (PortEngine::PortHandle src, const std::string& dst, bool /*process_callback_safe*/)
-{
-	CoreBackendPort* dst_port = find_port (dst);
-#ifndef NDEBUG
-	if (!valid_port (src) || !dst_port) {
-		PBD::warning << _("CoreAudioBackend::connected_to: Invalid Port") << endmsg;
-		return false;
-	}
-#endif
-	return static_cast<CoreBackendPort*>(src)->is_connected (dst_port);
-}
-
-bool
-CoreAudioBackend::physically_connected (PortEngine::PortHandle port, bool /*process_callback_safe*/)
-{
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::physically_connected: Invalid Port") << endmsg;
-		return false;
-	}
-	return static_cast<CoreBackendPort*>(port)->is_physically_connected ();
-}
-
-int
-CoreAudioBackend::get_connections (PortEngine::PortHandle port, std::vector<std::string>& names, bool /*process_callback_safe*/)
+BackendPort*
+CoreAudioBackend::port_factory (std::string const & name, ARDOUR::DataType type, ARDOUR::PortFlags flags)
 {
-	if (!valid_port (port)) {
-		PBD::warning << _("CoreAudioBackend::get_connections: Invalid Port") << endmsg;
-		return -1;
-	}
+	BackendPort* port = 0;
 
-	assert (0 == names.size ());
-
-	const std::set<CoreBackendPort*>& connected_ports = static_cast<CoreBackendPort*>(port)->get_connections ();
-
-	for (std::set<CoreBackendPort*>::const_iterator i = connected_ports.begin (); i != connected_ports.end (); ++i) {
-		names.push_back ((*i)->name ());
+	switch (type) {
+		case DataType::AUDIO:
+			port = new CoreAudioPort (*this, name, flags);
+			break;
+		case DataType::MIDI:
+			port = new CoreMidiPort (*this, name, flags);
+			break;
+		default:
+			PBD::error << string_compose (_("%1::register_port: Invalid Data Type."), _instance_name) << endmsg;
+			return 0;
 	}
 
-	return (int)names.size ();
+	return port;
 }
 
 /* MIDI */
diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h
index f2507d8c3d..f49822a2b5 100644
--- a/libs/backends/coreaudio/coreaudio_backend.h
+++ b/libs/backends/coreaudio/coreaudio_backend.h
@@ -33,6 +33,7 @@
 #include "pbd/natsort.h"
 #include "ardour/audio_backend.h"
 #include "ardour/dsp_load_calculator.h"
+#include "ardour/port_engine_shared.h"
 #include "ardour/types.h"
 
 #include "coreaudio_pcmio.h"
@@ -60,61 +61,7 @@ class CoreMidiEvent {
 
 typedef std::vector<CoreMidiEvent> CoreMidiBuffer;
 
-class CoreBackendPort {
-  protected:
-	CoreBackendPort (CoreAudioBackend &b, const std::string&, PortFlags);
-  public:
-	virtual ~CoreBackendPort ();
-
-	const std::string& name () const { return _name; }
-	const std::string& pretty_name () const { return _pretty_name; }
-	PortFlags flags () const { return _flags; }
-
-	int set_name (const std::string &name) { _name = name; return 0; }
-	int set_pretty_name (const std::string &name) { _pretty_name = name; return 0; }
-
-	virtual DataType type () const = 0;
-
-	bool is_input ()     const { return flags () & IsInput; }
-	bool is_output ()    const { return flags () & IsOutput; }
-	bool is_physical ()  const { return flags () & IsPhysical; }
-	bool is_terminal ()  const { return flags () & IsTerminal; }
-	bool is_connected () const { return _connections.size () != 0; }
-	bool is_connected (const CoreBackendPort *port) const;
-	bool is_physically_connected () const;
-
-	const std::set<CoreBackendPort *>& get_connections () const { return _connections; }
-
-	int connect (CoreBackendPort *port);
-	int disconnect (CoreBackendPort *port);
-	void disconnect_all ();
-
-	virtual void* get_buffer (pframes_t nframes) = 0;
-
-	const LatencyRange latency_range (bool for_playback) const
-	{
-		return for_playback ? _playback_latency_range : _capture_latency_range;
-	}
-
-	void set_latency_range (const LatencyRange &latency_range, bool for_playback);
-
-	void update_connected_latency (bool for_playback);
-
-  private:
-	CoreAudioBackend &_osx_backend;
-	std::string _name;
-	std::string _pretty_name;
-	const PortFlags _flags;
-	LatencyRange _capture_latency_range;
-	LatencyRange _playback_latency_range;
-	std::set<CoreBackendPort*> _connections;
-
-	void _connect (CoreBackendPort* , bool);
-	void _disconnect (CoreBackendPort* , bool);
-
-}; // class CoreBackendPort
-
-class CoreAudioPort : public CoreBackendPort {
+class CoreAudioPort : public BackendPort {
   public:
 	CoreAudioPort (CoreAudioBackend &b, const std::string&, PortFlags);
 	~CoreAudioPort ();
@@ -129,7 +76,7 @@ class CoreAudioPort : public CoreBackendPort {
 	Sample _buffer[8192];
 }; // class CoreAudioPort
 
-class CoreMidiPort : public CoreBackendPort {
+class CoreMidiPort : public BackendPort {
   public:
 	CoreMidiPort (CoreAudioBackend &b, const std::string&, PortFlags);
 	~CoreMidiPort ();
@@ -207,7 +154,7 @@ class CoreMidiPort : public CoreBackendPort {
 
 }; // class CoreMidiPort
 
-class CoreAudioBackend : public AudioBackend {
+class CoreAudioBackend : public AudioBackend, public PortEngineSharedImpl {
 	friend class CoreBackendPort;
   public:
 	CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info);
@@ -319,32 +266,34 @@ class CoreAudioBackend : public AudioBackend {
 
 	void* private_handle () const;
 	const std::string& my_name () const;
-	uint32_t port_name_size () const;
-
-	int         set_port_name (PortHandle, const std::string&);
-	std::string get_port_name (PortHandle) const;
-	PortFlags get_port_flags (PortHandle) const;
-	PortHandle  get_port_by_name (const std::string&) const;
-	int get_port_property (PortHandle, const std::string& key, std::string& value, std::string& type) const;
-	int set_port_property (PortHandle, const std::string& key, const std::string& value, const std::string& type);
-
-	int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>&) const;
-
-	DataType port_data_type (PortHandle) const;
 
-	PortHandle register_port (const std::string& shortname, ARDOUR::DataType, ARDOUR::PortFlags);
-	void unregister_port (PortHandle);
-
-	int  connect (const std::string& src, const std::string& dst);
-	int  disconnect (const std::string& src, const std::string& dst);
-	int  connect (PortHandle, const std::string&);
-	int  disconnect (PortHandle, const std::string&);
-	int  disconnect_all (PortHandle);
-
-	bool connected (PortHandle, bool process_callback_safe);
-	bool connected_to (PortHandle, const std::string&, bool process_callback_safe);
-	bool physically_connected (PortHandle, bool process_callback_safe);
-	int  get_connections (PortHandle, std::vector<std::string>&, bool process_callback_safe);
+	/* PortEngine API - forwarded to PortEngineSharedImpl */
+
+	bool        port_is_physical (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_is_physical (ph); }
+	void        get_physical_outputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_outputs (type, results); }
+	void        get_physical_inputs (DataType type, std::vector<std::string>& results) { PortEngineSharedImpl::get_physical_inputs (type, results); }
+	ChanCount   n_physical_outputs () const { return PortEngineSharedImpl::n_physical_outputs (); }
+	ChanCount   n_physical_inputs () const { return PortEngineSharedImpl::n_physical_inputs (); }
+	uint32_t    port_name_size () const { return PortEngineSharedImpl::port_name_size(); }
+	int         set_port_name (PortEngine::PortHandle ph, const std::string& name) { return PortEngineSharedImpl::set_port_name (ph, name); }
+	std::string get_port_name (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_name (ph); }
+	PortFlags   get_port_flags (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::get_port_flags (ph); }
+	PortEngine::PortHandle  get_port_by_name (std::string const & name) const { return PortEngineSharedImpl::get_port_by_name (name); }
+	int         get_port_property (PortEngine::PortHandle ph, const std::string& key, std::string& value, std::string& type) const { return PortEngineSharedImpl::get_port_property (ph, key, value, type); }
+	int         set_port_property (PortEngine::PortHandle ph, const std::string& key, const std::string& value, const std::string& type) { return PortEngineSharedImpl::set_port_property (ph, key, value, type); }
+	int         get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>& results) const { return PortEngineSharedImpl::get_ports (port_name_pattern, type, flags, results); }
+	DataType    port_data_type (PortEngine::PortHandle ph) const { return PortEngineSharedImpl::port_data_type (ph); }
+	PortEngine::PortHandle register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags) { return PortEngineSharedImpl::register_port (shortname, type, flags); }
+	void        unregister_port (PortHandle ph) { if (!_run) return; PortEngineSharedImpl::unregister_port (ph); }
+	int         connect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::connect (src, dst); }
+	int         disconnect (const std::string& src, const std::string& dst) { return PortEngineSharedImpl::disconnect (src, dst); }
+	int         connect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::connect (ph, other); }
+	int         disconnect (PortEngine::PortHandle ph, const std::string& other) { return PortEngineSharedImpl::disconnect (ph, other); }
+	int         disconnect_all (PortEngine::PortHandle ph) { return PortEngineSharedImpl::disconnect_all (ph); }
+	bool        connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::connected (ph, process_callback_safe); }
+	bool        connected_to (PortEngine::PortHandle ph, const std::string& other, bool process_callback_safe) { return PortEngineSharedImpl::connected_to (ph, other, process_callback_safe); }
+	bool        physically_connected (PortEngine::PortHandle ph, bool process_callback_safe) { return PortEngineSharedImpl::physically_connected (ph, process_callback_safe); }
+	int         get_connections (PortEngine::PortHandle ph, std::vector<std::string>& results, bool process_callback_safe) { return PortEngineSharedImpl::get_connections (ph, results, process_callback_safe); }
 
 	/* MIDI */
 	int midi_event_get (pframes_t& timestamp, size_t& size, uint8_t const** buf, void* port_buffer, uint32_t event_index);
@@ -459,24 +408,6 @@ class CoreAudioBackend : public AudioBackend {
 	void unregister_ports (bool system_only = false);
 	void update_system_port_latecies ();
 
-	std::vector<CoreBackendPort *> _system_inputs;
-	std::vector<CoreBackendPort *> _system_outputs;
-	std::vector<CoreBackendPort *> _system_midi_in;
-	std::vector<CoreBackendPort *> _system_midi_out;
-
-	struct SortByPortName
-	{
-		bool operator ()(const CoreBackendPort* lhs, const CoreBackendPort* rhs) const
-		{
-			return PBD::naturally_less (lhs->name ().c_str (), rhs->name ().c_str ());
-		}
-	};
-
-	typedef std::map<std::string, CoreBackendPort *> PortMap; // fast lookup in _ports
-	typedef std::set<CoreBackendPort *, SortByPortName> PortIndex; // fast lookup in _ports
-	PortMap _portmap;
-	PortIndex _ports;
-
 	struct PortConnectData {
 		std::string a;
 		std::string b;
@@ -503,18 +434,6 @@ class CoreAudioBackend : public AudioBackend {
 		pthread_mutex_unlock (&_port_callback_mutex);
 	}
 
-	bool valid_port (PortHandle port) const {
-		return std::find (_ports.begin(), _ports.end(), static_cast<CoreBackendPort*>(port)) != _ports.end ();
-	}
-
-	CoreBackendPort* find_port (const std::string& port_name) const {
-		PortMap::const_iterator it = _portmap.find (port_name);
-		if (it == _portmap.end()) {
-			return NULL;
-		}
-		return (*it).second;
-	}
-
 	CoreBackendPort * find_port_in (std::vector<CoreBackendPort *> plist, const std::string& port_name) const {
 		for (std::vector<CoreBackendPort*>::const_iterator it = plist.begin (); it != plist.end (); ++it) {
 			if ((*it)->name () == port_name) {