rollback to 3428, before the mysterious removal of libs/* at 3431/3432

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

130 files changed, 22056 insertions, 0 deletions

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
new file mode 100644
index 0000000000..fcc11dbae3
--- /dev/null
+++ b/libs/surfaces/control_protocol/SConscript
@@ -0,0 +1,58 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+cp = env.Copy()
+
+#
+# this defines the version number of libardour_cp
+# 
+
+domain = 'ardour_cp'
+
+cp.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+cp.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+cp.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+cp.Append(PACKAGE = domain)
+cp.Append(POTFILE = domain + '.pot')
+
+cp_files=Split("""
+basic_ui.cc
+control_protocol.cc
+smpte.cc
+""")
+
+cp.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+
+cp.Merge ([
+    libraries['ardour'],
+    libraries['sndfile-ardour'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
+	])
+
+libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
+
+Default(libardour_cp)
+
+if env['NLS']:
+	i18n (cp, cp_files, env)
+	      
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour_cp))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+				     [ 'SConscript' ] +
+				     cp_files + 
+				     glob.glob('po/*.po') + glob.glob('*.h') + glob.glob('control_protocol/*.h')))
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
new file mode 100644
index 0000000000..44445192be
--- /dev/null
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -0,0 +1,282 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser
+    General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <pbd/pthread_utils.h>
+
+#include <ardour/session.h>
+#include <ardour/location.h>
+
+#include <control_protocol/basic_ui.h>
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using ARDOUR::nframes_t;
+
+BasicUI::BasicUI (Session& s)
+	: session (&s)
+{
+}
+
+BasicUI::BasicUI ()
+	: session (0)
+{
+}
+
+BasicUI::~BasicUI ()
+{
+	
+}
+
+void
+BasicUI::register_thread (std::string name)
+{
+	PBD::ThreadCreated (pthread_self(), name);
+}
+
+void
+BasicUI::loop_toggle () 
+{
+	if (session->get_play_loop()) {
+		session->request_play_loop (false);
+	} else {
+		session->request_play_loop (true);
+		if (!session->transport_rolling()) {
+			session->request_transport_speed (1.0);
+		}
+	}
+}
+
+void
+BasicUI::goto_start ()
+{
+	session->goto_start ();
+}
+
+void
+BasicUI::goto_end ()
+{
+	session->goto_end ();
+}
+
+void       
+BasicUI::add_marker ()
+{
+	nframes_t when = session->audible_frame();
+	session->locations()->add (new Location (when, when, _("unnamed"), Location::IsMark));
+}
+
+void
+BasicUI::rewind ()
+{
+	session->request_transport_speed (-2.0f);
+}
+
+void
+BasicUI::ffwd ()
+{
+	session->request_transport_speed (2.0f);
+}
+
+void
+BasicUI::transport_stop ()
+{
+	session->request_transport_speed (0.0);
+}
+
+void
+BasicUI::transport_play (bool from_last_start)
+{
+	bool rolling = session->transport_rolling ();
+
+	if (session->get_play_loop()) {
+		session->request_play_loop (false);
+	} 
+
+	if (session->get_play_range ()) {
+		session->request_play_range (false);
+	}
+	
+	if (from_last_start && rolling) {
+		session->request_locate (session->last_transport_start(), true);
+
+	}
+
+	session->request_transport_speed (1.0f);
+}
+
+void
+BasicUI::rec_enable_toggle ()
+{
+	switch (session->record_status()) {
+	case Session::Disabled:
+		if (session->ntracks() == 0) {
+			// string txt = _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu.");
+			// MessageDialog msg (*editor, txt);
+			// msg.run ();
+			return;
+		}
+		session->maybe_enable_record ();
+		break;
+	case Session::Recording:
+	case Session::Enabled:
+		session->disable_record (true);
+	}
+}
+
+void
+BasicUI::save_state ()
+{
+	session->save_state ("");
+}
+
+void
+BasicUI::prev_marker ()
+{
+	Location *location = session->locations()->first_location_before (session->transport_frame());
+	
+	if (location) {
+		session->request_locate (location->start(), session->transport_rolling());
+	} else {
+		session->goto_start ();
+	}
+}
+
+void
+BasicUI::next_marker ()
+{
+	Location *location = session->locations()->first_location_after (session->transport_frame());
+
+	if (location) {
+		session->request_locate (location->start(), session->transport_rolling());
+	} else {
+		session->request_locate (session->current_end_frame());
+	}
+}
+
+void
+BasicUI::set_transport_speed (float speed)
+{
+	session->request_transport_speed (speed);
+}
+
+float
+BasicUI::get_transport_speed ()
+{
+	return session->transport_speed ();
+}
+
+void
+BasicUI::undo ()
+{
+	session->undo (1);
+}
+
+void
+BasicUI::redo ()
+{
+	session->redo (1);
+}
+
+void
+BasicUI::toggle_all_rec_enables ()
+{
+	if (session->get_record_enabled()) {
+		session->record_disenable_all ();
+	} else {
+		session->record_enable_all ();
+	}
+}
+
+void
+BasicUI::toggle_punch_in ()
+{
+	Config->set_punch_in (!Config->get_punch_in());
+}
+
+void
+BasicUI::toggle_punch_out ()
+{
+	Config->set_punch_out (!Config->get_punch_out());
+}
+
+bool
+BasicUI::get_record_enabled ()
+{
+	return session->get_record_enabled();
+}
+
+void
+BasicUI::set_record_enable (bool yn)
+{
+	if (yn) {
+		session->maybe_enable_record ();
+	} else {
+		session->disable_record (false, true);
+	}
+}
+
+nframes_t
+BasicUI::transport_frame ()
+{
+	return session->transport_frame();
+}
+
+void
+BasicUI::locate (nframes_t where, bool roll_after_locate)
+{
+	session->request_locate (where, roll_after_locate);
+}
+
+bool
+BasicUI::locating ()
+{
+	return session->locate_pending();
+}
+
+bool
+BasicUI::locked ()
+{
+	return session->transport_locked ();
+}
+
+nframes_t
+BasicUI::smpte_frames_per_hour ()
+{
+	return session->smpte_frames_per_hour ();
+}
+
+void
+BasicUI::smpte_time (nframes_t where, SMPTE::Time& smpte)
+{
+	session->smpte_time (where, *((SMPTE::Time *) &smpte));
+}
+
+void 
+BasicUI::smpte_to_sample (SMPTE::Time& smpte, nframes_t& sample, bool use_offset, bool use_subframes) const
+{
+	session->smpte_to_sample (*((SMPTE::Time*)&smpte), sample, use_offset, use_subframes);
+}
+
+void 
+BasicUI::sample_to_smpte (nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const
+{
+	session->sample_to_smpte (sample, *((SMPTE::Time*)&smpte), use_offset, use_subframes);
+}
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
new file mode 100644
index 0000000000..708373e3bc
--- /dev/null
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -0,0 +1,342 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser
+    General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <ardour/session.h>
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/meter.h>
+#include <control_protocol/control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+
+sigc::signal<void> ControlProtocol::ZoomToSession;
+sigc::signal<void> ControlProtocol::ZoomOut;
+sigc::signal<void> ControlProtocol::ZoomIn;
+sigc::signal<void> ControlProtocol::Enter;
+sigc::signal<void,float> ControlProtocol::ScrollTimeline;
+
+ControlProtocol::ControlProtocol (Session& s, string str)
+	: BasicUI (s),
+	  _name (str)
+{
+	_active = false;
+	session->RouteAdded.connect (mem_fun(*this, &ControlProtocol::add_strip));
+}
+
+ControlProtocol::~ControlProtocol ()
+{
+}
+
+void
+ControlProtocol::add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >)
+{
+	route_list_changed();
+}
+	
+void
+ControlProtocol::next_track (uint32_t initial_id)
+{
+	uint32_t limit = session->nroutes();
+	boost::shared_ptr<Route> cr = route_table[0];
+	uint32_t id;
+
+	if (cr) {
+		id = cr->remote_control_id ();
+	} else {
+		id = 0;
+	}
+
+	if (id == limit) {
+		id = 0;
+	} else {
+		id++;
+	}
+
+	while (id < limit) {
+		if ((cr = session->route_by_remote_id (id)) != 0) {
+			break;
+		}
+		id++;
+	}
+
+	if (id == limit) {
+		id = 0;
+		while (id != initial_id) {
+			if ((cr = session->route_by_remote_id (id)) != 0) {
+				break;
+			}
+			id++;
+		}
+	}
+
+	route_table[0] = cr;
+}
+
+void
+ControlProtocol::prev_track (uint32_t initial_id)
+{
+	uint32_t limit = session->nroutes() - 1;
+	boost::shared_ptr<Route> cr = route_table[0];
+	uint32_t id;
+
+	if (cr) {
+		id = cr->remote_control_id ();
+	} else {
+		id = 0;
+	}
+
+	if (id == 0) {
+		id = session->nroutes() - 1;
+	} else {
+		id--;
+	}
+
+	while (id >= 0) {
+		if ((cr = session->route_by_remote_id (id)) != 0) {
+			break;
+		}
+		id--;
+	}
+
+	if (id < 0) {
+		id = limit;
+		while (id > initial_id) {
+			if ((cr = session->route_by_remote_id (id)) != 0) {
+				break;
+			}
+			id--;
+		}
+	}
+
+	route_table[0] = cr;
+}
+
+
+void
+ControlProtocol::set_route_table_size (uint32_t size)
+{
+	while (route_table.size() < size) {
+		route_table.push_back (boost::shared_ptr<Route> ((Route*) 0));
+	}
+}
+
+void
+ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR::Route> r)
+{
+	if (table_index >= route_table.size()) {
+		return;
+	}
+	
+	route_table[table_index] = r;
+
+	// XXX SHAREDPTR need to handle r->GoingAway
+}
+
+bool
+ControlProtocol::set_route_table (uint32_t table_index, uint32_t remote_control_id)
+{
+	boost::shared_ptr<Route> r = session->route_by_remote_id (remote_control_id);
+
+	if (!r) {
+		return false;
+	}
+
+	set_route_table (table_index, r);
+
+	return true;
+}
+
+void
+ControlProtocol::route_set_rec_enable (uint32_t table_index, bool yn)
+{
+	if (table_index > route_table.size()) {
+		return;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack>(r);
+
+	if (at) {
+		at->set_record_enable (yn, this);
+	}
+}
+
+bool
+ControlProtocol::route_get_rec_enable (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return false;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack>(r);
+
+	if (at) {
+		return at->record_enabled ();
+	}
+
+	return false;
+}
+
+
+float
+ControlProtocol::route_get_gain (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return 0.0f;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return 0.0f;
+	}
+
+	return r->gain ();
+}
+
+void
+ControlProtocol::route_set_gain (uint32_t table_index, float gain)
+{
+	if (table_index > route_table.size()) {
+		return;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+	
+	if (r != 0) {
+		r->set_gain (gain, this);
+	}
+}
+
+float
+ControlProtocol::route_get_effective_gain (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return 0.0f;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return 0.0f;
+	}
+
+	return r->effective_gain ();
+}
+
+
+float
+ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t which_input)
+{
+	if (table_index > route_table.size()) {
+		return 0.0f;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return 0.0f;
+	}
+
+	return r->peak_meter().peak_power (which_input);
+}
+
+
+bool
+ControlProtocol::route_get_muted (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return false;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return false;
+	}
+
+	return r->muted ();
+}
+
+void
+ControlProtocol::route_set_muted (uint32_t table_index, bool yn)
+{
+	if (table_index > route_table.size()) {
+		return;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r != 0) {
+		r->set_mute (yn, this);
+	}
+}
+
+
+bool
+ControlProtocol::route_get_soloed (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return false;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return false;
+	}
+
+	return r->soloed ();
+}
+
+void
+ControlProtocol::route_set_soloed (uint32_t table_index, bool yn)
+{
+	if (table_index > route_table.size()) {
+		return;
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r != 0) {
+		r->set_solo (yn, this);
+	}
+}
+
+string
+ControlProtocol:: route_get_name (uint32_t table_index)
+{
+	if (table_index > route_table.size()) {
+		return "";
+	}
+
+	boost::shared_ptr<Route> r = route_table[table_index];
+
+	if (r == 0) {
+		return "";
+	}
+
+	return r->name();
+}
+
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
new file mode 100644
index 0000000000..7bc6b25c32
--- /dev/null
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser
+    General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_basic_ui_h__
+#define __ardour_basic_ui_h__
+
+#include <string>
+
+#include <jack/types.h>
+#include <control_protocol/smpte.h>
+
+namespace ARDOUR {
+	class Session;
+}
+
+class BasicUI {
+  public:
+	BasicUI (ARDOUR::Session&);
+	virtual ~BasicUI ();
+	
+	void add_marker ();
+
+	void register_thread (std::string name);
+
+	/* transport control */
+
+	void loop_toggle ();
+	void goto_start ();
+	void goto_end ();
+	void rewind ();
+	void ffwd ();
+	void transport_stop ();
+	void transport_play (bool jump_back = true);
+	void set_transport_speed (float speed);
+	float get_transport_speed ();
+
+	jack_nframes_t transport_frame ();
+	void locate (jack_nframes_t frame, bool play = false);
+	bool locating ();
+	bool locked ();
+
+	void save_state ();
+	void prev_marker ();
+	void next_marker ();
+	void undo ();
+	void redo ();
+	void toggle_punch_in ();
+	void toggle_punch_out ();
+
+	void set_record_enable (bool yn);
+	bool get_record_enabled ();
+
+	void rec_enable_toggle ();
+	void toggle_all_rec_enables ();
+
+	jack_nframes_t smpte_frames_per_hour ();
+
+	void smpte_time (jack_nframes_t where, SMPTE::Time&);
+	void smpte_to_sample (SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const;
+	void sample_to_smpte (jack_nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const;
+
+  protected:
+	BasicUI ();
+	ARDOUR::Session* session;
+};
+
+#endif /* __ardour_basic_ui_h__ */
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
new file mode 100644
index 0000000000..7de1054ad2
--- /dev/null
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -0,0 +1,129 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser
+    General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef ardour_control_protocols_h
+#define ardour_control_protocols_h
+
+#include <string>
+#include <vector>
+#include <list>
+#include <boost/shared_ptr.hpp>
+#include <sigc++/sigc++.h>
+#include <pbd/stateful.h>
+#include <control_protocol/basic_ui.h>
+
+namespace ARDOUR {
+
+class Route;
+class Session;
+
+class ControlProtocol : public sigc::trackable, public PBD::Stateful, public BasicUI {
+  public:
+	ControlProtocol (Session&, std::string name);
+	virtual ~ControlProtocol();
+
+	std::string name() const { return _name; }
+
+	virtual int set_active (bool yn) = 0;
+	bool get_active() const { return _active; }
+
+	virtual int set_feedback (bool yn) { return 0; }
+	virtual bool get_feedback () const { return false; }
+
+	virtual void route_list_changed () {}
+
+	sigc::signal<void> ActiveChanged;
+
+	/* signals that a control protocol can emit and other (presumably graphical)
+	   user interfaces can respond to
+	*/
+
+	static sigc::signal<void> ZoomToSession;
+	static sigc::signal<void> ZoomIn;
+	static sigc::signal<void> ZoomOut;
+	static sigc::signal<void> Enter;
+	static sigc::signal<void,float> ScrollTimeline;
+
+	/* the model here is as follows:
+
+	   we imagine most control surfaces being able to control
+	   from 1 to N tracks at a time, with a session that may
+	   contain 1 to M tracks, where M may be smaller, larger or
+	   equal to N. 
+
+	   the control surface has a fixed set of physical controllers
+	   which can potentially be mapped onto different tracks/busses
+	   via some mechanism.
+
+	   therefore, the control protocol object maintains
+	   a table that reflects the current mapping between
+	   the controls and route object.
+	*/
+
+	void set_route_table_size (uint32_t size);
+	void set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR::Route>);
+	bool set_route_table (uint32_t table_index, uint32_t remote_control_id);
+
+	void route_set_rec_enable (uint32_t table_index, bool yn);
+	bool route_get_rec_enable (uint32_t table_index);
+
+	float route_get_gain (uint32_t table_index);
+	void route_set_gain (uint32_t table_index, float);
+	float route_get_effective_gain (uint32_t table_index);
+
+	float route_get_peak_input_power (uint32_t table_index, uint32_t which_input);
+
+	bool route_get_muted (uint32_t table_index);
+	void route_set_muted (uint32_t table_index, bool);
+
+	bool route_get_soloed (uint32_t table_index);
+	void route_set_soloed (uint32_t table_index, bool);
+
+	std::string route_get_name (uint32_t table_index);
+
+  protected:
+	std::vector<boost::shared_ptr<ARDOUR::Route> > route_table;
+	std::string _name;
+	bool _active;
+
+	void add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >);
+
+	void next_track (uint32_t initial_id);
+	void prev_track (uint32_t initial_id);
+};
+
+extern "C" {
+	struct ControlProtocolDescriptor {
+	    const char* name;      /* descriptive */
+	    const char* id;        /* unique and version-specific */
+	    void*       ptr;       /* protocol can store a value here */
+	    void*       module;    /* not for public access */
+	    int         mandatory; /* if non-zero, always load and do not make optional */
+	    bool        supports_feedback; /* if true, protocol has toggleable feedback mechanism */
+	    bool             (*probe)(ControlProtocolDescriptor*);
+	    ControlProtocol* (*initialize)(ControlProtocolDescriptor*,Session*);
+	    void             (*destroy)(ControlProtocolDescriptor*,ControlProtocol*);
+	    
+	};
+}
+
+}
+
+#endif // ardour_control_protocols_h
diff --git a/libs/surfaces/control_protocol/control_protocol/smpte.h b/libs/surfaces/control_protocol/control_protocol/smpte.h
new file mode 100644
index 0000000000..b25a268aac
--- /dev/null
+++ b/libs/surfaces/control_protocol/control_protocol/smpte.h
@@ -0,0 +1,70 @@
+/*
+	Copyright (C) 2006 Paul Davis
+	
+	This program is free software; you can redistribute it and/or modify it
+	under the terms of the GNU Lesser General Public License as published
+	by the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful, but WITHOUT
+	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+	for more details.
+	
+	You should have received a copy of the GNU General Public License along
+	with this program; if not, write to the Free Software Foundation, Inc.,
+	675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __ardour_smpte_h__
+#define __ardour_smpte_h__
+
+#include <inttypes.h>
+
+namespace SMPTE {
+
+enum Wrap {
+	NONE = 0,
+	FRAMES,
+	SECONDS,
+	MINUTES,
+	HOURS
+};
+
+struct Time {
+	bool       negative;
+	uint32_t   hours;
+	uint32_t   minutes;
+	uint32_t   seconds;
+	uint32_t   frames;        ///< SMPTE frames (not audio samples)
+	uint32_t   subframes;     ///< Typically unused
+	float      rate;          ///< Frame rate of this Time
+	static float default_rate;///< Rate to use for default constructor
+	bool       drop;          ///< Whether this Time uses dropframe SMPTE
+
+	Time(float a_rate = default_rate) {
+		negative = false;
+		hours = 0;
+		minutes = 0;
+		seconds = 0;
+		frames = 0;
+		subframes = 0;
+		rate = a_rate;
+	}
+};
+
+Wrap increment( Time& smpte );
+Wrap decrement( Time& smpte );
+Wrap increment_subframes( Time& smpte );
+Wrap decrement_subframes( Time& smpte );
+Wrap increment_seconds( Time& smpte );
+Wrap increment_minutes( Time& smpte );
+Wrap increment_hours( Time& smpte );
+void frames_floor( Time& smpte );
+void seconds_floor( Time& smpte );
+void minutes_floor( Time& smpte );
+void hours_floor( Time& smpte );
+
+} // namespace SMPTE
+
+#endif  // __ardour_smpte_h__
diff --git a/libs/surfaces/control_protocol/smpte.cc b/libs/surfaces/control_protocol/smpte.cc
new file mode 100644
index 0000000000..5df159a52b
--- /dev/null
+++ b/libs/surfaces/control_protocol/smpte.cc
@@ -0,0 +1,428 @@
+/*
+	Copyright (C) 2006 Paul Davis
+	
+	This program is free software; you can redistribute it and/or modify it
+	under the terms of the GNU Lesser General Public License as published
+	by the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful, but WITHOUT
+	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+	for more details.
+	
+	You should have received a copy of the GNU General Public License along
+	with this program; if not, write to the Free Software Foundation, Inc.,
+	675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#define SMPTE_IS_AROUND_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours)
+#define SMPTE_IS_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours && !(sm.subframes))
+
+#include <control_protocol/smpte.h>
+#include <ardour/configuration.h>
+
+namespace SMPTE {
+
+float Time::default_rate = 30.0;
+
+
+/** Increment @a smpte by exactly one frame (keep subframes value).
+ * Realtime safe.
+ * @return true if seconds wrap.
+ */
+Wrap
+increment( Time& smpte )
+{
+	Wrap wrap = NONE;
+
+	if (smpte.negative) {
+		if (SMPTE_IS_AROUND_ZERO(smpte) && smpte.subframes) {
+			// We have a zero transition involving only subframes
+			smpte.subframes = ARDOUR::Config->get_subframes_per_frame() - smpte.subframes;
+			smpte.negative = false;
+			return SECONDS;
+		}
+    
+		smpte.negative = false;
+		wrap = decrement( smpte );
+		if (!SMPTE_IS_ZERO( smpte )) {
+			smpte.negative = true;
+		}
+		return wrap;
+	}
+
+	switch ((int)ceil(smpte.rate)) {
+	case 24:
+		if (smpte.frames == 23) {
+			smpte.frames = 0;
+			wrap = SECONDS;
+		}
+		break;
+	case 25:
+		if (smpte.frames == 24) {
+			smpte.frames = 0;
+			wrap = SECONDS;
+		}
+		break;
+	case 30:
+	        if (smpte.drop) {
+		       if (smpte.frames == 29) {
+			      if ( ((smpte.minutes + 1) % 10) && (smpte.seconds == 59) ) {
+				     smpte.frames = 2;
+			      }
+			      else {
+				     smpte.frames = 0;
+			      }
+			      wrap = SECONDS;
+		       }
+		} else {
+
+		       if (smpte.frames == 29) {
+			      smpte.frames = 0;
+			      wrap = SECONDS;
+		       }
+		}
+		break;
+	case 60:
+	        if (smpte.frames == 59) {
+		        smpte.frames = 0;
+			wrap = SECONDS;
+		}
+		break;
+	}
+  
+	if (wrap == SECONDS) {
+		if (smpte.seconds == 59) {
+			smpte.seconds = 0;
+			wrap = MINUTES;
+			if (smpte.minutes == 59) {
+				smpte.minutes = 0;
+				wrap = HOURS;
+				smpte.hours++;
+			} else {
+				smpte.minutes++;
+			}
+		} else {
+			smpte.seconds++;
+		}
+	} else {
+		smpte.frames++;
+	}
+  
+	return wrap;
+}
+
+
+/** Decrement @a smpte by exactly one frame (keep subframes value)
+ * Realtime safe.
+ * @return true if seconds wrap. */
+Wrap
+decrement( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+  
+	if (smpte.negative || SMPTE_IS_ZERO(smpte)) {
+		smpte.negative = false;
+		wrap = increment( smpte );
+		smpte.negative = true;
+		return wrap;
+	} else if (SMPTE_IS_AROUND_ZERO(smpte) && smpte.subframes) {
+		// We have a zero transition involving only subframes
+		smpte.subframes = ARDOUR::Config->get_subframes_per_frame() - smpte.subframes;
+		smpte.negative = true;
+		return SECONDS;
+	}
+  
+	switch ((int)ceil(smpte.rate)) {
+	case 24:
+		if (smpte.frames == 0) {
+			smpte.frames = 23;
+			wrap = SECONDS;
+		}
+		break;
+	case 25:
+		if (smpte.frames == 0) {
+			smpte.frames = 24;
+			wrap = SECONDS;
+		}
+		break;
+	case 30:
+	        if (smpte.drop) {
+		        if ((smpte.minutes % 10) && (smpte.seconds == 0)) {
+			        if (smpte.frames <= 2) {
+				        smpte.frames = 29;
+					wrap = SECONDS;
+				}
+			} else if (smpte.frames == 0) {
+			        smpte.frames = 29;
+				wrap = SECONDS;
+			}
+			
+		} else {
+		        if (smpte.frames == 0) {
+			        smpte.frames = 29;
+				wrap = SECONDS;
+			}
+		}
+		break;
+	case 60:
+	        if (smpte.frames == 0) {
+		        smpte.frames = 59;
+			wrap = SECONDS;
+		}
+		break;
+	}
+  
+	if (wrap == SECONDS) {
+		if (smpte.seconds == 0) {
+			smpte.seconds = 59;
+			wrap = MINUTES;
+			if (smpte.minutes == 0) {
+				smpte.minutes = 59;
+				wrap = HOURS;
+				smpte.hours--;
+			}
+			else {
+				smpte.minutes--;
+			}
+		} else {
+			smpte.seconds--;
+		}
+	} else {
+		smpte.frames--;
+	}
+  
+	if (SMPTE_IS_ZERO( smpte )) {
+		smpte.negative = false;
+	}
+  
+	return wrap;
+}
+
+
+/** Go to lowest absolute subframe value in this frame (set to 0 :-) ) */
+void
+frames_floor( Time& smpte )
+{
+	smpte.subframes = 0;
+	if (SMPTE_IS_ZERO(smpte)) {
+		smpte.negative = false;
+	}
+}
+
+
+/** Increment @a smpte by one subframe */
+Wrap
+increment_subframes( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+	if (smpte.negative) {
+		smpte.negative = false;
+		wrap = decrement_subframes( smpte );
+		if (!SMPTE_IS_ZERO(smpte)) {
+			smpte.negative = true;
+		}
+		return wrap;
+	}
+  
+	smpte.subframes++;
+	if (smpte.subframes >= ARDOUR::Config->get_subframes_per_frame()) {
+		smpte.subframes = 0;
+		increment( smpte );
+		return FRAMES;
+	}
+	return NONE;
+}
+
+
+/** Decrement @a smpte by one subframe */
+Wrap
+decrement_subframes( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+	if (smpte.negative) {
+		smpte.negative = false;
+		wrap = increment_subframes( smpte );
+		smpte.negative = true;
+		return wrap;
+	}
+  
+	if (smpte.subframes <= 0) {
+		smpte.subframes = 0;
+		if (SMPTE_IS_ZERO(smpte)) {
+			smpte.negative = true;
+			smpte.subframes = 1;
+			return FRAMES;
+		} else {
+			decrement( smpte );
+			smpte.subframes = 79;
+			return FRAMES;
+		}
+	} else {
+		smpte.subframes--;
+		if (SMPTE_IS_ZERO(smpte)) {
+			smpte.negative = false;
+		}
+		return NONE;
+	}
+}
+
+
+/** Go to next whole second (frames == 0 or frames == 2) */
+Wrap
+increment_seconds( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+	// Clear subframes
+	frames_floor( smpte );
+  
+	if (smpte.negative) {
+		// Wrap second if on second boundary
+		wrap = increment(smpte);
+		// Go to lowest absolute frame value
+		seconds_floor( smpte );
+		if (SMPTE_IS_ZERO(smpte)) {
+			smpte.negative = false;
+		}
+	} else {
+		// Go to highest possible frame in this second
+	  switch ((int)ceil(smpte.rate)) {
+		case 24:
+			smpte.frames = 23;
+			break;
+		case 25:
+			smpte.frames = 24;
+			break;
+		case 30:
+			smpte.frames = 29;
+			break;
+		case 60:
+			smpte.frames = 59;
+			break;
+		}
+    
+		// Increment by one frame
+		wrap = increment( smpte );
+	}
+  
+	return wrap;
+}
+
+
+/** Go to lowest (absolute) frame value in this second
+ * Doesn't care about positive/negative */
+void
+seconds_floor( Time& smpte )
+{
+	// Clear subframes
+	frames_floor( smpte );
+  
+	// Go to lowest possible frame in this second
+	switch ((int)ceil(smpte.rate)) {
+	case 24:
+	case 25:
+	case 30:
+	case 60:
+	        if (!(smpte.drop)) {
+		        smpte.frames = 0;
+		} else {
+
+		        if ((smpte.minutes % 10) && (smpte.seconds == 0)) {
+			        smpte.frames = 2;
+			} else {
+			        smpte.frames = 0;
+			}
+		}
+		break;
+	}
+  
+	if (SMPTE_IS_ZERO(smpte)) {
+		smpte.negative = false;
+	}
+}
+
+
+/** Go to next whole minute (seconds == 0, frames == 0 or frames == 2) */
+Wrap
+increment_minutes( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+	// Clear subframes
+	frames_floor( smpte );
+  
+	if (smpte.negative) {
+		// Wrap if on minute boundary
+		wrap = increment_seconds( smpte );
+		// Go to lowest possible value in this minute
+		minutes_floor( smpte );
+	} else {
+		// Go to highest possible second
+		smpte.seconds = 59;
+		// Wrap minute by incrementing second
+		wrap = increment_seconds( smpte );
+	}
+  
+	return wrap;
+}
+
+
+/** Go to lowest absolute value in this minute */
+void
+minutes_floor( Time& smpte )
+{
+	// Go to lowest possible second
+	smpte.seconds = 0;
+	// Go to lowest possible frame
+	seconds_floor( smpte );
+
+	if (SMPTE_IS_ZERO(smpte)) {
+		smpte.negative = false;
+	}
+}
+
+
+/** Go to next whole hour (minute = 0, second = 0, frame = 0) */
+Wrap
+increment_hours( Time& smpte )
+{
+	Wrap wrap = NONE;
+  
+	// Clear subframes
+	frames_floor(smpte);
+  
+	if (smpte.negative) {
+		// Wrap if on hour boundary
+		wrap = increment_minutes( smpte );
+		// Go to lowest possible value in this hour
+		hours_floor( smpte );
+	} else {
+		smpte.minutes = 59;
+		wrap = increment_minutes( smpte );
+	}
+  
+	return wrap;
+}
+
+
+/** Go to lowest absolute value in this hour */
+void
+hours_floor( Time& smpte )
+{
+	smpte.minutes = 0;
+	smpte.seconds = 0;
+	smpte.frames = 0;
+	smpte.subframes = 0;
+  
+	if (SMPTE_IS_ZERO(smpte)) {
+		smpte.negative = false;
+	}
+}
+
+
+} // namespace SMPTE
diff --git a/libs/surfaces/frontier/kernel_drivers/BUILD b/libs/surfaces/frontier/kernel_drivers/BUILD
new file mode 100644
index 0000000000..dc612e20bf
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/BUILD
@@ -0,0 +1,10 @@
+To build, type make
+
+# make install and run
+ir: install 
+	rmmod tranzport
+	modprobe tranzport
+
+# make install, run, and run tests
+irt: ir
+	
diff --git a/libs/surfaces/frontier/kernel_drivers/Makefile b/libs/surfaces/frontier/kernel_drivers/Makefile
new file mode 100644
index 0000000000..223fcdb6fc
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/Makefile
@@ -0,0 +1,35 @@
+ifneq ($(KERNELRELEASE),)
+
+obj-m := tranzport.o
+tranzport-objs := 
+
+else
+
+KDIR   := /lib/modules/$(shell uname -r)/build
+PWD    := $(shell pwd)
+MODDIR := $(DESTDIR)/lib/modules/$(shell uname -r)/kernel/sound/usb/misc
+BINDIR := $(DESTDIR)/usr/local/bin
+
+default::
+	$(MAKE) -Wall -C $(KDIR) SUBDIRS=$(PWD) modules
+	$(MAKE) -C tests
+
+install-only:: default
+	mkdir -p $(MODDIR) $(BINDIR)
+	cp tranzport.ko $(MODDIR)
+	$(MAKE) -C tests install
+
+install:: install-only
+	/sbin/depmod -a
+	+/sbin/rmmod tranzport
+	/sbin/modprobe tranzport
+
+irt:: install
+	tranzport_tests.sh
+
+clean::
+	rm -f core .*.cmd *.o *.ko *.mod.c Module.symvers *.bak .\#* *~
+	rm -rf .tmp_versions
+	$(MAKE) -C tests clean
+
+endif
diff --git a/libs/surfaces/frontier/kernel_drivers/README b/libs/surfaces/frontier/kernel_drivers/README
new file mode 100644
index 0000000000..51b4af0f2e
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/README
@@ -0,0 +1,16 @@
+This directory contains the USB Tranzport Kernel driver for Linux.
+
+At present it accepts reads/writes of 8 byte cmds to /dev/tranzport0 to control
+the lights and screen.
+
+Reads are possible. Wheel Compression does not currently account for button changes
+
+It also has some sysfs hooks that are non-functional at the moment.
+
+The API is closely tied to the ardour revision and WILL change. 
+
+A sysfs interface is PERFECT for simple userspace apps to do fun things with the
+lights and screen. It's fairly lousy for handling input events and very lousy
+for watching the state of the shuttle wheel.
+
+In the end this is going to be driven by a midi layer
diff --git a/libs/surfaces/frontier/kernel_drivers/doc/keycodes.html b/libs/surfaces/frontier/kernel_drivers/doc/keycodes.html
new file mode 100644
index 0000000000..651517a7f2
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/doc/keycodes.html
@@ -0,0 +1,35 @@
+<HTML>
+<HEAD>
+<TITLE> TRANZPORT KEYCODES REFERENCE </TITLE>
+</HEAD>
+<BODY>
+<H2> TRANZPORT KEYCODES REFERENCE </H2>
+
+<H3>Footswitch</H3>
+
+At least on every footswitch I've tried, the polarity appears to be wrong, in that the footswitch "up" position results
+in 0100 being OR'd into the result. Pressing it down results in a 0, if no other keys are pressed. Releasing it results in 0100.
+
+Every other key when up results in 0. This odd behavior would hopefully be controllable via a command to the tranzport,
+but I don't have that, so dealing with footswitch events is weird. 
+
+So, seeing this bit enabled would be something like "HAVE_FOOTSWITCH INSTALLED", BE SMART ABOUT IT.
+
+
+<H3>Special Key Combinations</H3>
+<p>
+In addition to the normal keycodes generated by the tranzport, it is possible to hit several combinations of keys and get a unique
+result. Some are really weird. Perhaps the following assignments make sense:
+</p><p>
+<table><tr><th>PRESSING</th><th>RESULT</th><th>ASSIGNED TO</th></tr>
+<tr><td>TRACKLEFT+TRACKRIGHT</td><td>TRACKLEFT+TRACKRIGHT</td><td>Master</td></tr>
+<tr><td>SHIFT+TRACKLEFT+TRACKRIGHT</td><td>SHIFT+TRACKLEFT+TRACKRIGHT+UNDO</td><td>Show Bus Only Toggle</td></tr>
+<tr><td>IN+OUT</td><td>IN+OUT</td><td>Zoom 100%</td></tr>
+<tr><td>SHIFT+IN+OUT</td><td>SHIFT+IN+OUT+UNDO</td><td>Max Zoom</td></tr>
+<tr><td>SHIFT+REW+FFW</td><td>SHIFT+REW+FFW+UNDO</td><td></td></tr>
+<tr><td>RECORD+TRACKSOLO+FOOTSWITCHNOTDEPRESSED</td><td>RECORD+TRACKSOLO+BATTERY</td><td></td></tr>
+<tr><td>PLAY+MUTE</td><td>PLAY+MUTE</td><td></td></tr>
+</table>
+</p>
+</body>
+</html>
diff --git a/libs/surfaces/frontier/kernel_drivers/tests/Makefile b/libs/surfaces/frontier/kernel_drivers/tests/Makefile
new file mode 100644
index 0000000000..534bc7da4b
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tests/Makefile
@@ -0,0 +1,23 @@
+# Some basic utilities for testing the tranzport's I/O
+# eventually "tranzport" will become a flexible command
+#
+#
+
+FILES:=tranzport tranzport_lights tranzport_tests.sh
+BINDIR ?= $(DESTDIR)/usr/local/bin
+
+all: tranzport tranzport_lights
+
+tranzport: tranzport.c
+	gcc -g -Wall -o tranzport tranzport.c 
+
+tranzport_lights: tranzport_lights.c
+	gcc -g -Wall -o tranzport_lights tranzport_lights.c 
+
+clean:: 
+	rm -f core .*.cmd *.o *.ko *.mod.c Module.symvers *.bak .\#* *~
+	rm -rf .tmp_versions tranzport tranzport_lights
+
+install::
+	cp $(FILES) $(BINDIR)
+
diff --git a/libs/surfaces/frontier/kernel_drivers/tests/README b/libs/surfaces/frontier/kernel_drivers/tests/README
new file mode 100644
index 0000000000..f9efd18f69
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tests/README
@@ -0,0 +1,104 @@
+tranzport 0.1 <tranzport.sf.net>
+oct 18, 2005
+arthur@artcmusic.com
+---
+
+The Frontier Design Tranzport(tm) (www.frontierdesign.com) is a simple
+wireless USB device. It is not a MIDI device. The document on their web
+site "Tranzport(tm) Native Mode Interface Description" describes the
+Tranzport(tm) as if it were a MIDI device, but this is implemented by their
+Windows and Macintosh software drivers.
+
+This code will allow you to use your Tranzport(tm) at a lower level of
+abstraction. This code relies on libusb, which can be obtained from
+libusb.sourceforge.net.
+
+To compile the program, type "make". You should end up with a executable
+called "tranzport". You'll probably have to run this program as root.
+
+Using the program is straightforward. It will simply tell you which
+buttons are being pressed and what not. If you press one of the buttons
+with a light, the light will turn on. If you hold shift and press one of
+the buttons with a light, the light will turn off. If you take out the
+batteries to the device (or go out of range), it will tell you that the
+device is offline. When you replace the batteries (or come back in
+range), it should tell you it is back online.
+
+Once you understand how everything works, you should be able to
+incorporate it into your own setup however you wish.
+
+This code was developed on a Linux machine, but (theoretically) it
+should work on any system that is supported by libusb, since that is how
+it communicates with the device.
+
+Here are a few more details about the device:
+
+There are two endpoints for communication with the device. All data
+reads and writes are done in 8-byte segments.
+
+One endpoint is for interrupt reads. This is used to read button data 
+from the device. It also supplies status information for when the device 
+goes out of range and comes back in range, loses power and regains 
+power, etc. The format of the data is:
+
+    00 ss bb bb bb bb dd 00  (hexadecimal)
+
+where:
+
+    ss - status code, 01=online ff=offline
+    bb - button bits
+    dd - data wheel, 01-3f=forward 41-7f=backward
+
+Please refer to the source code for a list of the button bits.
+
+The other endpoint is for interrupt writes. This is used to toggle the
+lights on the device, and to write data to the LCD.
+
+There are 7 lights on the device. To turn a light on, send the following 
+sequence of bytes:
+
+    00 00 nn 01 00 00 00 00  (hexadecimal)
+
+where nn is the light number.
+
+To turn a light off:
+
+    00 00 nn 00 00 00 00 00  (hexadecimal)
+
+Here is the list of lights:
+
+    00  Record
+    01  Track Rec
+    02  Track Mute
+    03  Track Solo
+    04  Any Solo
+    05  Loop
+    06  Punch
+
+The size of the LCD is 20x2, and it is split into 10 cells, each cell
+being 4 characters wide. The cells progress across, then down. To write
+to the LCD, send the following sequence of bytes:
+
+    00 01 cc aa aa aa aa 00  (hexadecimal)
+
+where:
+
+    cc - cell number
+    aa - ASCII code
+
+Here is a list of the cells to clarify:
+
+    00  row 0, column 0-3
+    01  row 0, column 4-7
+    02  row 0, column 8-11
+    03  row 0, column 12-15
+    04  row 0, column 16-19
+    05  row 1, column 0-3
+    06  row 1, column 4-7
+    07  row 1, column 8-11
+    08  row 1, column 12-15
+    09  row 1, column 16-19
+
+You should refer to the "Tranzport(tm) Native Mode Interface
+Description" document for a listing of the ASCII codes the LCD uses.
+
diff --git a/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c b/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c
new file mode 100644
index 0000000000..2ef5b6c910
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c
@@ -0,0 +1,375 @@
+/*
+ * tranzport 0.1 <tranzport.sf.net>
+ * oct 18, 2005
+ * arthur@artcmusic.com
+ */
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc.h>
+
+#define VENDORID  0x165b
+#define PRODUCTID 0x8101
+
+#define READ_ENDPOINT  0x81
+#define WRITE_ENDPOINT 0x02
+
+enum {
+	LIGHT_RECORD = 0,
+	LIGHT_TRACKREC,
+	LIGHT_TRACKMUTE,
+	LIGHT_TRACKSOLO,
+	LIGHT_ANYSOLO,
+	LIGHT_LOOP,
+	LIGHT_PUNCH
+};
+
+#define BUTTONMASK_BATTERY     0x00004000
+#define BUTTONMASK_BACKLIGHT   0x00008000
+#define BUTTONMASK_TRACKLEFT   0x04000000
+#define BUTTONMASK_TRACKRIGHT  0x40000000
+#define BUTTONMASK_TRACKREC    0x00040000
+#define BUTTONMASK_TRACKMUTE   0x00400000
+#define BUTTONMASK_TRACKSOLO   0x00000400
+#define BUTTONMASK_UNDO        0x80000000
+#define BUTTONMASK_IN          0x02000000
+#define BUTTONMASK_OUT         0x20000000
+#define BUTTONMASK_PUNCH       0x00800000
+#define BUTTONMASK_LOOP        0x00080000
+#define BUTTONMASK_PREV        0x00020000
+#define BUTTONMASK_ADD         0x00200000
+#define BUTTONMASK_NEXT        0x00000200
+#define BUTTONMASK_REWIND      0x01000000
+#define BUTTONMASK_FASTFORWARD 0x10000000
+#define BUTTONMASK_STOP        0x00010000
+#define BUTTONMASK_PLAY        0x00100000
+#define BUTTONMASK_RECORD      0x00000100
+#define BUTTONMASK_SHIFT       0x08000000
+
+#define STATUS_OFFLINE 0xff
+#define STATUS_ONLINE  0x01
+#define STATUS_OK  0x00
+
+struct tranzport_s {
+	int *dev;
+	int udev;
+};
+
+typedef struct tranzport_s tranzport_t;
+
+void log_entry(FILE *fp, char *format, va_list ap)
+{
+	vfprintf(fp, format, ap);
+	fputc('\n', fp);
+}
+
+void log_error(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	log_entry(stderr, format, ap);
+	va_end(ap);
+}
+
+void vlog_error(char *format, va_list ap)
+{
+	log_entry(stderr, format, ap);
+}
+
+void die(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vlog_error(format, ap);
+	va_end(ap);
+	exit(1);
+}
+
+tranzport_t *open_tranzport_core()
+{
+	tranzport_t *z;
+	int val;
+
+	z = malloc(sizeof(tranzport_t));
+	if (!z)
+		die("not enough memory");
+	memset(z, 0, sizeof(tranzport_t));
+
+	z->udev = open("/dev/tranzport0",O_RDWR);
+	if (z->udev < 1)
+		die("unable to open tranzport");
+
+	return z;
+}
+
+tranzport_t *open_tranzport()
+{
+return open_tranzport_core();	
+}
+
+void close_tranzport(tranzport_t *z)
+{
+	int val;
+
+	val = close(z->udev);
+	if (val < 0)
+		log_error("unable to release tranzport");
+
+	free(z);
+}
+
+int tranzport_write_core(tranzport_t *z, uint8_t *cmd, int timeout)
+{
+	int val;
+	val = write(z->udev, cmd, 8);
+	if (val < 0)
+		return val;
+	if (val != 8)
+		return -1;
+	return 0;
+}
+
+int tranzport_lcdwrite(tranzport_t *z, uint8_t cell, char *text, int timeout)
+{
+	uint8_t cmd[8];
+
+	if (cell > 9) {
+		return -1;
+	}
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x01;
+	cmd[2] = cell;
+	cmd[3] = text[0];
+	cmd[4] = text[1];
+	cmd[5] = text[2];
+	cmd[6] = text[3];
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_lighton(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x01;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_lightoff(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x00;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_read(tranzport_t *z, uint8_t *status, uint32_t *buttons, uint8_t *datawheel, int timeout)
+{
+	uint8_t buf[8];
+	int val;
+	
+	memset(buf, 0xff, 8);
+	val = read(z->udev, buf, 8);
+	if (val < 0) {
+		printf("errno: %d\n",errno);
+		switch(errno) {
+			case ENOENT: ; 
+                        case ECONNRESET: ;
+                    	case ESHUTDOWN: printf("dying\n"); exit(1);  break;
+		}
+		return val;
+	}
+	if (val != 8)
+		return -1;
+
+	/*printf("read: %02x %02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);*/
+
+	*status = buf[1];
+
+	*buttons = 0;
+	*buttons |= buf[2] << 24;
+	*buttons |= buf[3] << 16;
+	*buttons |= buf[4] << 8;
+	*buttons |= buf[5];
+
+	*datawheel = buf[6];
+
+	return 0;
+}
+
+void lights_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, uint8_t light)
+{
+	if (buttons & buttonmask) {
+		if (buttons & BUTTONMASK_SHIFT) {
+			tranzport_lightoff(z, light, 10);
+		} else {
+			tranzport_lighton(z, light, 10);
+		}
+	}
+}
+
+void do_lights(tranzport_t *z, uint32_t buttons)
+{
+	lights_core(z, buttons, BUTTONMASK_RECORD, LIGHT_RECORD);
+	lights_core(z, buttons, BUTTONMASK_TRACKREC, LIGHT_TRACKREC);
+	lights_core(z, buttons, BUTTONMASK_TRACKMUTE, LIGHT_TRACKMUTE);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_TRACKSOLO);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_ANYSOLO);
+	lights_core(z, buttons, BUTTONMASK_PUNCH, LIGHT_PUNCH);
+	lights_core(z, buttons, BUTTONMASK_LOOP, LIGHT_LOOP);
+}
+
+void buttons_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, char *str)
+{
+	if (buttons & buttonmask)
+		printf(" %s", str);
+}
+
+void do_buttons(tranzport_t *z, uint32_t buttons, uint8_t datawheel)
+{
+	printf("buttons: %x ", buttons);
+	buttons_core(z, buttons, BUTTONMASK_BATTERY, "battery");
+	buttons_core(z, buttons, BUTTONMASK_BACKLIGHT, "backlight");
+	buttons_core(z, buttons, BUTTONMASK_TRACKLEFT, "trackleft");
+	buttons_core(z, buttons, BUTTONMASK_TRACKRIGHT, "trackright");
+	buttons_core(z, buttons, BUTTONMASK_TRACKREC, "trackrec");
+	buttons_core(z, buttons, BUTTONMASK_TRACKMUTE, "trackmute");
+	buttons_core(z, buttons, BUTTONMASK_TRACKSOLO, "tracksolo");
+	buttons_core(z, buttons, BUTTONMASK_UNDO, "undo");
+	buttons_core(z, buttons, BUTTONMASK_IN, "in");
+	buttons_core(z, buttons, BUTTONMASK_OUT, "out");
+	buttons_core(z, buttons, BUTTONMASK_PUNCH, "punch");
+	buttons_core(z, buttons, BUTTONMASK_LOOP, "loop");
+	buttons_core(z, buttons, BUTTONMASK_PREV, "prev");
+	buttons_core(z, buttons, BUTTONMASK_ADD, "add");
+	buttons_core(z, buttons, BUTTONMASK_NEXT, "next");
+	buttons_core(z, buttons, BUTTONMASK_REWIND, "rewind");
+	buttons_core(z, buttons, BUTTONMASK_FASTFORWARD, "fastforward");
+	buttons_core(z, buttons, BUTTONMASK_STOP, "stop");
+	buttons_core(z, buttons, BUTTONMASK_PLAY, "play");
+	buttons_core(z, buttons, BUTTONMASK_RECORD, "record");
+	buttons_core(z, buttons, BUTTONMASK_SHIFT, "shift");
+	if (datawheel)
+		printf(" datawheel=%02x", datawheel);
+	printf("\n");
+}
+
+void do_lcd(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "    ", 10);
+	tranzport_lcdwrite(z, 1, "DISL", 10);
+	tranzport_lcdwrite(z, 2, "EXIA", 10);
+	tranzport_lcdwrite(z, 3, " FOR", 10);
+	tranzport_lcdwrite(z, 4, "    ", 10);
+
+	tranzport_lcdwrite(z, 5, "    ", 10);
+	tranzport_lcdwrite(z, 6, " CUR", 10);
+	tranzport_lcdwrite(z, 7, "E FO", 10);
+	tranzport_lcdwrite(z, 8, "UND ", 10);
+	tranzport_lcdwrite(z, 9, "    ", 10);
+}
+
+void do_lcd2(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "THE ", 10);
+	tranzport_lcdwrite(z, 1, "TRAN", 10);
+	tranzport_lcdwrite(z, 2, "ZPOR", 10);
+	tranzport_lcdwrite(z, 3, "T RO", 10);
+	tranzport_lcdwrite(z, 4, "  KS", 10);
+
+	tranzport_lcdwrite(z, 5, "AWES", 10);
+	tranzport_lcdwrite(z, 6, "OMEE", 10);
+	tranzport_lcdwrite(z, 7, "LEEE", 10);
+	tranzport_lcdwrite(z, 8, "UND ", 10);
+	tranzport_lcdwrite(z, 9, "GROK", 10);
+}
+
+int lights_off(tranzport_t *z) {
+	static int i = 0;
+	int j = 0;
+	for(;j<2; j++,i = (i+1) % 7) {
+	tranzport_lightoff(z, i, 10);
+	}
+return 0;
+}
+
+int lights_on(tranzport_t *z) {
+	static int i = 0;
+	int j = 0;
+	for(;j<2; j++,i = (i+1) % 7) {
+	tranzport_lighton(z, i, 10);
+	}
+return 0;
+}
+
+int main()
+{
+	tranzport_t *z;
+	uint8_t status;
+	uint32_t buttons;
+	uint8_t datawheel;
+	int val;
+
+	z = open_tranzport();
+
+	do_lcd(z);
+
+	for(;;) {
+
+	// do_lcd(z);
+	 lights_on(z);
+	// do_lcd2(z);
+
+		val = tranzport_read(z, &status, &buttons, &datawheel, 60000);
+		if (val < 0)
+			continue;
+
+		if (status == STATUS_OFFLINE) {
+			printf("offline: ");
+			continue;
+		}
+
+		if (status == STATUS_ONLINE) {
+			printf("online: ");
+			do_lcd(z);
+		}
+
+		if (status == STATUS_OK) {
+			printf("OK: ");
+			do_lcd(z);
+		}
+
+//		do_lights(z, buttons);
+		do_buttons(z, buttons, datawheel);
+		lights_off(z);
+	}
+
+	close_tranzport(z);
+
+	return 0;
+}
+
diff --git a/libs/surfaces/frontier/kernel_drivers/tests/tranzport_lights.c b/libs/surfaces/frontier/kernel_drivers/tests/tranzport_lights.c
new file mode 100644
index 0000000000..4096ee680d
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tests/tranzport_lights.c
@@ -0,0 +1,361 @@
+/*
+ * tranzport 0.1 <tranzport.sf.net>
+ * oct 18, 2005
+ * arthur@artcmusic.com
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc.h>
+
+#define VENDORID  0x165b
+#define PRODUCTID 0x8101
+
+#define READ_ENDPOINT  0x81
+#define WRITE_ENDPOINT 0x02
+
+enum {
+	LIGHT_RECORD = 0,
+	LIGHT_TRACKREC,
+	LIGHT_TRACKMUTE,
+	LIGHT_TRACKSOLO,
+	LIGHT_ANYSOLO,
+	LIGHT_LOOP,
+	LIGHT_PUNCH
+};
+
+#define BUTTONMASK_BATTERY     0x00004000
+#define BUTTONMASK_BACKLIGHT   0x00008000
+#define BUTTONMASK_TRACKLEFT   0x04000000
+#define BUTTONMASK_TRACKRIGHT  0x40000000
+#define BUTTONMASK_TRACKREC    0x00040000
+#define BUTTONMASK_TRACKMUTE   0x00400000
+#define BUTTONMASK_TRACKSOLO   0x00000400
+#define BUTTONMASK_UNDO        0x80000000
+#define BUTTONMASK_IN          0x02000000
+#define BUTTONMASK_OUT         0x20000000
+#define BUTTONMASK_PUNCH       0x00800000
+#define BUTTONMASK_LOOP        0x00080000
+#define BUTTONMASK_PREV        0x00020000
+#define BUTTONMASK_ADD         0x00200000
+#define BUTTONMASK_NEXT        0x00000200
+#define BUTTONMASK_REWIND      0x01000000
+#define BUTTONMASK_FASTFORWARD 0x10000000
+#define BUTTONMASK_STOP        0x00010000
+#define BUTTONMASK_PLAY        0x00100000
+#define BUTTONMASK_RECORD      0x00000100
+#define BUTTONMASK_SHIFT       0x08000000
+
+#define STATUS_OFFLINE 0xff
+#define STATUS_ONLINE  0x01
+#define STATUS_OK  0x00
+
+struct tranzport_s {
+	int *dev;
+	int udev;
+};
+
+typedef struct tranzport_s tranzport_t;
+
+void log_entry(FILE *fp, char *format, va_list ap)
+{
+	vfprintf(fp, format, ap);
+	fputc('\n', fp);
+}
+
+void log_error(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	log_entry(stderr, format, ap);
+	va_end(ap);
+}
+
+void vlog_error(char *format, va_list ap)
+{
+	log_entry(stderr, format, ap);
+}
+
+void die(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vlog_error(format, ap);
+	va_end(ap);
+	exit(1);
+}
+
+tranzport_t *open_tranzport_core()
+{
+	tranzport_t *z;
+	int val;
+
+	z = malloc(sizeof(tranzport_t));
+	if (!z)
+		die("not enough memory");
+	memset(z, 0, sizeof(tranzport_t));
+
+	z->udev = open("/dev/tranzport0",O_RDWR);
+	if (!z->udev)
+		die("unable to open tranzport");
+
+	return z;
+}
+
+tranzport_t *open_tranzport()
+{
+return open_tranzport_core();	
+}
+
+void close_tranzport(tranzport_t *z)
+{
+	int val;
+
+	val = close(z->udev);
+	if (val < 0)
+		log_error("unable to release tranzport");
+
+	free(z);
+}
+
+int tranzport_write_core(tranzport_t *z, uint8_t *cmd, int timeout)
+{
+	int val;
+	val = write(z->udev, cmd, 8);
+	if (val < 0)
+		return val;
+	if (val != 8)
+		return -1;
+	return 0;
+}
+
+int tranzport_lcdwrite(tranzport_t *z, uint8_t cell, char *text, int timeout)
+{
+	uint8_t cmd[8];
+
+	if (cell > 9) {
+		return -1;
+	}
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x01;
+	cmd[2] = cell;
+	cmd[3] = text[0];
+	cmd[4] = text[1];
+	cmd[5] = text[2];
+	cmd[6] = text[3];
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_lighton(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x01;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_lightoff(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x00;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_read(tranzport_t *z, uint8_t *status, uint32_t *buttons, uint8_t *datawheel, int timeout)
+{
+	uint8_t buf[8];
+	int val;
+	
+	memset(buf, 0xff, 8);
+	val = read(z->udev, buf, 8);
+	if (val < 0) {
+		// printf("errno: %d\n",errno);
+		return val;
+	}
+	if (val != 8)
+		return -1;
+
+	/*printf("read: %02x %02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);*/
+
+	*status = buf[1];
+
+	*buttons = 0;
+	*buttons |= buf[2] << 24;
+	*buttons |= buf[3] << 16;
+	*buttons |= buf[4] << 8;
+	*buttons |= buf[5];
+
+	*datawheel = buf[6];
+
+	return 0;
+}
+
+void lights_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, uint8_t light)
+{
+	if (buttons & buttonmask) {
+		if (buttons & BUTTONMASK_SHIFT) {
+			tranzport_lightoff(z, light, 1000);
+		} else {
+			tranzport_lighton(z, light, 1000);
+		}
+	}
+}
+
+void do_lights(tranzport_t *z, uint32_t buttons)
+{
+	lights_core(z, buttons, BUTTONMASK_RECORD, LIGHT_RECORD);
+	lights_core(z, buttons, BUTTONMASK_TRACKREC, LIGHT_TRACKREC);
+	lights_core(z, buttons, BUTTONMASK_TRACKMUTE, LIGHT_TRACKMUTE);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_TRACKSOLO);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_ANYSOLO);
+	lights_core(z, buttons, BUTTONMASK_PUNCH, LIGHT_PUNCH);
+	lights_core(z, buttons, BUTTONMASK_LOOP, LIGHT_LOOP);
+}
+
+void buttons_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, char *str)
+{
+	if (buttons & buttonmask)
+		printf(" %s", str);
+}
+
+void do_buttons(tranzport_t *z, uint32_t buttons, uint8_t datawheel)
+{
+	printf("buttons: %x ", buttons);
+	buttons_core(z, buttons, BUTTONMASK_BATTERY, "battery");
+	buttons_core(z, buttons, BUTTONMASK_BACKLIGHT, "backlight");
+	buttons_core(z, buttons, BUTTONMASK_TRACKLEFT, "trackleft");
+	buttons_core(z, buttons, BUTTONMASK_TRACKRIGHT, "trackright");
+	buttons_core(z, buttons, BUTTONMASK_TRACKREC, "trackrec");
+	buttons_core(z, buttons, BUTTONMASK_TRACKMUTE, "trackmute");
+	buttons_core(z, buttons, BUTTONMASK_TRACKSOLO, "tracksolo");
+	buttons_core(z, buttons, BUTTONMASK_UNDO, "undo");
+	buttons_core(z, buttons, BUTTONMASK_IN, "in");
+	buttons_core(z, buttons, BUTTONMASK_OUT, "out");
+	buttons_core(z, buttons, BUTTONMASK_PUNCH, "punch");
+	buttons_core(z, buttons, BUTTONMASK_LOOP, "loop");
+	buttons_core(z, buttons, BUTTONMASK_PREV, "prev");
+	buttons_core(z, buttons, BUTTONMASK_ADD, "add");
+	buttons_core(z, buttons, BUTTONMASK_NEXT, "next");
+	buttons_core(z, buttons, BUTTONMASK_REWIND, "rewind");
+	buttons_core(z, buttons, BUTTONMASK_FASTFORWARD, "fastforward");
+	buttons_core(z, buttons, BUTTONMASK_STOP, "stop");
+	buttons_core(z, buttons, BUTTONMASK_PLAY, "play");
+	buttons_core(z, buttons, BUTTONMASK_RECORD, "record");
+	buttons_core(z, buttons, BUTTONMASK_SHIFT, "shift");
+	if (datawheel)
+		printf(" datawheel=%02x", datawheel);
+	printf("\n");
+}
+
+void do_lcd(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "    ", 1000);
+	tranzport_lcdwrite(z, 1, "DISL", 1000);
+	tranzport_lcdwrite(z, 2, "EXIA", 1000);
+	tranzport_lcdwrite(z, 3, " FOR", 1000);
+	tranzport_lcdwrite(z, 4, "    ", 1000);
+
+	tranzport_lcdwrite(z, 5, "    ", 1000);
+	tranzport_lcdwrite(z, 6, " CUR", 1000);
+	tranzport_lcdwrite(z, 7, "E FO", 1000);
+	tranzport_lcdwrite(z, 8, "UND ", 1000);
+	tranzport_lcdwrite(z, 9, "    ", 1000);
+}
+
+void do_lcd2(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "THE ", 1000);
+	tranzport_lcdwrite(z, 1, "TRAN", 1000);
+	tranzport_lcdwrite(z, 2, "ZPOR", 1000);
+	tranzport_lcdwrite(z, 3, "T RO", 1000);
+	tranzport_lcdwrite(z, 4, "KS  ", 1000);
+
+	tranzport_lcdwrite(z, 5, "AWES", 1000);
+	tranzport_lcdwrite(z, 6, "OMEE", 1000);
+	tranzport_lcdwrite(z, 7, "LEEE", 1000);
+	tranzport_lcdwrite(z, 8, "WITH", 1000);
+	tranzport_lcdwrite(z, 9, "ARDO", 1000);
+}
+
+lights_off(tranzport_t *z) {
+int i;
+	for(i=0;i<7;i++) {
+	tranzport_lightoff(z, i, 1000);
+	}
+}
+
+lights_on(tranzport_t *z) {
+int i;
+	for(i=0;i<7;i++) {
+	tranzport_lighton(z, i, 1000);
+	}
+}
+
+int main()
+{
+	tranzport_t *z;
+	uint8_t status;
+	uint32_t buttons;
+	uint8_t datawheel;
+	int val;
+
+	z = open_tranzport();
+
+	do_lcd(z);
+
+	for(;;) {
+
+	do_lcd(z);
+	lights_on(z);
+	do_lcd2(z);
+	lights_off(z);
+
+//		val = tranzport_read(z, &status, &buttons, &datawheel, 60000);
+ 		val = -1;
+		if (val < 0)
+			continue;
+
+		if (status == STATUS_OFFLINE) {
+			printf("offline: ");
+			continue;
+		}
+
+		if (status == STATUS_ONLINE) {
+			printf("online: ");
+			do_lcd(z);
+		}
+
+		do_lights(z, buttons);
+		do_buttons(z, buttons, datawheel);
+	}
+
+	close_tranzport(z);
+
+	return 0;
+}
+
diff --git a/libs/surfaces/frontier/kernel_drivers/tests/tranzport_tests.sh b/libs/surfaces/frontier/kernel_drivers/tests/tranzport_tests.sh
new file mode 100755
index 0000000000..540c62fe16
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tests/tranzport_tests.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+echo "Testing lights"
+tranzport_lights &
+A=$!
+sleep 30
+kill $A
+echo "Testing interleaved_reads/writes"
+tranzport &
+A=$!
+sleep 30
+kill $A
+
+exit 0
+
+# not done yet
+echo "Testing_screen"
+tranzport_screen &
+A=$!
+sleep 30
+kill $A
+echo "Testing_reads"
+tranzport_read &
+A=$!
+sleep 30
+kill $A
+
diff --git a/libs/surfaces/frontier/kernel_drivers/tranzport.c b/libs/surfaces/frontier/kernel_drivers/tranzport.c
new file mode 100644
index 0000000000..6893f66921
--- /dev/null
+++ b/libs/surfaces/frontier/kernel_drivers/tranzport.c
@@ -0,0 +1,1065 @@
+/*
+ * Frontier Designs Tranzport driver
+ *
+ * Copyright (C) 2007 Michael Taht (m@taht.net)
+ *
+ * Based on the usbled driver and ldusb drivers by
+ *
+ * Copyright (C) 2004 Greg Kroah-Hartman (greg@kroah.com)
+ * Copyright (C) 2005 Michael Hund <mhund@ld-didactic.de>
+ * 
+ * The ldusb driver was, in turn, derived from Lego USB Tower driver
+ * Copyright (C) 2003 David Glance <advidgsf@sourceforge.net>
+ *		 2001-2004 Juergen Stuber <starblue@users.sourceforge.net>
+ *
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU General Public License as
+ *	published by the Free Software Foundation, version 2.
+ *
+ */
+
+/**
+ * This driver uses a ring buffer for time critical reading of
+ * interrupt in reports and provides read and write methods for
+ * raw interrupt reports.
+ */
+
+/* Note: this currently uses a dumb ringbuffer for reads and writes.
+ * A more optimal driver would cache and kill off outstanding urbs that are 
+ * now invalid, and ignore ones that already were in the queue but valid
+ * as we only have 17 commands for the tranzport. In particular this is
+ * key for getting lights to flash in time as otherwise many commands 
+ * can be buffered up before the light change makes it to the interface.
+*/
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/version.h>
+
+#include <asm/uaccess.h>
+#include <linux/input.h>
+#include <linux/usb.h>
+#include <linux/poll.h>
+
+/* Define these values to match your devices */
+#define VENDOR_ID       0x165b
+#define PRODUCT_ID	0x8101
+
+#ifdef CONFIG_USB_DYNAMIC_MINORS
+#define USB_TRANZPORT_MINOR_BASE	0
+#else
+// FIXME 176 - is the ldusb driver's minor - apply for that
+#define USB_TRANZPORT_MINOR_BASE	176
+#endif
+
+/* table of devices that work with this driver */
+static struct usb_device_id usb_tranzport_table [] = {
+	{ USB_DEVICE(VENDOR_ID, PRODUCT_ID) },
+	{ }					/* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, usb_tranzport_table);
+MODULE_VERSION("0.29");
+MODULE_AUTHOR("Mike Taht <m@taht.net>");
+MODULE_DESCRIPTION("Tranzport USB Driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("Frontier Designs Control Surface");
+
+
+/* make this work on older kernel versions */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+
+/**
+ * usb_endpoint_dir_out - check if the endpoint has OUT direction
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type OUT, otherwise it returns false.
+ */
+
+static inline int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
+{
+       return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
+}
+
+static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+{
+       return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
+}
+
+
+/**
+ * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type interrupt, otherwise it returns
+ * false.
+ */
+static inline int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
+{
+       return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+               USB_ENDPOINT_XFER_INT);
+}
+
+
+/**
+ * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and IN direction,
+ * otherwise it returns false.
+ */
+
+static inline int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
+{
+       return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
+}
+
+/**
+ * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+
+static inline int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
+{
+       return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
+}
+
+#endif /* older kernel versions */
+
+/* These two aren't done yet */
+
+#define SUPPRESS_EXTRA_ONLINE_EVENTS 0
+#define BUFFERED_WRITES 0
+
+#define SUPPRESS_EXTRA_OFFLINE_EVENTS 1
+#define COMPRESS_WHEEL_EVENTS 1
+#define BUFFERED_READS 1
+#define RING_BUFFER_SIZE 1000
+#define WRITE_BUFFER_SIZE 34
+#define TRANZPORT_USB_TIMEOUT 10
+
+
+static int debug = 0;
+
+/* Use our own dbg macro */
+#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
+
+/* Module parameters */
+
+module_param(debug, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
+
+/* All interrupt in transfers are collected in a ring buffer to
+ * avoid racing conditions and get better performance of the driver.
+ */
+
+static int ring_buffer_size = RING_BUFFER_SIZE;
+
+module_param(ring_buffer_size, int,  S_IRUGO);
+MODULE_PARM_DESC(ring_buffer_size, "Read ring buffer size in reports");
+
+/* The write_buffer can one day contain more than one interrupt out transfer.
+ */
+static int write_buffer_size = WRITE_BUFFER_SIZE;
+module_param(write_buffer_size, int,  S_IRUGO);
+MODULE_PARM_DESC(write_buffer_size, "Write buffer size");
+
+/* 
+ * Increase the interval for debugging purposes.
+ * or set to 1 to use the standard interval from the endpoint descriptors.
+ */
+
+static int min_interrupt_in_interval = TRANZPORT_USB_TIMEOUT;
+module_param(min_interrupt_in_interval, int, 0);
+MODULE_PARM_DESC(min_interrupt_in_interval, "Minimum interrupt in interval in ms");
+
+static int min_interrupt_out_interval = TRANZPORT_USB_TIMEOUT;
+module_param(min_interrupt_out_interval, int, 0);
+MODULE_PARM_DESC(min_interrupt_out_interval, "Minimum interrupt out interval in ms");
+
+struct tranzport_cmd {
+    unsigned char cmd[8];
+};
+
+/* Structure to hold all of our device specific stuff */
+struct usb_tranzport {
+	struct semaphore	sem;		/* locks this structure */
+	struct usb_interface*	intf;		/* save off the usb interface pointer */
+
+	int			open_count;	/* number of times this port has been opened */
+
+	struct tranzport_cmd	(*ring_buffer)[RING_BUFFER_SIZE]; /* just make c happy */
+	unsigned int		ring_head;
+	unsigned int		ring_tail;
+
+	wait_queue_head_t	read_wait;
+	wait_queue_head_t	write_wait;
+
+	unsigned char*		interrupt_in_buffer;
+	struct usb_endpoint_descriptor* interrupt_in_endpoint;
+	struct urb*		interrupt_in_urb;
+	int			interrupt_in_interval;
+	size_t			interrupt_in_endpoint_size;
+	int			interrupt_in_running;
+	int			interrupt_in_done;
+
+	char*			interrupt_out_buffer;
+	struct usb_endpoint_descriptor* interrupt_out_endpoint;
+	struct urb*		interrupt_out_urb;
+	int			interrupt_out_interval;
+	size_t			interrupt_out_endpoint_size;
+	int			interrupt_out_busy;
+
+	/* Sysfs support - most of these are not hooked up yet */
+
+    int event; /* alternate interface to events */
+    int wheel; /* - for negative, 0 for none, + for positive */
+    int lights; 
+    unsigned char dump_state; /* 0 if disabled 1 if enabled */
+    unsigned char enable; /* 0 if disabled 1 if enabled */
+    unsigned char offline; /* if the device is out of range or asleep */
+    unsigned char compress_wheel; /* flag to compress wheel events */
+    unsigned char  LightRecord;
+    unsigned char  LightTrackrec;
+    unsigned char  LightTrackmute;
+    unsigned char  LightTracksolo;
+    unsigned char  LightAnysolo;
+    unsigned char  LightLoop;
+    unsigned char  LightPunch;
+    unsigned char  last_cmd[8];
+    unsigned char  screen[40]; // We'll also have cells
+	
+};
+
+/* prevent races between open() and disconnect() */
+static DEFINE_MUTEX(disconnect_mutex);
+
+static struct usb_driver usb_tranzport_driver;
+
+/**
+ *	usb_tranzport_abort_transfers
+ *      aborts transfers and frees associated data structures
+ */
+static void usb_tranzport_abort_transfers(struct usb_tranzport *dev)
+{
+	/* shutdown transfer */
+	if (dev->interrupt_in_running) {
+		dev->interrupt_in_running = 0;
+		if (dev->intf)
+			usb_kill_urb(dev->interrupt_in_urb);
+	}
+	if (dev->interrupt_out_busy)
+		if (dev->intf)
+			usb_kill_urb(dev->interrupt_out_urb);
+}
+
+#define show_set_light(value)	\
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)		\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+									\
+	return sprintf(buf, "%d\n", t->value);			\
+}									\
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)	\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+	int temp = simple_strtoul(buf, NULL, 10);			\
+									\
+	t->value = temp;						\
+	return count;							\
+}									\
+static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
+
+show_set_light(LightRecord);
+show_set_light(LightTrackrec);
+show_set_light(LightTrackmute);
+show_set_light(LightTracksolo);
+show_set_light(LightAnysolo);
+show_set_light(LightLoop);
+show_set_light(LightPunch);
+
+show_set_light(enable);
+show_set_light(offline);
+show_set_light(compress_wheel);
+show_set_light(dump_state);
+
+#define show_set_int(value)	\
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)		\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+									\
+	return sprintf(buf, "%d\n", t->value);			\
+}									\
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)	\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+	int temp = simple_strtoul(buf, NULL, 10);			\
+									\
+	t->value = temp;						\
+	return count;							\
+}									\
+static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
+
+show_set_int(wheel);
+show_set_int(event);
+
+#define show_set_cmd(value)	\
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)		\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+									\
+	return sprintf(buf, "%d\n", t->value);			\
+}									\
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)	\
+{									\
+	struct usb_interface *intf = to_usb_interface(dev);		\
+	struct usb_tranzport *t = usb_get_intfdata(intf);			\
+	int temp = simple_strtoul(buf, NULL, 10);			\
+									\
+	t->value = temp;						\
+	return count;							\
+}									\
+static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
+
+
+
+
+/**
+ *	usb_tranzport_delete
+ */
+static void usb_tranzport_delete(struct usb_tranzport *dev)
+{
+	usb_tranzport_abort_transfers(dev);
+	/*  This is just too twisted to be correct */
+	if(dev->intf != NULL) {
+	device_remove_file(&dev->intf->dev, &dev_attr_LightRecord);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightTrackrec);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightTracksolo);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightTrackmute);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightAnysolo);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightLoop);
+	device_remove_file(&dev->intf->dev, &dev_attr_LightPunch);
+	device_remove_file(&dev->intf->dev, &dev_attr_wheel);
+	device_remove_file(&dev->intf->dev, &dev_attr_enable);
+	device_remove_file(&dev->intf->dev, &dev_attr_event);
+	device_remove_file(&dev->intf->dev, &dev_attr_offline);
+	device_remove_file(&dev->intf->dev, &dev_attr_compress_wheel);
+
+	device_remove_file(&dev->intf->dev, &dev_attr_dump_state);
+	}
+
+	/* free data structures */
+	usb_free_urb(dev->interrupt_in_urb);
+	usb_free_urb(dev->interrupt_out_urb);
+	kfree(dev->ring_buffer);
+	kfree(dev->interrupt_in_buffer);
+	kfree(dev->interrupt_out_buffer);
+	kfree(dev);
+}
+
+/**
+ *	usb_tranzport_interrupt_in_callback
+ */
+
+static void usb_tranzport_interrupt_in_callback(struct urb *urb)
+{
+	struct usb_tranzport *dev = urb->context;
+	unsigned int next_ring_head;
+	int retval = -1;
+
+	if (urb->status) {
+		if (urb->status == -ENOENT ||
+		    urb->status == -ECONNRESET ||
+		    urb->status == -ESHUTDOWN) {
+			goto exit;
+		} else {
+			dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
+				 __FUNCTION__, urb->status);
+			goto resubmit; /* maybe we can recover */
+		}
+	}
+    
+	if (urb->actual_length != 8) {
+		dev_warn(&dev->intf->dev,
+			 "Urb length was %d bytes!! Do something intelligent \n", urb->actual_length); 
+	} else {
+		dbg_info(&dev->intf->dev, "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n",
+			 __FUNCTION__, dev->interrupt_in_buffer[0],dev->interrupt_in_buffer[1],dev->interrupt_in_buffer[2],dev->interrupt_in_buffer[3],dev->interrupt_in_buffer[4],dev->interrupt_in_buffer[5],dev->interrupt_in_buffer[6],dev->interrupt_in_buffer[7]);
+#if SUPPRESS_EXTRA_OFFLINE_EVENTS
+		if(dev->offline == 2 && dev->interrupt_in_buffer[1] == 0xff) { goto resubmit; }
+		if(dev->offline == 1 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 2; goto resubmit; }
+
+/* Always pass one offline event up the stack */
+		if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; }
+		if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; }
+			
+#endif 
+		dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail);
+
+		next_ring_head = (dev->ring_head+1) % ring_buffer_size;
+	
+		if (next_ring_head != dev->ring_tail) {
+			memcpy(&((*dev->ring_buffer)[dev->ring_head]), dev->interrupt_in_buffer, urb->actual_length);
+			dev->ring_head = next_ring_head;
+			retval = 0;
+			memset(dev->interrupt_in_buffer, 0, urb->actual_length);
+		} else {
+			dev_warn(&dev->intf->dev,
+				 "Ring buffer overflow, %d bytes dropped\n",
+				 urb->actual_length);
+			memset(dev->interrupt_in_buffer, 0, urb->actual_length);
+		}
+	} 
+
+resubmit:
+	/* resubmit if we're still running */
+	if (dev->interrupt_in_running && dev->intf) {
+		retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC); 
+		if (retval)
+			dev_err(&dev->intf->dev,
+				"usb_submit_urb failed (%d)\n", retval);
+	}
+    
+exit:
+	dev->interrupt_in_done = 1;
+	wake_up_interruptible(&dev->read_wait);
+}
+
+/**
+ *	usb_tranzport_interrupt_out_callback
+ */
+static void usb_tranzport_interrupt_out_callback(struct urb *urb)
+{
+	struct usb_tranzport *dev = urb->context;
+
+	/* sync/async unlink faults aren't errors */
+	if (urb->status && !(urb->status == -ENOENT ||
+			     urb->status == -ECONNRESET ||
+			     urb->status == -ESHUTDOWN))
+		dbg_info(&dev->intf->dev,
+			 "%s - nonzero write interrupt status received: %d\n",
+			 __FUNCTION__, urb->status);
+
+	dev->interrupt_out_busy = 0;
+	wake_up_interruptible(&dev->write_wait);
+}
+
+/**
+ *	usb_tranzport_open
+ */
+static int usb_tranzport_open(struct inode *inode, struct file *file)
+{
+	struct usb_tranzport *dev;
+	int subminor;
+	int retval = 0;
+	struct usb_interface *interface;
+
+	nonseekable_open(inode, file);
+	subminor = iminor(inode);
+
+	mutex_lock(&disconnect_mutex);
+
+	interface = usb_find_interface(&usb_tranzport_driver, subminor);
+
+	if (!interface) {
+		err("%s - error, can't find device for minor %d\n",
+		     __FUNCTION__, subminor);
+		retval = -ENODEV;
+		goto unlock_disconnect_exit;
+	}
+
+	dev = usb_get_intfdata(interface);
+
+	if (!dev) {
+		retval = -ENODEV;
+		goto unlock_disconnect_exit;
+	}
+
+	/* lock this device */
+	if (down_interruptible(&dev->sem)) {
+		retval = -ERESTARTSYS;
+		goto unlock_disconnect_exit;
+	}
+
+	/* allow opening only once */
+	if (dev->open_count) {
+		retval = -EBUSY;
+		goto unlock_exit;
+	}
+	dev->open_count = 1;
+
+	/* initialize in direction */
+	dev->ring_head = 0;
+	dev->ring_tail = 0;
+	usb_fill_int_urb(dev->interrupt_in_urb,
+			 interface_to_usbdev(interface),
+			 usb_rcvintpipe(interface_to_usbdev(interface),
+					dev->interrupt_in_endpoint->bEndpointAddress),
+			 dev->interrupt_in_buffer,
+			 dev->interrupt_in_endpoint_size,
+			 usb_tranzport_interrupt_in_callback,
+			 dev,
+			 dev->interrupt_in_interval);
+
+	dev->interrupt_in_running = 1;
+	dev->interrupt_in_done = 0;
+	dev->enable = 1;
+	dev->offline = 0;
+	dev->compress_wheel = 1;
+
+	retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+	if (retval) {
+		dev_err(&interface->dev, "Couldn't submit interrupt_in_urb %d\n", retval);
+		dev->interrupt_in_running = 0;
+		dev->open_count = 0;
+		goto unlock_exit;
+	}
+
+	/* save device in the file's private structure */
+	file->private_data = dev;
+
+
+unlock_exit:
+	up(&dev->sem);
+
+unlock_disconnect_exit:
+	mutex_unlock(&disconnect_mutex);
+
+	return retval;
+}
+
+/**
+ *	usb_tranzport_release
+ */
+static int usb_tranzport_release(struct inode *inode, struct file *file)
+{
+	struct usb_tranzport *dev;
+	int retval = 0;
+
+	dev = file->private_data;
+
+	if (dev == NULL) {
+		retval = -ENODEV;
+		goto exit;
+	}
+
+	if (down_interruptible(&dev->sem)) {
+		retval = -ERESTARTSYS;
+		goto exit;
+	}
+
+	if (dev->open_count != 1) {
+		retval = -ENODEV;
+		goto unlock_exit;
+	}
+
+	if (dev->intf == NULL) {
+		/* the device was unplugged before the file was released */
+		up(&dev->sem);
+		/* unlock here as usb_tranzport_delete frees dev */
+		usb_tranzport_delete(dev);
+		retval = -ENODEV;
+		goto exit;
+	}
+
+	/* wait until write transfer is finished */
+	if (dev->interrupt_out_busy)
+		wait_event_interruptible_timeout(dev->write_wait, !dev->interrupt_out_busy, 2 * HZ);
+	usb_tranzport_abort_transfers(dev);
+	dev->open_count = 0;
+
+unlock_exit:
+	up(&dev->sem);
+
+exit:
+	return retval;
+}
+
+/**
+ *	usb_tranzport_poll
+ */
+static unsigned int usb_tranzport_poll(struct file *file, poll_table *wait)
+{
+	struct usb_tranzport *dev;
+	unsigned int mask = 0;
+
+	dev = file->private_data;
+
+	poll_wait(file, &dev->read_wait, wait);
+	poll_wait(file, &dev->write_wait, wait);
+
+	if (dev->ring_head != dev->ring_tail)
+		mask |= POLLIN | POLLRDNORM;
+	if (!dev->interrupt_out_busy)
+		mask |= POLLOUT | POLLWRNORM;
+
+	return mask;
+}
+
+/**
+ *	usb_tranzport_read
+ */
+static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t count,
+			   loff_t *ppos)
+{
+	struct usb_tranzport *dev;
+	size_t bytes_to_read;
+	int retval = 0;
+
+#if BUFFERED_READS
+	int c = 0;
+#endif
+
+#if COMPRESS_WHEEL_EVENTS
+	signed char oldwheel;
+	signed char newwheel;
+	int cancompress = 1;
+	int next_tail;
+#endif
+
+/* do I have such a thing as a null event? */
+
+	dev = file->private_data;
+
+	/* verify that we actually have some data to read */
+	if (count == 0)
+		goto exit;
+
+	/* lock this object */
+	if (down_interruptible(&dev->sem)) {
+		retval = -ERESTARTSYS;
+		goto exit;
+	}
+
+	/* verify that the device wasn't unplugged */
+	if (dev->intf == NULL) {
+		retval = -ENODEV;
+		err("No device or device unplugged %d\n", retval);
+		goto unlock_exit;
+	}
+
+	while (dev->ring_head == dev->ring_tail) {
+
+		if (file->f_flags & O_NONBLOCK) {
+			retval = -EAGAIN;
+			goto unlock_exit;
+		}
+		// atomic_cmp_exchange(&dev->interrupt_in_done,0,0);
+		dev->interrupt_in_done = 0 ; /* tiny race - FIXME: make atomic? */
+		retval = wait_event_interruptible(dev->read_wait, dev->interrupt_in_done);
+		if (retval < 0) {
+			goto unlock_exit;
+		} 
+	}
+
+	dbg_info(&dev->intf->dev, "%s: copying to userspace: %02x%02x%02x%02x%02x%02x%02x%02x\n",
+			 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
+
+#if BUFFERED_READS
+	   c = 0;
+	   while((c < count) && (dev->ring_tail != dev->ring_head)) {
+
+/* This started off in the lower level service routine, and I moved it here. Then my brain died. Not done yet. */
+#if COMPRESS_WHEEL_EVENTS 
+		next_tail = (dev->ring_tail+1) % ring_buffer_size;
+		if(dev->compress_wheel) cancompress = 1;
+		while(dev->ring_head != next_tail && cancompress == 1 ) { 
+			newwheel = (*dev->ring_buffer)[next_tail].cmd[6];
+			oldwheel = (*dev->ring_buffer)[dev->ring_tail].cmd[6];
+			// if both are wheel events, and no buttons have changes (FIXME, do I have to check?),
+			// and we are the same sign, we can compress +- 7F
+			// FIXME: saner check for overflow! - max of +- 7F
+			// FIXME the math is wrong for going in reverse, actually, as the midi spec doesn't allow signed chars
+
+	dbg_info(&dev->intf->dev, "%s: trying to compress: %02x%02x%02x%02x%02x %02x %02x %02x\n",
+			 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
+
+			
+			if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 && 
+			    (*dev->ring_buffer)[next_tail].cmd[6] != 0 ) && 
+				((newwheel > 0 && oldwheel > 0) || 
+				(newwheel < 0 && oldwheel < 0)) &&
+				((*dev->ring_buffer)[dev->ring_tail].cmd[2] == (*dev->ring_buffer)[next_tail].cmd[2]) &&
+				((*dev->ring_buffer)[dev->ring_tail].cmd[3] == (*dev->ring_buffer)[next_tail].cmd[3]) &&
+				((*dev->ring_buffer)[dev->ring_tail].cmd[4] == (*dev->ring_buffer)[next_tail].cmd[4]) &&
+				((*dev->ring_buffer)[dev->ring_tail].cmd[5] == (*dev->ring_buffer)[next_tail].cmd[5]))
+ {
+	dbg_info(&dev->intf->dev, "%s: should compress: %02x%02x%02x%02x%02x%02x%02x%02x\n",
+			 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
+
+				newwheel += oldwheel;
+				if(oldwheel > 0 && !(newwheel > 0)) {
+					newwheel = 0x7f; 
+					cancompress = 0;
+				}
+				if(oldwheel < 0 && !(newwheel < 0)) {
+					newwheel = 0x80; 
+					cancompress = 0;
+				}
+
+				(*dev->ring_buffer)[next_tail].cmd[6] = newwheel; 
+				dev->ring_tail = next_tail;
+				next_tail = (dev->ring_tail+1) % ring_buffer_size;
+			} else {
+				cancompress = 0;
+			}
+		}
+#endif /* COMPRESS_WHEEL_EVENTS */
+
+		if (copy_to_user(&buffer[c], &(*dev->ring_buffer)[dev->ring_tail], 8)) {
+			retval = -EFAULT;
+			goto unlock_exit;
+		}
+		
+		dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
+		c+=8;
+		dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail);
+	   }
+	   retval = c;
+	   
+#else
+	if (copy_to_user(buffer, &(*dev->ring_buffer)[dev->ring_tail], 8)) {
+		retval = -EFAULT;
+		goto unlock_exit;
+	}
+
+	dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
+	dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail);
+
+	retval = 8;
+#endif /* BUFFERED_READS */
+
+unlock_exit:
+	/* unlock the device */
+	up(&dev->sem);
+
+exit:
+	return retval;
+}
+
+/**
+ *	usb_tranzport_write
+ */
+static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
+			    size_t count, loff_t *ppos)
+{
+	struct usb_tranzport *dev;
+	size_t bytes_to_write;
+	int retval = 0;
+
+	dev = file->private_data;
+
+	/* verify that we actually have some data to write */
+	if (count == 0)
+		goto exit;
+
+	/* lock this object */
+	if (down_interruptible(&dev->sem)) {
+		retval = -ERESTARTSYS;
+		goto exit;
+	}
+
+	/* verify that the device wasn't unplugged */
+	if (dev->intf == NULL) {
+		retval = -ENODEV;
+		err("No device or device unplugged %d\n", retval);
+		goto unlock_exit;
+	}
+
+	/* wait until previous transfer is finished */
+	if (dev->interrupt_out_busy) {
+		if (file->f_flags & O_NONBLOCK) {
+			retval = -EAGAIN;
+			goto unlock_exit;
+		}
+		retval = wait_event_interruptible(dev->write_wait, !dev->interrupt_out_busy);
+		if (retval < 0) {
+			goto unlock_exit;
+		}
+	}
+
+	/* write the data into interrupt_out_buffer from userspace */
+	bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size);
+	if (bytes_to_write < count)
+		dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write);
+
+	dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __FUNCTION__, count, bytes_to_write);
+
+	if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
+		retval = -EFAULT;
+		goto unlock_exit;
+	}
+
+	if (dev->interrupt_out_endpoint == NULL) {
+		err("Endpoint should not be be null! \n");
+		goto unlock_exit;
+	}
+
+	/* send off the urb */
+	usb_fill_int_urb(dev->interrupt_out_urb,
+			 interface_to_usbdev(dev->intf),
+			 usb_sndintpipe(interface_to_usbdev(dev->intf),
+					dev->interrupt_out_endpoint->bEndpointAddress),
+			 dev->interrupt_out_buffer,
+			 bytes_to_write,
+			 usb_tranzport_interrupt_out_callback,
+			 dev,
+			 dev->interrupt_out_interval);
+
+	dev->interrupt_out_busy = 1;
+	wmb();
+
+	retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
+	if (retval) {
+		dev->interrupt_out_busy = 0;
+		err("Couldn't submit interrupt_out_urb %d\n", retval);
+		goto unlock_exit;
+	}
+	retval = bytes_to_write;
+
+unlock_exit:
+	/* unlock the device */
+	up(&dev->sem);
+
+exit:
+	return retval;
+}
+
+/* file operations needed when we register this driver */
+static const struct file_operations usb_tranzport_fops = {
+	.owner =	THIS_MODULE,
+	.read  =	usb_tranzport_read,
+	.write =	usb_tranzport_write,
+	.open =		usb_tranzport_open,
+	.release =	usb_tranzport_release,
+	.poll =		usb_tranzport_poll,
+};
+
+/*
+ * usb class driver info in order to get a minor number from the usb core,
+ * and to have the device registered with the driver core
+ */
+static struct usb_class_driver usb_tranzport_class = {
+	.name =		"tranzport%d",
+	.fops =		&usb_tranzport_fops,
+	.minor_base =	USB_TRANZPORT_MINOR_BASE,
+};
+
+
+/**
+ *	usb_tranzport_probe
+ *
+ *	Called by the usb core when a new device is connected that it thinks
+ *	this driver might be interested in.
+ */
+static int usb_tranzport_probe(struct usb_interface *intf, const struct usb_device_id *id)
+{
+	struct usb_device *udev = interface_to_usbdev(intf);
+	struct usb_tranzport *dev = NULL;
+	struct usb_host_interface *iface_desc;
+	struct usb_endpoint_descriptor *endpoint;
+	int i;
+	int true_size;
+	int retval = -ENOMEM;
+
+	/* allocate memory for our device state and intialize it */
+
+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	if (dev == NULL) {
+		dev_err(&intf->dev, "Out of memory\n");
+		goto exit;
+	}
+	init_MUTEX(&dev->sem);
+	dev->intf = intf;
+	init_waitqueue_head(&dev->read_wait);
+	init_waitqueue_head(&dev->write_wait);
+
+	iface_desc = intf->cur_altsetting;
+
+	/* set up the endpoint information */
+	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+		endpoint = &iface_desc->endpoint[i].desc;
+
+		if (usb_endpoint_is_int_in(endpoint))
+			dev->interrupt_in_endpoint = endpoint;
+
+		if (usb_endpoint_is_int_out(endpoint))
+			dev->interrupt_out_endpoint = endpoint;
+	}
+	if (dev->interrupt_in_endpoint == NULL) {
+		dev_err(&intf->dev, "Interrupt in endpoint not found\n");
+		goto error;
+	}
+	if (dev->interrupt_out_endpoint == NULL)
+		dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n");
+
+
+	dev->interrupt_in_endpoint_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize);
+
+	if (dev->interrupt_in_endpoint_size != 8)
+	    dev_warn(&intf->dev, "Interrupt in endpoint size is not 8!\n");
+
+	if(ring_buffer_size == 0) { ring_buffer_size = RING_BUFFER_SIZE; }
+	true_size = min(ring_buffer_size,RING_BUFFER_SIZE);
+	/* FIXME - there are more usb_alloc routines for dma correctness. Needed? */
+
+	dev->ring_buffer = kmalloc((true_size*sizeof(struct tranzport_cmd))+8, GFP_KERNEL); 
+
+	if (!dev->ring_buffer) {
+		dev_err(&intf->dev, "Couldn't allocate ring_buffer of size %d\n",true_size);
+		goto error;
+	}
+	dev->interrupt_in_buffer = kmalloc(dev->interrupt_in_endpoint_size, GFP_KERNEL); 
+	if (!dev->interrupt_in_buffer) {
+		dev_err(&intf->dev, "Couldn't allocate interrupt_in_buffer\n");
+		goto error;
+	}
+	dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+	if (!dev->interrupt_in_urb) {
+		dev_err(&intf->dev, "Couldn't allocate interrupt_in_urb\n");
+		goto error;
+	}
+	dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize) :
+									 udev->descriptor.bMaxPacketSize0;
+
+	if (dev->interrupt_out_endpoint_size !=8)
+		dev_warn(&intf->dev, "Interrupt out endpoint size is not 8!)\n");
+
+	dev->interrupt_out_buffer = kmalloc(write_buffer_size*dev->interrupt_out_endpoint_size, GFP_KERNEL);
+	if (!dev->interrupt_out_buffer) {
+		dev_err(&intf->dev, "Couldn't allocate interrupt_out_buffer\n");
+		goto error;
+	}
+	dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
+	if (!dev->interrupt_out_urb) {
+		dev_err(&intf->dev, "Couldn't allocate interrupt_out_urb\n");
+		goto error;
+	}
+	dev->interrupt_in_interval = min_interrupt_in_interval > dev->interrupt_in_endpoint->bInterval ? min_interrupt_in_interval : dev->interrupt_in_endpoint->bInterval;
+	if (dev->interrupt_out_endpoint)
+		dev->interrupt_out_interval = min_interrupt_out_interval > dev->interrupt_out_endpoint->bInterval ? min_interrupt_out_interval : dev->interrupt_out_endpoint->bInterval;
+
+	/* we can register the device now, as it is ready */
+	usb_set_intfdata(intf, dev);
+
+	retval = usb_register_dev(intf, &usb_tranzport_class);
+	if (retval) {
+		/* something prevented us from registering this driver */
+		dev_err(&intf->dev, "Not able to get a minor for this device.\n");
+		usb_set_intfdata(intf, NULL);
+		goto error;
+	}
+
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightRecord))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightTrackrec))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightTrackmute))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightTracksolo))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightAnysolo))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightLoop))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_LightPunch))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_wheel))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_event))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_dump_state))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_compress_wheel))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_enable))) goto error;
+	if((retval = device_create_file(&intf->dev, &dev_attr_offline))) goto error;
+
+	/* let the user know what node this device is now attached to */
+	dev_info(&intf->dev, "Tranzport Device #%d now attached to major %d minor %d\n",
+		(intf->minor - USB_TRANZPORT_MINOR_BASE), USB_MAJOR, intf->minor);
+
+exit:
+	return retval;
+
+error:
+	usb_tranzport_delete(dev);
+
+	return retval;
+}
+
+/**
+ *	usb_tranzport_disconnect
+ *
+ *	Called by the usb core when the device is removed from the system.
+ */
+static void usb_tranzport_disconnect(struct usb_interface *intf)
+{
+	struct usb_tranzport *dev;
+	int minor;
+
+	/* FIXME: The skel code calls lock_kernel here, doesn't use a mutex, needed? */
+	mutex_lock(&disconnect_mutex);
+
+	dev = usb_get_intfdata(intf);
+	usb_set_intfdata(intf, NULL);
+
+	down(&dev->sem);
+
+	minor = intf->minor;
+
+	/* give back our minor */
+	usb_deregister_dev(intf, &usb_tranzport_class);
+
+	/* if the device is not opened, then we clean up right now */
+	if (!dev->open_count) {
+		up(&dev->sem);
+		usb_tranzport_delete(dev);
+	} else {
+		dev->intf = NULL;
+		up(&dev->sem);
+	}
+
+	mutex_unlock(&disconnect_mutex);
+
+	dev_info(&intf->dev, "Tranzport Surface #%d now disconnected\n",
+		 (minor - USB_TRANZPORT_MINOR_BASE));
+}
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver usb_tranzport_driver = {
+	.name =		"tranzport",
+	.probe =	usb_tranzport_probe,
+	.disconnect =	usb_tranzport_disconnect,
+	.id_table =	usb_tranzport_table,
+};
+
+/**
+ *	usb_tranzport_init
+ */
+static int __init usb_tranzport_init(void)
+{
+	int retval;
+
+	/* register this driver with the USB subsystem */
+	retval = usb_register(&usb_tranzport_driver);
+	if (retval)
+		err("usb_register failed for the "__FILE__" driver. Error number %d\n", retval);
+
+	return retval;
+}
+
+/**
+ *	usb_tranzport_exit
+ */
+static void __exit usb_tranzport_exit(void)
+{
+	/* deregister this driver with the USB subsystem */
+	usb_deregister(&usb_tranzport_driver);
+}
+
+module_init(usb_tranzport_init);
+module_exit(usb_tranzport_exit);
+
diff --git a/libs/surfaces/frontier/tests/Makefile b/libs/surfaces/frontier/tests/Makefile
new file mode 100644
index 0000000000..aafb9aaa57
--- /dev/null
+++ b/libs/surfaces/frontier/tests/Makefile
@@ -0,0 +1,17 @@
+# Some basic utilities for testing the tranzport's I/O
+# eventually "tranzport" will become a flexible command
+#
+#
+all: tranzport tranzport_lights
+
+tranzport: tranzport.c
+	gcc -g -Wall -o tranzport tranzport.c 
+
+tranzport_lights: tranzport_lights.c
+	gcc -g -Wall -o tranzport_lights tranzport_lights.c 
+
+clean:: 
+	rm -f core .*.cmd *.o *.ko *.mod.c Module.symvers *.bak .\#* *~
+	rm -rf .tmp_versions tranzport tranzport_lights
+
+
diff --git a/libs/surfaces/frontier/tests/README b/libs/surfaces/frontier/tests/README
new file mode 100644
index 0000000000..f9efd18f69
--- /dev/null
+++ b/libs/surfaces/frontier/tests/README
@@ -0,0 +1,104 @@
+tranzport 0.1 <tranzport.sf.net>
+oct 18, 2005
+arthur@artcmusic.com
+---
+
+The Frontier Design Tranzport(tm) (www.frontierdesign.com) is a simple
+wireless USB device. It is not a MIDI device. The document on their web
+site "Tranzport(tm) Native Mode Interface Description" describes the
+Tranzport(tm) as if it were a MIDI device, but this is implemented by their
+Windows and Macintosh software drivers.
+
+This code will allow you to use your Tranzport(tm) at a lower level of
+abstraction. This code relies on libusb, which can be obtained from
+libusb.sourceforge.net.
+
+To compile the program, type "make". You should end up with a executable
+called "tranzport". You'll probably have to run this program as root.
+
+Using the program is straightforward. It will simply tell you which
+buttons are being pressed and what not. If you press one of the buttons
+with a light, the light will turn on. If you hold shift and press one of
+the buttons with a light, the light will turn off. If you take out the
+batteries to the device (or go out of range), it will tell you that the
+device is offline. When you replace the batteries (or come back in
+range), it should tell you it is back online.
+
+Once you understand how everything works, you should be able to
+incorporate it into your own setup however you wish.
+
+This code was developed on a Linux machine, but (theoretically) it
+should work on any system that is supported by libusb, since that is how
+it communicates with the device.
+
+Here are a few more details about the device:
+
+There are two endpoints for communication with the device. All data
+reads and writes are done in 8-byte segments.
+
+One endpoint is for interrupt reads. This is used to read button data 
+from the device. It also supplies status information for when the device 
+goes out of range and comes back in range, loses power and regains 
+power, etc. The format of the data is:
+
+    00 ss bb bb bb bb dd 00  (hexadecimal)
+
+where:
+
+    ss - status code, 01=online ff=offline
+    bb - button bits
+    dd - data wheel, 01-3f=forward 41-7f=backward
+
+Please refer to the source code for a list of the button bits.
+
+The other endpoint is for interrupt writes. This is used to toggle the
+lights on the device, and to write data to the LCD.
+
+There are 7 lights on the device. To turn a light on, send the following 
+sequence of bytes:
+
+    00 00 nn 01 00 00 00 00  (hexadecimal)
+
+where nn is the light number.
+
+To turn a light off:
+
+    00 00 nn 00 00 00 00 00  (hexadecimal)
+
+Here is the list of lights:
+
+    00  Record
+    01  Track Rec
+    02  Track Mute
+    03  Track Solo
+    04  Any Solo
+    05  Loop
+    06  Punch
+
+The size of the LCD is 20x2, and it is split into 10 cells, each cell
+being 4 characters wide. The cells progress across, then down. To write
+to the LCD, send the following sequence of bytes:
+
+    00 01 cc aa aa aa aa 00  (hexadecimal)
+
+where:
+
+    cc - cell number
+    aa - ASCII code
+
+Here is a list of the cells to clarify:
+
+    00  row 0, column 0-3
+    01  row 0, column 4-7
+    02  row 0, column 8-11
+    03  row 0, column 12-15
+    04  row 0, column 16-19
+    05  row 1, column 0-3
+    06  row 1, column 4-7
+    07  row 1, column 8-11
+    08  row 1, column 12-15
+    09  row 1, column 16-19
+
+You should refer to the "Tranzport(tm) Native Mode Interface
+Description" document for a listing of the ASCII codes the LCD uses.
+
diff --git a/libs/surfaces/frontier/tests/tranzport.c b/libs/surfaces/frontier/tests/tranzport.c
new file mode 100644
index 0000000000..1eeacd6578
--- /dev/null
+++ b/libs/surfaces/frontier/tests/tranzport.c
@@ -0,0 +1,347 @@
+/*
+ * tranzport 0.1 <tranzport.sf.net>
+ * oct 18, 2005
+ * arthur@artcmusic.com
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <usb.h>
+
+#define VENDORID  0x165b
+#define PRODUCTID 0x8101
+
+#define READ_ENDPOINT  0x81
+#define WRITE_ENDPOINT 0x02
+
+enum {
+	LIGHT_RECORD = 0,
+	LIGHT_TRACKREC,
+	LIGHT_TRACKMUTE,
+	LIGHT_TRACKSOLO,
+	LIGHT_ANYSOLO,
+	LIGHT_LOOP,
+	LIGHT_PUNCH
+};
+
+#define BUTTONMASK_BATTERY     0x00004000
+#define BUTTONMASK_BACKLIGHT   0x00008000
+#define BUTTONMASK_TRACKLEFT   0x04000000
+#define BUTTONMASK_TRACKRIGHT  0x40000000
+#define BUTTONMASK_TRACKREC    0x00040000
+#define BUTTONMASK_TRACKMUTE   0x00400000
+#define BUTTONMASK_TRACKSOLO   0x00000400
+#define BUTTONMASK_UNDO        0x80000000
+#define BUTTONMASK_IN          0x02000000
+#define BUTTONMASK_OUT         0x20000000
+#define BUTTONMASK_PUNCH       0x00800000
+#define BUTTONMASK_LOOP        0x00080000
+#define BUTTONMASK_PREV        0x00020000
+#define BUTTONMASK_ADD         0x00200000
+#define BUTTONMASK_NEXT        0x00000200
+#define BUTTONMASK_REWIND      0x01000000
+#define BUTTONMASK_FASTFORWARD 0x10000000
+#define BUTTONMASK_STOP        0x00010000
+#define BUTTONMASK_PLAY        0x00100000
+#define BUTTONMASK_RECORD      0x00000100
+#define BUTTONMASK_SHIFT       0x08000000
+
+#define STATUS_OFFLINE 0xff
+#define STATUS_ONLINE  0x01
+
+struct tranzport_s {
+	struct usb_device *dev;
+	usb_dev_handle *udev;
+};
+
+typedef struct tranzport_s tranzport_t;
+
+void log_entry(FILE *fp, char *format, va_list ap)
+{
+	vfprintf(fp, format, ap);
+	fputc('\n', fp);
+}
+
+void log_error(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	log_entry(stderr, format, ap);
+	va_end(ap);
+}
+
+void vlog_error(char *format, va_list ap)
+{
+	log_entry(stderr, format, ap);
+}
+
+void die(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vlog_error(format, ap);
+	va_end(ap);
+	exit(1);
+}
+
+tranzport_t *open_tranzport_core(struct usb_device *dev)
+{
+	tranzport_t *z;
+	int val;
+
+	z = malloc(sizeof(tranzport_t));
+	if (!z)
+		die("not enough memory");
+	memset(z, 0, sizeof(tranzport_t));
+
+	z->dev = dev;
+	z->udev = usb_open(z->dev);
+	if (!z->udev)
+		die("unable to open tranzport");
+
+	val = usb_claim_interface(z->udev, 0);
+	if (val < 0)
+		die("unable to claim tranzport");
+
+	return z;
+}
+
+tranzport_t *open_tranzport()
+{
+	struct usb_bus *bus;
+	struct usb_device *dev;
+
+	usb_init();
+	usb_find_busses();
+	usb_find_devices();
+
+	for(bus=usb_busses; bus; bus=bus->next) {
+		for(dev=bus->devices; dev; dev=dev->next) {
+			if (dev->descriptor.idVendor != VENDORID)
+				continue;
+			if (dev->descriptor.idProduct != PRODUCTID)
+				continue;
+
+			return open_tranzport_core(dev);
+		}
+	}
+
+	die("can't find tranzport");
+	return 0;
+}
+
+void close_tranzport(tranzport_t *z)
+{
+	int val;
+
+	val = usb_release_interface(z->udev, 0);
+	if (val < 0)
+		log_error("unable to release tranzport");
+
+	val = usb_close(z->udev);
+	if (val < 0)
+		log_error("unable to close tranzport");
+
+	free(z);
+}
+
+int tranzport_write_core(tranzport_t *z, uint8_t *cmd, int timeout)
+{
+	int val;
+	val = usb_interrupt_write(z->udev, WRITE_ENDPOINT, cmd, 8, timeout);
+	if (val < 0)
+		return val;
+	if (val != 8)
+		return -1;
+	return 0;
+}
+
+int tranzport_lcdwrite(tranzport_t *z, uint8_t cell, char *text, int timeout)
+{
+	uint8_t cmd[8];
+
+	if (cell > 9) {
+		return -1;
+	}
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x01;
+	cmd[2] = cell;
+	cmd[3] = text[0];
+	cmd[4] = text[1];
+	cmd[5] = text[2];
+	cmd[6] = text[3];
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_lighton(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x01;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_lightoff(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x00;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_read(tranzport_t *z, uint8_t *status, uint32_t *buttons, uint8_t *datawheel, int timeout)
+{
+	uint8_t buf[8];
+	int val;
+
+	memset(buf, 0, 8);
+	val = usb_interrupt_read(z->udev, READ_ENDPOINT, buf, 8, timeout);
+	if (val < 0)
+		return val;
+	if (val != 8)
+		return -1;
+
+	/*printf("read: %02x %02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);*/
+
+	*status = buf[1];
+
+	*buttons = 0;
+	*buttons |= buf[2] << 24;
+	*buttons |= buf[3] << 16;
+	*buttons |= buf[4] << 8;
+	*buttons |= buf[5];
+
+	*datawheel = buf[6];
+
+	return 0;
+}
+
+void lights_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, uint8_t light)
+{
+	if (buttons & buttonmask) {
+		if (buttons & BUTTONMASK_SHIFT) {
+			tranzport_lightoff(z, light, 1000);
+		} else {
+			tranzport_lighton(z, light, 1000);
+		}
+	}
+}
+
+void do_lights(tranzport_t *z, uint32_t buttons)
+{
+	lights_core(z, buttons, BUTTONMASK_RECORD, LIGHT_RECORD);
+	lights_core(z, buttons, BUTTONMASK_TRACKREC, LIGHT_TRACKREC);
+	lights_core(z, buttons, BUTTONMASK_TRACKMUTE, LIGHT_TRACKMUTE);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_TRACKSOLO);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_ANYSOLO);
+	lights_core(z, buttons, BUTTONMASK_PUNCH, LIGHT_PUNCH);
+	lights_core(z, buttons, BUTTONMASK_LOOP, LIGHT_LOOP);
+}
+
+void buttons_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, char *str)
+{
+	if (buttons & buttonmask)
+		printf(" %s", str);
+}
+
+void do_buttons(tranzport_t *z, uint32_t buttons, uint8_t datawheel)
+{
+	printf("buttons:");
+	buttons_core(z, buttons, BUTTONMASK_BATTERY, "battery");
+	buttons_core(z, buttons, BUTTONMASK_BACKLIGHT, "backlight");
+	buttons_core(z, buttons, BUTTONMASK_TRACKLEFT, "trackleft");
+	buttons_core(z, buttons, BUTTONMASK_TRACKRIGHT, "trackright");
+	buttons_core(z, buttons, BUTTONMASK_TRACKREC, "trackrec");
+	buttons_core(z, buttons, BUTTONMASK_TRACKMUTE, "trackmute");
+	buttons_core(z, buttons, BUTTONMASK_TRACKSOLO, "tracksolo");
+	buttons_core(z, buttons, BUTTONMASK_UNDO, "undo");
+	buttons_core(z, buttons, BUTTONMASK_IN, "in");
+	buttons_core(z, buttons, BUTTONMASK_OUT, "out");
+	buttons_core(z, buttons, BUTTONMASK_PUNCH, "punch");
+	buttons_core(z, buttons, BUTTONMASK_LOOP, "loop");
+	buttons_core(z, buttons, BUTTONMASK_PREV, "prev");
+	buttons_core(z, buttons, BUTTONMASK_ADD, "add");
+	buttons_core(z, buttons, BUTTONMASK_NEXT, "next");
+	buttons_core(z, buttons, BUTTONMASK_REWIND, "rewind");
+	buttons_core(z, buttons, BUTTONMASK_FASTFORWARD, "fastforward");
+	buttons_core(z, buttons, BUTTONMASK_STOP, "stop");
+	buttons_core(z, buttons, BUTTONMASK_PLAY, "play");
+	buttons_core(z, buttons, BUTTONMASK_RECORD, "record");
+	buttons_core(z, buttons, BUTTONMASK_SHIFT, "shift");
+	if (datawheel)
+		printf(" datawheel=%02x", datawheel);
+	printf("\n");
+}
+
+void do_lcd(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "    ", 1000);
+	tranzport_lcdwrite(z, 1, "DISL", 1000);
+	tranzport_lcdwrite(z, 2, "EXIA", 1000);
+	tranzport_lcdwrite(z, 3, " FOR", 1000);
+	tranzport_lcdwrite(z, 4, "    ", 1000);
+
+	tranzport_lcdwrite(z, 5, "    ", 1000);
+	tranzport_lcdwrite(z, 6, " CUR", 1000);
+	tranzport_lcdwrite(z, 7, "E FO", 1000);
+	tranzport_lcdwrite(z, 8, "UND ", 1000);
+	tranzport_lcdwrite(z, 9, "    ", 1000);
+}
+
+int main()
+{
+	tranzport_t *z;
+	uint8_t status;
+	uint32_t buttons;
+	uint8_t datawheel;
+	int val;
+
+	z = open_tranzport();
+
+	do_lcd(z);
+
+	for(;;) {
+		val = tranzport_read(z, &status, &buttons, &datawheel, 60000);
+		if (val < 0)
+			continue;
+
+		if (status == STATUS_OFFLINE) {
+			printf("offline\n");
+			continue;
+		}
+
+		if (status == STATUS_ONLINE) {
+			printf("online\n");
+			do_lcd(z);
+		}
+
+		do_lights(z, buttons);
+		do_buttons(z, buttons, datawheel);
+	}
+
+	close_tranzport(z);
+
+	return 0;
+}
+
diff --git a/libs/surfaces/frontier/tests/tranzport_lights.c b/libs/surfaces/frontier/tests/tranzport_lights.c
new file mode 100644
index 0000000000..28a8462d84
--- /dev/null
+++ b/libs/surfaces/frontier/tests/tranzport_lights.c
@@ -0,0 +1,361 @@
+/*
+ * tranzport 0.1 <tranzport.sf.net>
+ * oct 18, 2005
+ * arthur@artcmusic.com
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc.h>
+
+#define VENDORID  0x165b
+#define PRODUCTID 0x8101
+
+#define READ_ENDPOINT  0x81
+#define WRITE_ENDPOINT 0x02
+
+enum {
+	LIGHT_RECORD = 0,
+	LIGHT_TRACKREC,
+	LIGHT_TRACKMUTE,
+	LIGHT_TRACKSOLO,
+	LIGHT_ANYSOLO,
+	LIGHT_LOOP,
+	LIGHT_PUNCH
+};
+
+#define BUTTONMASK_BATTERY     0x00004000
+#define BUTTONMASK_BACKLIGHT   0x00008000
+#define BUTTONMASK_TRACKLEFT   0x04000000
+#define BUTTONMASK_TRACKRIGHT  0x40000000
+#define BUTTONMASK_TRACKREC    0x00040000
+#define BUTTONMASK_TRACKMUTE   0x00400000
+#define BUTTONMASK_TRACKSOLO   0x00000400
+#define BUTTONMASK_UNDO        0x80000000
+#define BUTTONMASK_IN          0x02000000
+#define BUTTONMASK_OUT         0x20000000
+#define BUTTONMASK_PUNCH       0x00800000
+#define BUTTONMASK_LOOP        0x00080000
+#define BUTTONMASK_PREV        0x00020000
+#define BUTTONMASK_ADD         0x00200000
+#define BUTTONMASK_NEXT        0x00000200
+#define BUTTONMASK_REWIND      0x01000000
+#define BUTTONMASK_FASTFORWARD 0x10000000
+#define BUTTONMASK_STOP        0x00010000
+#define BUTTONMASK_PLAY        0x00100000
+#define BUTTONMASK_RECORD      0x00000100
+#define BUTTONMASK_SHIFT       0x08000000
+
+#define STATUS_OFFLINE 0xff
+#define STATUS_ONLINE  0x01
+#define STATUS_OK  0x00
+
+struct tranzport_s {
+	int *dev;
+	int udev;
+};
+
+typedef struct tranzport_s tranzport_t;
+
+void log_entry(FILE *fp, char *format, va_list ap)
+{
+	vfprintf(fp, format, ap);
+	fputc('\n', fp);
+}
+
+void log_error(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	log_entry(stderr, format, ap);
+	va_end(ap);
+}
+
+void vlog_error(char *format, va_list ap)
+{
+	log_entry(stderr, format, ap);
+}
+
+void die(char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vlog_error(format, ap);
+	va_end(ap);
+	exit(1);
+}
+
+tranzport_t *open_tranzport_core()
+{
+	tranzport_t *z;
+	int val;
+
+	z = malloc(sizeof(tranzport_t));
+	if (!z)
+		die("not enough memory");
+	memset(z, 0, sizeof(tranzport_t));
+
+	z->udev = open("/dev/tranzport0",O_RDWR);
+	if (!z->udev)
+		die("unable to open tranzport");
+
+	return z;
+}
+
+tranzport_t *open_tranzport()
+{
+return open_tranzport_core();	
+}
+
+void close_tranzport(tranzport_t *z)
+{
+	int val;
+
+	val = close(z->udev);
+	if (val < 0)
+		log_error("unable to release tranzport");
+
+	free(z);
+}
+
+int tranzport_write_core(tranzport_t *z, uint8_t *cmd, int timeout)
+{
+	int val;
+	val = write(z->udev, cmd, 8);
+	if (val < 0)
+		return val;
+	if (val != 8)
+		return -1;
+	return 0;
+}
+
+int tranzport_lcdwrite(tranzport_t *z, uint8_t cell, char *text, int timeout)
+{
+	uint8_t cmd[8];
+
+	if (cell > 9) {
+		return -1;
+	}
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x01;
+	cmd[2] = cell;
+	cmd[3] = text[0];
+	cmd[4] = text[1];
+	cmd[5] = text[2];
+	cmd[6] = text[3];
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, cmd, timeout);
+}
+
+int tranzport_lighton(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x01;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_lightoff(tranzport_t *z, uint8_t light, int timeout)
+{
+	uint8_t cmd[8];
+
+	cmd[0] = 0x00;
+	cmd[1] = 0x00;
+	cmd[2] = light;
+	cmd[3] = 0x00;
+	cmd[4] = 0x00;
+	cmd[5] = 0x00;
+	cmd[6] = 0x00;
+	cmd[7] = 0x00;
+
+	return tranzport_write_core(z, &cmd[0], timeout);
+}
+
+int tranzport_read(tranzport_t *z, uint8_t *status, uint32_t *buttons, uint8_t *datawheel, int timeout)
+{
+	uint8_t buf[8];
+	int val;
+	
+	memset(buf, 0xff, 8);
+	val = read(z->udev, buf, 8);
+	if (val < 0) {
+		// printf("errno: %d\n",errno);
+		return val;
+	}
+	if (val != 8)
+		return -1;
+
+	/*printf("read: %02x %02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);*/
+
+	*status = buf[1];
+
+	*buttons = 0;
+	*buttons |= buf[2] << 24;
+	*buttons |= buf[3] << 16;
+	*buttons |= buf[4] << 8;
+	*buttons |= buf[5];
+
+	*datawheel = buf[6];
+
+	return 0;
+}
+
+void lights_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, uint8_t light)
+{
+	if (buttons & buttonmask) {
+		if (buttons & BUTTONMASK_SHIFT) {
+			tranzport_lightoff(z, light, 1000);
+		} else {
+			tranzport_lighton(z, light, 1000);
+		}
+	}
+}
+
+void do_lights(tranzport_t *z, uint32_t buttons)
+{
+	lights_core(z, buttons, BUTTONMASK_RECORD, LIGHT_RECORD);
+	lights_core(z, buttons, BUTTONMASK_TRACKREC, LIGHT_TRACKREC);
+	lights_core(z, buttons, BUTTONMASK_TRACKMUTE, LIGHT_TRACKMUTE);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_TRACKSOLO);
+	lights_core(z, buttons, BUTTONMASK_TRACKSOLO, LIGHT_ANYSOLO);
+	lights_core(z, buttons, BUTTONMASK_PUNCH, LIGHT_PUNCH);
+	lights_core(z, buttons, BUTTONMASK_LOOP, LIGHT_LOOP);
+}
+
+void buttons_core(tranzport_t *z, uint32_t buttons, uint32_t buttonmask, char *str)
+{
+	if (buttons & buttonmask)
+		printf(" %s", str);
+}
+
+void do_buttons(tranzport_t *z, uint32_t buttons, uint8_t datawheel)
+{
+	printf("buttons: %x ", buttons);
+	buttons_core(z, buttons, BUTTONMASK_BATTERY, "battery");
+	buttons_core(z, buttons, BUTTONMASK_BACKLIGHT, "backlight");
+	buttons_core(z, buttons, BUTTONMASK_TRACKLEFT, "trackleft");
+	buttons_core(z, buttons, BUTTONMASK_TRACKRIGHT, "trackright");
+	buttons_core(z, buttons, BUTTONMASK_TRACKREC, "trackrec");
+	buttons_core(z, buttons, BUTTONMASK_TRACKMUTE, "trackmute");
+	buttons_core(z, buttons, BUTTONMASK_TRACKSOLO, "tracksolo");
+	buttons_core(z, buttons, BUTTONMASK_UNDO, "undo");
+	buttons_core(z, buttons, BUTTONMASK_IN, "in");
+	buttons_core(z, buttons, BUTTONMASK_OUT, "out");
+	buttons_core(z, buttons, BUTTONMASK_PUNCH, "punch");
+	buttons_core(z, buttons, BUTTONMASK_LOOP, "loop");
+	buttons_core(z, buttons, BUTTONMASK_PREV, "prev");
+	buttons_core(z, buttons, BUTTONMASK_ADD, "add");
+	buttons_core(z, buttons, BUTTONMASK_NEXT, "next");
+	buttons_core(z, buttons, BUTTONMASK_REWIND, "rewind");
+	buttons_core(z, buttons, BUTTONMASK_FASTFORWARD, "fastforward");
+	buttons_core(z, buttons, BUTTONMASK_STOP, "stop");
+	buttons_core(z, buttons, BUTTONMASK_PLAY, "play");
+	buttons_core(z, buttons, BUTTONMASK_RECORD, "record");
+	buttons_core(z, buttons, BUTTONMASK_SHIFT, "shift");
+	if (datawheel)
+		printf(" datawheel=%02x", datawheel);
+	printf("\n");
+}
+
+void do_lcd(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "    ", 1000);
+	tranzport_lcdwrite(z, 1, "DISL", 1000);
+	tranzport_lcdwrite(z, 2, "EXIA", 1000);
+	tranzport_lcdwrite(z, 3, " FOR", 1000);
+	tranzport_lcdwrite(z, 4, "    ", 1000);
+
+	tranzport_lcdwrite(z, 5, "    ", 1000);
+	tranzport_lcdwrite(z, 6, " CUR", 1000);
+	tranzport_lcdwrite(z, 7, "E FO", 1000);
+	tranzport_lcdwrite(z, 8, "UND ", 1000);
+	tranzport_lcdwrite(z, 9, "    ", 1000);
+}
+
+void do_lcd2(tranzport_t *z)
+{
+	tranzport_lcdwrite(z, 0, "THE ", 1000);
+	tranzport_lcdwrite(z, 1, "TRAN", 1000);
+	tranzport_lcdwrite(z, 2, "ZPOR", 1000);
+	tranzport_lcdwrite(z, 3, "T RO", 1000);
+	tranzport_lcdwrite(z, 4, "  KS", 1000);
+
+	tranzport_lcdwrite(z, 5, "AWES", 1000);
+	tranzport_lcdwrite(z, 6, "OMEE", 1000);
+	tranzport_lcdwrite(z, 7, "LEEE", 1000);
+	tranzport_lcdwrite(z, 8, "UND ", 1000);
+	tranzport_lcdwrite(z, 9, "GROK", 1000);
+}
+
+lights_off(tranzport_t *z) {
+int i;
+	for(i=0;i<7;i++) {
+	tranzport_lightoff(z, i, 1000);
+	}
+}
+
+lights_on(tranzport_t *z) {
+int i;
+	for(i=0;i<7;i++) {
+	tranzport_lighton(z, i, 1000);
+	}
+}
+
+int main()
+{
+	tranzport_t *z;
+	uint8_t status;
+	uint32_t buttons;
+	uint8_t datawheel;
+	int val;
+
+	z = open_tranzport();
+
+	do_lcd(z);
+
+	for(;;) {
+
+	do_lcd(z);
+	lights_on(z);
+	do_lcd2(z);
+	lights_off(z);
+
+//		val = tranzport_read(z, &status, &buttons, &datawheel, 60000);
+ 		val = -1;
+		if (val < 0)
+			continue;
+
+		if (status == STATUS_OFFLINE) {
+			printf("offline: ");
+			continue;
+		}
+
+		if (status == STATUS_ONLINE) {
+			printf("online: ");
+			do_lcd(z);
+		}
+
+		do_lights(z, buttons);
+		do_buttons(z, buttons, datawheel);
+	}
+
+	close_tranzport(z);
+
+	return 0;
+}
+
diff --git a/libs/surfaces/frontier/tranzport/SConscript b/libs/surfaces/frontier/tranzport/SConscript
new file mode 100644
index 0000000000..099e35de52
--- /dev/null
+++ b/libs/surfaces/frontier/tranzport/SConscript
@@ -0,0 +1,56 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+tranzport = env.Copy()
+
+#
+# this defines the version number of libardour_tranzport
+# 
+
+domain = 'ardour_tranzport'
+
+tranzport.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+tranzport.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+tranzport.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+tranzport.Append(PACKAGE = domain)
+tranzport.Append(POTFILE = domain + '.pot')
+
+tranzport_files=Split("""
+interface.cc
+tranzport_control_protocol.cc
+""")
+
+tranzport.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+
+tranzport.Merge ([
+    libraries['ardour'],
+    libraries['ardour_cp'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
+    ])
+
+libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
+
+if tranzport['TRANZPORT']:
+	Default(libardour_tranzport)
+	if env['NLS']:
+		i18n (tranzport, tranzport_files, env)
+	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+				     [ 'SConscript' ] +
+				     tranzport_files + 
+				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/frontier/tranzport/interface.cc b/libs/surfaces/frontier/tranzport/interface.cc
new file mode 100644
index 0000000000..f6d0dc8206
--- /dev/null
+++ b/libs/surfaces/frontier/tranzport/interface.cc
@@ -0,0 +1,51 @@
+#include <control_protocol/control_protocol.h>
+#include "tranzport_control_protocol.h"
+
+using namespace ARDOUR;
+
+ControlProtocol*
+new_tranzport_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+{
+	TranzportControlProtocol* tcp = new TranzportControlProtocol (*s);
+
+	if (tcp->set_active (true)) {
+		delete tcp;
+		return 0;
+	}
+
+	return tcp;
+	
+}
+
+void
+delete_tranzport_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+{
+	delete cp;
+}
+
+bool
+probe_tranzport_protocol (ControlProtocolDescriptor* descriptor)
+{
+	return TranzportControlProtocol::probe();
+}
+
+static ControlProtocolDescriptor tranzport_descriptor = {
+	name : "Tranzport",
+	id : "uri://ardour.org/surfaces/tranzport:0",
+	ptr : 0,
+	module : 0,
+	mandatory : 0,
+	supports_feedback : false,
+	probe : probe_tranzport_protocol,
+	initialize : new_tranzport_protocol,
+	destroy : delete_tranzport_protocol
+};
+	
+
+extern "C" {
+ControlProtocolDescriptor* 
+protocol_descriptor () {
+	return &tranzport_descriptor;
+}
+}
+
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
new file mode 100644
index 0000000000..c874a05de5
--- /dev/null
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
@@ -0,0 +1,1949 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/* Design notes: The tranzport is a unique device, basically a 
+   20 lcd gui with 22 shift keys and 8 blinking lights. 
+
+   As such it has several unique constraints. The device exerts flow control
+   by having a usb write fail. It is pointless to retry madly at that point,
+   the device is busy, and it's not going to become unbusy very quickly. 
+
+   So writes need to be either "mandatory" or "unreliable", and therein 
+   lies the rub, as the kernel can also drop writes, and missing an
+   interrupt in userspace is also generally bad.
+
+   It will be good one day, to break the gui, keyboard, and blinking light
+   components into separate parts, but for now, this remains monolithic.
+
+   A more complex surface might have hundreds of lights and several displays.
+
+   mike.taht@gmail.com
+ */
+
+#define DEFAULT_USB_TIMEOUT 10
+#define MAX_RETRY 1
+#define MAX_TRANZPORT_INFLIGHT 4
+#define DEBUG_TRANZPORT 0
+#define HAVE_TRANZPORT_KERNEL_DRIVER 0
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include <pbd/pthread_utils.h>
+
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/tempo.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+#include "tranzport_control_protocol.h"
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
+BaseUI::RequestType Print = BaseUI::new_request_type ();
+BaseUI::RequestType SetCurrentTrack = BaseUI::new_request_type ();
+
+/* Base Tranzport cmd strings */
+
+static const uint8_t cmd_light_on[] =  { 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00 };
+static const uint8_t cmd_light_off[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+static const uint8_t cmd_write_screen[] =  { 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00 };
+
+static inline double 
+gain_to_slider_position (ARDOUR::gain_t g)
+{
+	if (g == 0) return 0;
+	return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0);
+
+}
+
+static inline ARDOUR::gain_t 
+slider_position_to_gain (double pos)
+{
+	/* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */
+	if (pos == 0.0) return 0;
+	return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
+}
+
+
+TranzportControlProtocol::TranzportControlProtocol (Session& s)
+	: ControlProtocol  (s, X_("Tranzport"))
+{
+	/* tranzport controls one track at a time */
+
+	set_route_table_size (1);
+	timeout = 6000; // what is this for?
+	buttonmask = 0;
+	_datawheel = 0;
+	_device_status = STATUS_OFFLINE;
+	udev = 0;
+	current_track_id = 0;
+	last_where = max_frames;
+	wheel_mode = WheelTimeline;
+	wheel_shift_mode = WheelShiftGain;
+	wheel_increment = WheelIncrScreen;
+	bling_mode = BlingOff;
+	timerclear (&last_wheel_motion);
+	last_wheel_dir = 1;
+	last_track_gain = FLT_MAX;
+	display_mode = DisplayNormal;
+	gain_fraction = 0.0;
+	invalidate();
+	screen_init();
+	lights_init();
+	print(0,0,"!!Welcome to Ardour!!");
+	print(1,0,"!Peace through Music!");
+}
+
+void TranzportControlProtocol::light_validate (LightID light) 
+{
+	lights_invalid[light] = 0;
+}
+
+void TranzportControlProtocol::light_invalidate (LightID light) 
+{
+	lights_invalid[light] = 1;
+}
+
+void TranzportControlProtocol::lights_validate () 
+{
+	memset (lights_invalid, 0, sizeof (lights_invalid)); 
+}
+
+void TranzportControlProtocol::lights_invalidate () 
+{
+	memset (lights_invalid, 1, sizeof (lights_invalid)); 
+}
+
+void TranzportControlProtocol::lights_init()
+{
+	for (uint32_t i = 0; i < sizeof(lights_current)/sizeof(lights_current[0]); i++) {
+		lights_invalid[i] = lights_current[i] = 
+			lights_pending[i] = lights_flash[i] = false;
+	}
+}
+
+
+
+int
+TranzportControlProtocol::lights_flush ()
+{
+	if ( _device_status == STATUS_OFFLINE) { return (0); }
+
+	//  Figure out iterators one day soon
+	//  for (LightID i = i.start(), i = i.end(); i++) {
+	//  if (lights_pending[i] != lights_current[i] || lights_invalid[i]) {
+	//    if (light_set(i, lights_pending[i])) { 
+	//       return i-1;
+	//    } 
+	//  }
+	//}
+	if ((lights_pending[LightRecord] != lights_current[LightRecord]) || lights_invalid[LightRecord]) {
+		if (light_set(LightRecord,lights_pending[LightRecord])) {
+			return 1;
+		}
+	}
+	if ((lights_pending[LightTrackrec] != lights_current[LightTrackrec]) || lights_invalid[LightTrackrec]) {
+		if (light_set(LightTrackrec,lights_pending[LightTrackrec])) {
+			return 1;
+		}
+	}
+
+	if ((lights_pending[LightTrackmute] != lights_current[LightTrackmute]) || lights_invalid[LightTrackmute]) {
+		if (light_set(LightTrackmute,lights_pending[LightTrackmute])) {
+			return 1;
+		}
+	}
+
+	if ((lights_pending[LightTracksolo] != lights_current[LightTracksolo]) || lights_invalid[LightTracksolo]) {
+		if (light_set(LightTracksolo,lights_pending[LightTracksolo])) {
+			return 1;
+		}
+	}
+	if ((lights_pending[LightAnysolo] != lights_current[LightAnysolo]) || lights_invalid[LightAnysolo]) {
+		if (light_set(LightAnysolo,lights_pending[LightAnysolo])) {
+			return 1;
+		}
+	}
+	if ((lights_pending[LightLoop] != lights_current[LightLoop]) || lights_invalid[LightLoop]) {
+		if (light_set(LightLoop,lights_pending[LightLoop])) {
+			return 1;
+		}
+	}
+	if ((lights_pending[LightPunch] != lights_current[LightPunch]) || lights_invalid[LightPunch]) {
+		if (light_set(LightPunch,lights_pending[LightPunch])) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+// Screen specific commands
+
+void
+TranzportControlProtocol::screen_clear ()
+{
+	const char *blank = "                    ";
+	print(0,0,blank); 
+	print(1,0,blank);
+}
+
+void TranzportControlProtocol::screen_invalidate ()
+{
+	for(int row = 0; row < 2; row++) {
+		for(int col = 0; col < 20; col++) {
+			screen_invalid[row][col] = true;
+			screen_current[row][col] = 0x7f;
+			screen_pending[row][col] = ' ';
+			// screen_flash[row][col] = ' ';
+		}
+	}
+	// memset (&screen_invalid, 1, sizeof(screen_invalid));
+	// memset (&screen_current, 0x7F, sizeof (screen_current)); // fill cache with a character we otherwise never use
+}
+
+void TranzportControlProtocol::screen_validate ()
+{
+}
+
+void TranzportControlProtocol::screen_init ()
+{
+	screen_invalidate();
+}
+
+int
+TranzportControlProtocol::screen_flush ()
+{
+	int cell = 0, row, col_base, col, pending = 0;
+	if ( _device_status == STATUS_OFFLINE) { return (-1); }
+
+	for (row = 0; row < 2 && pending == 0; row++) {
+		for (col_base = 0, col = 0; col < 20 && pending == 0; ) {
+			if ((screen_pending[row][col] != screen_current[row][col]) 
+					|| screen_invalid[row][col]) {
+
+				/* something in this cell is different, so dump the cell to the device. */
+
+				uint8_t cmd[8]; 
+				cmd[0] = 0x00; 
+				cmd[1] = 0x01; 
+				cmd[2] = cell; 
+				cmd[3] = screen_pending[row][col_base]; 
+				cmd[4] = screen_pending[row][col_base+1];
+				cmd[5] = screen_pending[row][col_base+2]; 
+				cmd[6] = screen_pending[row][col_base+3];
+				cmd[7] = 0x00;
+
+				if(write(cmd) != 0) {
+					/* try to update this cell on the next go-round */
+#if DEBUG_TRANZPORT > 4
+					printf("usb screen update failed for some reason... why? \ncmd and data were %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+							cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); 
+#endif
+					pending += 1;	
+					// Shouldn't need to do this
+					// screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = 
+					// screen_invalid[row][col_base+2] = screen_invalid[row][col_base+3] = true;
+
+				} else {
+					/* successful write: copy to current cached display */
+					screen_invalid[row][col_base] = screen_invalid[row][col_base+1] = 
+						screen_invalid[row][col_base+2] = screen_invalid[row][col_base+3] = false;
+					memcpy (&screen_current[row][col_base], &screen_pending[row][col_base], 4);
+				}
+
+				/* skip the rest of the 4 character cell since we wrote+copied it already */
+
+				col_base += 4;
+				col = col_base;
+				cell++;
+
+			} else {
+
+				col++;
+
+				if (col && col % 4 == 0) {
+					cell++;
+					col_base += 4;
+				}
+			}
+		}
+	}
+	return pending;
+}
+
+
+//  Tranzport specific
+
+void TranzportControlProtocol::invalidate() 
+{
+	lcd_damage(); lights_invalidate(); screen_invalidate(); // one of these days lcds can be fine but screens not
+}
+
+TranzportControlProtocol::~TranzportControlProtocol ()
+{
+	set_active (false);
+}
+
+
+int
+TranzportControlProtocol::set_active (bool yn)
+{
+	if (yn != _active) {
+
+		if (yn) {
+
+			if (open ()) {
+				return -1;
+			}
+
+			if (pthread_create_and_store (X_("tranzport monitor"), &thread, 0, _monitor_work, this) == 0) {
+				_active = true;
+			} else {
+				return -1;
+			}
+
+		} else {
+			cerr << "Begin tranzport shutdown\n";
+			screen_clear ();
+			lcd_damage();
+			lights_off ();
+			for(int x = 0; x < 10 && flush(); x++) { usleep(1000); }
+			pthread_cancel_one (thread);
+			cerr << "Tranzport Thread dead\n";
+			close ();
+			_active = false;
+			cerr << "End tranzport shutdown\n";
+		} 
+	}
+
+	return 0;
+}
+
+void
+TranzportControlProtocol::show_track_gain ()
+{
+	if (route_table[0]) {
+		gain_t g = route_get_gain (0);
+		if ((g != last_track_gain) || lcd_isdamaged(0,9,8)) {
+			char buf[16]; 
+			snprintf (buf, sizeof (buf), "%6.1fdB", coefficient_to_dB (route_get_effective_gain (0)));
+			print (0, 9, buf); 
+			last_track_gain = g;
+		}
+	} else {
+		print (0, 9, "        "); 
+	}
+}
+
+void
+TranzportControlProtocol::normal_update ()
+{
+	show_current_track ();
+	show_transport_time ();
+	show_track_gain ();
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::next_display_mode ()
+{
+	switch (display_mode) {
+
+		case DisplayNormal:
+			enter_big_meter_mode();
+			break;
+
+		case DisplayBigMeter:
+			enter_normal_display_mode();
+			break;
+
+		case DisplayRecording:
+			enter_normal_display_mode();
+			break;
+
+		case DisplayRecordingMeter:
+			enter_big_meter_mode();
+			break;
+
+		case DisplayConfig: 
+		case DisplayBling:
+		case DisplayBlingMeter:
+			enter_normal_display_mode();
+			break;
+	}
+}
+
+// FIXME, these 3 aren't done yet
+
+void
+TranzportControlProtocol::enter_recording_mode ()
+{
+	lcd_damage(); // excessive
+	screen_clear ();
+	lights_off ();
+	display_mode = DisplayRecording;
+}
+
+void
+TranzportControlProtocol::enter_bling_mode ()
+{
+	lcd_damage();
+	screen_clear ();
+	lights_off ();
+	display_mode = DisplayBling;
+}
+
+void
+TranzportControlProtocol::enter_config_mode ()
+{
+	lcd_damage();
+	screen_clear ();
+	lights_off ();
+	display_mode = DisplayConfig;
+}
+
+
+void
+TranzportControlProtocol::enter_big_meter_mode ()
+{
+	screen_clear ();
+	lcd_damage();
+	lights_off ();
+	last_meter_fill = 0;
+	display_mode = DisplayBigMeter;
+}
+
+void
+TranzportControlProtocol::enter_normal_display_mode ()
+{
+	screen_clear ();
+	lcd_damage();
+	lights_off ();
+	display_mode = DisplayNormal;
+	//  normal_update();
+}
+
+
+float
+log_meter (float db)
+{
+	float def = 0.0f; /* Meter deflection %age */
+
+	if (db < -70.0f) return 0.0f;
+	if (db > 6.0f) return 1.0f;
+
+	if (db < -60.0f) {
+		def = (db + 70.0f) * 0.25f;
+	} else if (db < -50.0f) {
+		def = (db + 60.0f) * 0.5f + 2.5f;
+	} else if (db < -40.0f) {
+		def = (db + 50.0f) * 0.75f + 7.5f;
+	} else if (db < -30.0f) {
+		def = (db + 40.0f) * 1.5f + 15.0f;
+	} else if (db < -20.0f) {
+		def = (db + 30.0f) * 2.0f + 30.0f;
+	} else if (db < 6.0f) {
+		def = (db + 20.0f) * 2.5f + 50.0f;
+	}
+
+	/* 115 is the deflection %age that would be 
+	   when db=6.0. this is an arbitrary
+	   endpoint for our scaling.
+	   */
+
+	return def/115.0f;
+}
+
+void
+TranzportControlProtocol::show_meter ()
+{
+	// you only seem to get a route_table[0] on moving forward - bug elsewhere
+	if (route_table[0] == 0) {
+		// Principle of least surprise
+		print (0, 0, "No audio to meter!!!");
+		print (1, 0, "Select another track"); 
+		return;
+	}
+
+	float level = route_get_peak_input_power (0, 0);
+	float fraction = log_meter (level);
+
+	/* Someday add a peak bar*/
+
+	/* we draw using a choice of a sort of double colon-like character ("::") or a single, left-aligned ":".
+	   the screen is 20 chars wide, so we can display 40 different levels. compute the level,
+	   then figure out how many "::" to fill. if the answer is odd, make the last one a ":"
+	   */
+
+	uint32_t fill  = (uint32_t) floor (fraction * 40);
+	char buf[21];
+	uint32_t i;
+
+	if (fill == last_meter_fill) {
+		/* nothing to do */
+		return;
+	}
+
+	last_meter_fill = fill;
+
+	bool add_single_level = (fill % 2 != 0);
+	fill /= 2;
+
+	if (fraction > 0.98) {
+		light_on (LightAnysolo);
+	}
+
+	/* add all full steps */
+
+	for (i = 0; i < fill; ++i) {
+		buf[i] = 0x07; /* tranzport special code for 4 quadrant LCD block */
+	} 
+
+	/* add a possible half-step */
+
+	if (i < 20 && add_single_level) {
+		buf[i] = 0x03; /* tranzport special code for 2 left quadrant LCD block */
+		++i;
+	}
+
+	/* fill rest with space */
+
+	for (; i < 20; ++i) {
+		buf[i] = ' ';
+	}
+
+	/* print() requires this */
+
+	buf[21] = '\0';
+
+	print (0, 0, buf);
+	print (1, 0, buf);
+}
+
+void
+TranzportControlProtocol::show_bbt (nframes_t where)
+{ 
+	if ((where != last_where) || lcd_isdamaged(1,9,8)) {
+		char buf[16];
+		BBT_Time bbt;
+		session->tempo_map().bbt_time (where, bbt);
+		sprintf (buf, "%03" PRIu32 "|%02" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks);
+		last_bars = bbt.bars;
+		last_beats = bbt.beats;
+		last_ticks = bbt.ticks;
+		last_where = where;
+
+		if(last_ticks < 1960) { print (1, 9, buf); } // save a write so we can do leds
+
+		// if displaymode is recordmode show beats but not yet
+		lights_pending[LightRecord] = false;
+		lights_pending[LightAnysolo] = false;
+		switch(last_beats) {
+			case 1: if(last_ticks < 500 || last_ticks > 1960) lights_pending[LightRecord] = true; break;
+			default: if(last_ticks < 250) lights_pending[LightAnysolo] = true;
+		}
+
+		// update lights for tempo one day
+		//        if (bbt_upper_info_label) {
+		//     TempoMap::Metric m (session->tempo_map().metric_at (when));
+		//     sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
+		//      bbt_lower_info_label->set_text (buf);
+		//      sprintf (buf, "%g|%g", m.meter().beats_per_bar(), m.meter().note_divisor());
+		//      bbt_upper_info_label->set_text (buf);
+	}
+	}
+
+
+void
+TranzportControlProtocol::show_transport_time ()
+{
+	nframes_t where = session->transport_frame();
+	show_bbt(where);
+}	
+
+void
+TranzportControlProtocol::show_smpte (nframes_t where)
+{
+	if ((where != last_where) || lcd_isdamaged(1,9,10)) {
+
+		char buf[5];
+		SMPTE::Time smpte;
+
+		session->smpte_time (where, smpte);
+
+		if (smpte.negative) {
+			sprintf (buf, "-%02" PRIu32 ":", smpte.hours);
+		} else {
+			sprintf (buf, " %02" PRIu32 ":", smpte.hours);
+		}
+		print (1, 8, buf);
+
+		sprintf (buf, "%02" PRIu32 ":", smpte.minutes);
+		print (1, 12, buf);
+
+		sprintf (buf, "%02" PRIu32 ":", smpte.seconds);
+		print (1, 15, buf);
+
+		sprintf (buf, "%02" PRIu32, smpte.frames);
+		print_noretry (1, 18, buf); 
+
+		last_where = where;
+	}
+}
+
+void*
+TranzportControlProtocol::_monitor_work (void* arg)
+{
+	return static_cast<TranzportControlProtocol*>(arg)->monitor_work ();
+}
+
+// I note that these usb specific open, close, probe, read routines are basically 
+// pure boilerplate and could easily be abstracted elsewhere
+
+#if !HAVE_TRANZPORT_KERNEL_DRIVER
+
+bool
+TranzportControlProtocol::probe ()
+{
+	struct usb_bus *bus;
+	struct usb_device *dev;
+
+	usb_init();
+	usb_find_busses();
+	usb_find_devices();
+
+	for (bus = usb_busses; bus; bus = bus->next) {
+
+		for(dev = bus->devices; dev; dev = dev->next) {
+			if (dev->descriptor.idVendor == VENDORID && dev->descriptor.idProduct == PRODUCTID) {
+				return true; 
+			}
+		}
+	}
+
+	return false;
+}
+
+int
+TranzportControlProtocol::open ()
+{
+	struct usb_bus *bus;
+	struct usb_device *dev;
+
+	usb_init();
+	usb_find_busses();
+	usb_find_devices();
+
+	for (bus = usb_busses; bus; bus = bus->next) {
+
+		for(dev = bus->devices; dev; dev = dev->next) {
+			if (dev->descriptor.idVendor != VENDORID)
+				continue;
+			if (dev->descriptor.idProduct != PRODUCTID)
+				continue;
+			return open_core (dev);
+		}
+	}
+
+	error << _("Tranzport: no device detected") << endmsg;
+	return -1;
+}
+
+int
+TranzportControlProtocol::open_core (struct usb_device* dev)
+{
+	if (!(udev = usb_open (dev))) {
+		error << _("Tranzport: cannot open USB transport") << endmsg;
+		return -1;
+	}
+	 
+	if (usb_claim_interface (udev, 0) < 0) {
+		error << _("Tranzport: cannot claim USB interface") << endmsg;
+		usb_close (udev);
+		udev = 0;
+		return -1;
+	}
+
+	if (usb_set_configuration (udev, 1) < 0) {
+		cerr << _("Tranzport: cannot configure USB interface") << endmsg;
+	}
+
+	return 0;
+}
+
+int
+TranzportControlProtocol::close ()
+{
+	int ret = 0;
+
+	if (udev == 0) {
+		return 0;
+	}
+
+	if (usb_release_interface (udev, 0) < 0) {
+		error << _("Tranzport: cannot release interface") << endmsg;
+		ret = -1;
+	}
+
+	if (usb_close (udev)) {
+		error << _("Tranzport: cannot close device") << endmsg;
+		udev = 0;
+		ret = 0;
+	}
+
+	return ret;
+}
+
+int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) 
+{
+	int val;
+	// Get smarter about handling usb errors soon. Like disconnect
+	//  pthread_testcancel();
+	val = usb_interrupt_read (udev, READ_ENDPOINT, (char *) buf, 8, 10);
+	//  pthread_testcancel();
+	return val;
+} 
+
+	
+int
+TranzportControlProtocol::write_noretry (uint8_t* cmd, uint32_t timeout_override)
+{
+	int val;
+	if(inflight > MAX_TRANZPORT_INFLIGHT) { return (-1); }
+	val = usb_interrupt_write (udev, WRITE_ENDPOINT, (char*) cmd, 8, timeout_override ? timeout_override : timeout);
+
+	if (val < 0) {
+#if DEBUG_TRANZPORT
+		printf("usb_interrupt_write failed: %d\n", val);
+#endif
+		return val;
+		}
+
+	if (val != 8) {
+#if DEBUG_TRANZPORT
+		printf("usb_interrupt_write failed: %d\n", val);
+#endif
+		return -1;
+		}
+	++inflight;
+
+	return 0;
+
+}	
+
+int
+TranzportControlProtocol::write (uint8_t* cmd, uint32_t timeout_override)
+{
+#if MAX_RETRY > 1
+	int val;
+	int retry = 0;
+	if(inflight > MAX_TRANZPORT_INFLIGHT) { return (-1); }
+	
+	while((val = usb_interrupt_write (udev, WRITE_ENDPOINT, (char*) cmd, 8, timeout_override ? timeout_override : timeout))!=8 && retry++ < MAX_RETRY) {
+		printf("usb_interrupt_write failed, retrying: %d\n", val);
+	}
+
+	if (retry == MAX_RETRY) {
+		printf("Too many retries on a tranzport write, aborting\n");
+		}
+
+	if (val < 0) {
+		printf("usb_interrupt_write failed: %d\n", val);
+		return val;
+		}
+	if (val != 8) {
+		printf("usb_interrupt_write failed: %d\n", val);
+		return -1;
+		}
+	++inflight;
+	return 0;
+#else
+	return (write_noretry(cmd,timeout_override));
+#endif
+
+}	
+
+#else
+#error Kernel API not defined yet for Tranzport
+// Something like open(/dev/surface/tranzport/event) for reading and raw for writing)
+#endif
+
+// We have a state "Unknown" - STOP USING SPACES FOR IT - switching to arrow character
+// We have another state - no_retry. Misleading, as we still retry on the next pass
+// I think it's pointless to keep no_retry and instead we should throttle writes 
+// We have an "displayed" screen
+// We always draw into the pending screen, which could be any of several screens
+// We have an active screen
+// Print arg - we have 
+// setactive
+// so someday I think we need a screen object.
+
+/*
+screen_flash.clear();
+screen_flash.print(0,0,"Undone:"); // Someday pull the undo stack from somewhere
+screen_flash.print(1,0,"Nextup:"); 
+
+if(flash_messages && lcd.getactive() != screen_flash) lcd.setactive(screen_flash,2000);
+
+screen::setactive(screen_name,duration); // duration in ms
+screen::getactive();
+*/
+
+
+int
+TranzportControlProtocol::flush ()
+{
+	int pending = 0;
+	if(!(pending = lights_flush())) {
+		pending = screen_flush(); 
+	} 
+	return pending;
+}
+
+// doing these functions made me realize that screen_invalid should be lcd_isdamaged FIXME soon
+
+bool TranzportControlProtocol::lcd_damage() 
+{
+	screen_invalidate();
+	return true;
+}
+
+bool TranzportControlProtocol::lcd_damage (int row, int col, int length)
+{
+	bool result = false;
+	int endcol = col+length-1;
+	if((endcol > 19)) { endcol = 19; } 
+	if((row >= 0 && row < 2) && (col >=0 && col < 20)) {
+		for(int c = col; c < endcol; c++) {
+			screen_invalid[row][c] = true;
+		}
+		result = true;
+	}
+	return result;
+}
+
+// Gotta switch to bitfields, this is collossally dumb
+// Still working on the layering, arguably screen_invalid should be lcd_invalid
+
+bool TranzportControlProtocol::lcd_isdamaged () 
+{
+	for(int r = 0; r < 2; r++) {
+		for(int c = 0; c < 20; c++) {
+			if(screen_invalid[r][c]) {
+#if DEBUG_TRANZPORT > 5	
+				printf("row: %d,col: %d is damaged, should redraw it\n", r,c);
+#endif
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length)
+{
+	bool result = 0;
+	int endcol = col+length;
+	if((endcol > 19)) { endcol = 19; } 
+	if((row >= 0 && row < 2) && (col >=0 && col < 20)) {
+		for(int c = col; c < endcol; c++) {
+			if(screen_invalid[row][c]) {
+#if DEBUG_TRANZPORT > 5	
+				printf("row: %d,col: %d is damaged, should redraw it\n", row,c);
+#endif
+				return true;
+			}
+		}
+	}
+	return result;
+}
+
+// lcd_clear would be a separate function for a smart display
+// here it does nothing, but for the sake of completeness it should
+// probably write the lcd, and while I'm on the topic it should probably
+// take a row, col, length argument....
+
+void
+TranzportControlProtocol::lcd_clear ()
+{
+
+}
+
+// These lcd commands are not universally used yet and may drop out of the api
+
+int
+TranzportControlProtocol::lcd_flush ()
+{
+	return 0; 
+}
+
+int 
+TranzportControlProtocol::lcd_write(uint8_t* cmd, uint32_t timeout_override)
+{
+	return write(cmd,timeout_override);
+}
+
+void 
+TranzportControlProtocol::lcd_fill (uint8_t fill_char) 
+{
+}
+
+void 
+TranzportControlProtocol::lcd_print (int row, int col, const char* text) 
+{
+	print(row,col,text);
+}
+
+void TranzportControlProtocol::lcd_print_noretry (int row, int col, const char* text)
+{
+	print(row,col,text);
+}
+
+// Lights are buffered
+
+void
+TranzportControlProtocol::lights_on ()
+{
+	lights_pending[LightRecord] = lights_pending[LightTrackrec] = 
+		lights_pending[LightTrackmute] =  lights_pending[LightTracksolo] = 
+		lights_pending[LightAnysolo] =   lights_pending[LightLoop] = 
+		lights_pending[LightPunch] = true;
+}
+
+void
+TranzportControlProtocol::lights_off ()
+{
+	lights_pending[LightRecord] = lights_pending[LightTrackrec] = 
+		lights_pending[LightTrackmute] =  lights_pending[LightTracksolo] = 
+		lights_pending[LightAnysolo] =   lights_pending[LightLoop] = 
+		lights_pending[LightPunch] = false;
+}
+
+int
+TranzportControlProtocol::light_on (LightID light)
+{
+	lights_pending[light] = true;
+	return 0;
+}
+
+int
+TranzportControlProtocol::light_off (LightID light)
+{
+	lights_pending[light] = false;
+	return 0;
+}
+
+int
+TranzportControlProtocol::light_set (LightID light, bool offon)
+{
+	uint8_t cmd[8];
+	cmd[0] = 0x00;  cmd[1] = 0x00;  cmd[2] = light;  cmd[3] = offon;
+	cmd[4] = 0x00;  cmd[5] = 0x00;  cmd[6] = 0x00;  cmd[7] = 0x00;
+
+	if (write (cmd) == 0) {
+		lights_current[light] = offon;
+		lights_invalid[light] = false;
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+int TranzportControlProtocol::rtpriority_set(int priority) 
+{
+	struct sched_param rtparam;
+	int err;
+	// preallocate and memlock some stack with memlock?
+	char *a = (char*) alloca(4096*2); a[0] = 'a'; a[4096] = 'b';
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = priority; /* XXX should be relative to audio (JACK) thread */
+	// Note - try SCHED_RR with a low limit 
+	// - we don't care if we can't write everything this ms
+	// and it will help if we lose the device
+	if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) {
+		PBD::info << string_compose (_("%1: thread not running with realtime scheduling (%2)"), name(), strerror (errno)) << endmsg;
+		return 1;
+	} 
+	return 0;
+}
+
+// Running with realtime privs is bad when you have problems
+
+int TranzportControlProtocol::rtpriority_unset(int priority) 
+{
+	struct sched_param rtparam;
+	int err;
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = priority; 	
+	if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) {
+		PBD::info << string_compose (_("%1: can't stop realtime scheduling (%2)"), name(), strerror (errno)) << endmsg;
+		return 1;
+	} 
+	PBD::info << string_compose (_("%1: realtime scheduling stopped (%2)"), name(), strerror (errno)) << endmsg;
+	return 0;
+}
+
+// Slowly breaking this into where I can make usb processing it's own thread.
+
+void*
+TranzportControlProtocol::monitor_work ()
+{
+	uint8_t buf[8];
+	int val = 0, pending = 0;
+	bool first_time = true;
+	uint8_t offline = 0;
+
+
+	PBD::ThreadCreated (pthread_self(), X_("Tranzport"));
+	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
+	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
+	next_track ();
+	rtpriority_set();
+	inflight=0;
+	flush();
+
+	while (true) {
+
+		/* bInterval for this beastie is 10ms */
+
+		if (_device_status == STATUS_OFFLINE) {
+			first_time = true;
+			if(offline++ == 1) { 
+				cerr << "Transport has gone offline\n";
+			}
+		} else { 
+			offline = 0; // hate writing this
+		}
+
+		val = read(buf);
+
+		if (val == 8) {
+			process (buf);
+		}
+
+#if DEBUG_TRANZPORT > 2
+		if(inflight > 1) printf("Inflight: %d\n", inflight);
+#endif
+
+
+		if (_device_status != STATUS_OFFLINE) {
+			if (first_time) {
+				invalidate();
+				lcd_clear ();
+				lights_off ();
+				first_time = false;
+				offline = 0;
+				pending = 3; // Give some time for the device to recover
+			}
+			/* update whatever needs updating */
+			update_state ();
+
+			/* still struggling with a good means of exerting flow control */
+			// pending = flush();
+
+			if(pending == 0) {
+				pending = flush(); 
+			} else {
+				if(inflight > 0) {
+					pending = --inflight; // we just did a whole bunch of writes so wait
+				} else {
+					pending = 0;
+				}
+			}
+			// pending = 0;
+		} 
+	}
+
+	return (void*) 0;
+}
+
+int TranzportControlProtocol::lights_show_recording() 
+{
+	//   FIXME, flash recording light when recording and transport is moving
+	return     lights_show_normal();
+}
+
+// gotta do bling next!
+
+int TranzportControlProtocol::lights_show_bling() 
+{
+	switch (bling_mode) {
+		case BlingOff: break;
+		case BlingKit: break; // rotate rec/mute/solo/any solo back and forth
+		case BlingRotating: break; // switch between lights
+		case BlingPairs: break; // Show pairs of lights
+		case BlingRows: break; // light each row in sequence
+		case BlingFlashAll: break; // Flash everything randomly
+	}
+	return 0;
+}
+
+int TranzportControlProtocol::lights_show_normal() 
+{
+	/* Track only */
+
+	if (route_table[0]) {
+		boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (route_table[0]);
+		lights_pending[LightTrackrec]  = at && at->record_enabled();
+		lights_pending[LightTrackmute] = route_get_muted(0); 
+		lights_pending[LightTracksolo] = route_get_soloed(0);
+	} else {
+		lights_pending[LightTrackrec]  = false;
+		lights_pending[LightTracksolo] = false;
+		lights_pending[LightTrackmute] = false;
+	}
+
+	/* Global settings */
+
+	lights_pending[LightLoop]        = session->get_play_loop(); 
+	lights_pending[LightPunch]       = Config->get_punch_in() || Config->get_punch_out();
+	lights_pending[LightRecord]      = session->get_record_enabled();
+	lights_pending[LightAnysolo]     = session->soloing();
+
+	return 0;
+}
+
+int TranzportControlProtocol::lights_show_tempo() 
+{
+	// someday soon fiddle with the lights based on the tempo 
+	return     lights_show_normal();
+}
+
+int
+TranzportControlProtocol::update_state ()
+{
+	/* do the text and light updates */
+
+	switch (display_mode) {
+		case DisplayBigMeter:
+			lights_show_tempo();
+			show_meter ();
+			break;
+
+		case DisplayNormal:
+			lights_show_normal();
+			normal_update ();
+			break;
+
+		case DisplayConfig:
+			break;
+
+		case DisplayRecording:
+			lights_show_recording();
+			normal_update(); 
+			break;
+
+		case DisplayRecordingMeter:
+			lights_show_recording();
+			show_meter(); 
+			break;
+
+		case DisplayBling:
+			lights_show_bling();
+			normal_update();
+			break;
+
+		case DisplayBlingMeter:
+			lights_show_bling();
+			show_meter();
+			break;
+	}
+	return 0;
+
+}
+
+#define TRANZPORT_BUTTON_HANDLER(callback, button_arg) if (button_changes & button_arg) { \
+    if (buttonmask & button_arg) { \
+      callback##_press (buttonmask&ButtonShift); } else { callback##_release (buttonmask&ButtonShift); } }
+
+int
+TranzportControlProtocol::process (uint8_t* buf)
+{
+	// printf("read: %02x %02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);
+
+	uint32_t this_button_mask;
+	uint32_t button_changes;
+
+	_device_status = buf[1];
+
+	this_button_mask = 0;
+	this_button_mask |= buf[2] << 24;
+	this_button_mask |= buf[3] << 16;
+	this_button_mask |= buf[4] << 8;
+	this_button_mask |= buf[5];
+	_datawheel = buf[6];
+
+	button_changes = (this_button_mask ^ buttonmask);
+	buttonmask = this_button_mask;
+
+	if (_datawheel) {
+		datawheel ();
+	}
+
+	// SHIFT + STOP + PLAY for bling mode?
+	// if (button_changes & ButtonPlay & ButtonStop) {
+	// bling_mode_toggle();  
+	// } or something like that
+
+	TRANZPORT_BUTTON_HANDLER(button_event_battery,ButtonBattery);
+	TRANZPORT_BUTTON_HANDLER(button_event_backlight,ButtonBacklight);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackleft,ButtonTrackLeft);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackright,ButtonTrackRight);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackrec,ButtonTrackRec);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackmute,ButtonTrackMute);
+	TRANZPORT_BUTTON_HANDLER(button_event_tracksolo,ButtonTrackSolo);
+	TRANZPORT_BUTTON_HANDLER(button_event_undo,ButtonUndo);
+	TRANZPORT_BUTTON_HANDLER(button_event_in,ButtonIn);
+	TRANZPORT_BUTTON_HANDLER(button_event_out,ButtonOut);
+	TRANZPORT_BUTTON_HANDLER(button_event_punch,ButtonPunch);
+	TRANZPORT_BUTTON_HANDLER(button_event_loop,ButtonLoop);
+	TRANZPORT_BUTTON_HANDLER(button_event_prev,ButtonPrev);
+	TRANZPORT_BUTTON_HANDLER(button_event_add,ButtonAdd);
+	TRANZPORT_BUTTON_HANDLER(button_event_next,ButtonNext);
+	TRANZPORT_BUTTON_HANDLER(button_event_rewind,ButtonRewind);
+	TRANZPORT_BUTTON_HANDLER(button_event_fastforward,ButtonFastForward);
+	TRANZPORT_BUTTON_HANDLER(button_event_stop,ButtonStop);
+	TRANZPORT_BUTTON_HANDLER(button_event_play,ButtonPlay);
+	TRANZPORT_BUTTON_HANDLER(button_event_record,ButtonRecord);
+	return 0;
+}
+
+void
+TranzportControlProtocol::show_current_track ()
+{
+	char pad[11];
+	char *v;
+	int len;
+	if (route_table[0] == 0) {
+		print (0, 0, "----------");
+		last_track_gain = FLT_MAX;
+	} else {
+		strcpy(pad,"          ");
+		v =  (char *)route_get_name (0).substr (0, 10).c_str();
+		if((len = strlen(v)) > 0) {
+			strncpy(pad,(char *)v,len);
+		}
+		print (0, 0, pad);
+	}
+}
+
+void
+TranzportControlProtocol::button_event_battery_press (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_battery_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_backlight_press (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("backlight pressed\n");
+#endif
+}
+
+void
+TranzportControlProtocol::button_event_backlight_release (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("backlight released\n\n");
+#endif
+	if (shifted) {
+		lcd_damage();
+		lcd_clear();
+		last_where += 1; /* force time redisplay */
+		last_track_gain = FLT_MAX;
+		normal_update(); //  redraw_screen();  
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackleft_press (bool shifted)
+{
+	prev_track ();
+}
+
+void
+TranzportControlProtocol::button_event_trackleft_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackright_press (bool shifted)
+{
+	next_track ();
+}
+
+void
+TranzportControlProtocol::button_event_trackright_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackrec_press (bool shifted)
+{
+	if (shifted) {
+		toggle_all_rec_enables ();
+	} else {
+		route_set_rec_enable (0, !route_get_rec_enable (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackrec_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackmute_press (bool shifted)
+{
+	if (shifted) {
+	  // Mute ALL? Something useful when a phone call comes in. Mute master?
+	} else {
+	  route_set_muted (0, !route_get_muted (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackmute_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_tracksolo_press (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("solo pressed\n");
+#endif
+	if (display_mode == DisplayBigMeter) {
+		light_off (LightAnysolo);
+		return;
+	}
+
+	if (shifted) {
+		session->set_all_solo (!session->soloing());
+	} else {
+		route_set_soloed (0, !route_get_soloed (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_tracksolo_release (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("solo released\n");
+#endif
+}
+
+void
+TranzportControlProtocol::button_event_undo_press (bool shifted)
+{
+	if (shifted) {
+		redo (); // someday flash the screen with what was redone
+	} else {
+		undo (); // someday flash the screen with what was undone
+	}
+}
+
+void
+TranzportControlProtocol::button_event_undo_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_in_press (bool shifted)
+{
+	if (shifted) {
+		toggle_punch_in ();
+	} else {
+		ControlProtocol::ZoomIn (); /* EMIT SIGNAL */
+	}
+}
+
+void
+TranzportControlProtocol::button_event_in_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_out_press (bool shifted)
+{
+	if (shifted) {
+		toggle_punch_out ();
+	} else {
+		ControlProtocol::ZoomOut (); /* EMIT SIGNAL */
+	}
+}
+
+void
+TranzportControlProtocol::button_event_out_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_punch_press (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_punch_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_loop_press (bool shifted)
+{
+	if (shifted) {
+		next_wheel_shift_mode ();
+	} else {
+		loop_toggle ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_loop_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_prev_press (bool shifted)
+{
+	if (shifted) {
+		ControlProtocol::ZoomToSession (); /* EMIT SIGNAL */
+	} else {
+		prev_marker ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_prev_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_add_press (bool shifted)
+{
+	add_marker ();
+}
+
+void
+TranzportControlProtocol::button_event_add_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_next_press (bool shifted)
+{
+	if (shifted) {
+		next_wheel_mode ();
+	} else {
+		next_marker ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_next_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_rewind_press (bool shifted)
+{
+	if (shifted) {
+		goto_start ();
+	} else {
+		rewind ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_rewind_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_fastforward_press (bool shifted)
+{
+	if (shifted) {
+		goto_end ();
+	} else {
+		ffwd ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_fastforward_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_stop_press (bool shifted)
+{
+	if (shifted) {
+		next_display_mode ();
+	} else {
+		transport_stop ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_stop_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_play_press (bool shifted)
+{
+	if (shifted) {
+	  set_transport_speed (1.0f);
+	} else {
+	  transport_play ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_play_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_record_press (bool shifted)
+{
+	if (shifted) {
+		save_state ();
+	} else {
+		rec_enable_toggle ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_record_release (bool shifted)
+{
+}
+
+void button_event_mute (bool pressed, bool shifted)
+{
+	static int was_pressed = 0;
+	//  if(pressed) { }
+}
+
+void
+TranzportControlProtocol::datawheel ()
+{
+	if ((buttonmask & ButtonTrackRight) || (buttonmask & ButtonTrackLeft)) {
+
+		/* track scrolling */
+
+		if (_datawheel < WheelDirectionThreshold) {
+			next_track ();
+		} else {
+			prev_track ();
+		}
+
+		timerclear (&last_wheel_motion);
+
+	} else if ((buttonmask & ButtonPrev) || (buttonmask & ButtonNext)) {
+
+		if (_datawheel < WheelDirectionThreshold) {
+			next_marker ();
+		} else {
+			prev_marker ();
+		}
+
+		timerclear (&last_wheel_motion);
+
+	} else if (buttonmask & ButtonShift) {
+
+		/* parameter control */
+
+		if (route_table[0]) {
+			switch (wheel_shift_mode) {
+				case WheelShiftGain:
+					if (_datawheel < WheelDirectionThreshold) {
+						step_gain_up ();
+					} else {
+						step_gain_down ();
+					}
+					break;
+				case WheelShiftPan:
+					if (_datawheel < WheelDirectionThreshold) {
+						step_pan_right ();
+					} else {
+						step_pan_left ();
+					}
+					break;
+
+				case WheelShiftMarker:
+					break;
+
+				case WheelShiftMaster:
+					break;
+
+			}
+		}
+
+		timerclear (&last_wheel_motion);
+
+	} else {
+
+		switch (wheel_mode) {
+			case WheelTimeline:
+				scroll ();
+				break;
+
+			case WheelScrub:
+				scrub ();
+				break;
+
+			case WheelShuttle:
+				shuttle ();
+				break;
+		}
+	}
+}
+
+void
+TranzportControlProtocol::scroll ()
+{
+	float m = 1.0;
+	if (_datawheel < WheelDirectionThreshold) {
+		m = 1.0;
+	} else {
+		m = -1.0;
+	}
+	switch(wheel_increment) {
+		case WheelIncrScreen: ScrollTimeline (0.2*m); break;
+		default: break; // other modes unimplemented as yet
+	}
+}
+
+void
+TranzportControlProtocol::scrub ()
+{
+	float speed;
+	struct timeval now;
+	struct timeval delta;
+	int dir;
+
+	gettimeofday (&now, 0);
+
+	if (_datawheel < WheelDirectionThreshold) {
+		dir = 1;
+	} else {
+		dir = -1;
+	}
+
+	if (dir != last_wheel_dir) {
+		/* changed direction, start over */
+		speed = 0.1f;
+	} else {
+		if (timerisset (&last_wheel_motion)) {
+
+			timersub (&now, &last_wheel_motion, &delta);
+
+			/* 10 clicks per second => speed == 1.0 */
+
+			speed = 100000.0f / (delta.tv_sec * 1000000 + delta.tv_usec);
+
+		} else {
+
+			/* start at half-speed and see where we go from there */
+
+			speed = 0.5f;
+		}
+	}
+
+	last_wheel_motion = now;
+	last_wheel_dir = dir;
+
+	set_transport_speed (speed * dir);
+}
+
+void
+TranzportControlProtocol::config ()
+{
+  // FIXME
+}
+
+void
+TranzportControlProtocol::shuttle ()
+{
+	if (_datawheel < WheelDirectionThreshold) {
+		if (session->transport_speed() < 0) {
+			session->request_transport_speed (1.0);
+		} else {
+			session->request_transport_speed (session->transport_speed() + 0.1);
+		}
+	} else {
+		if (session->transport_speed() > 0) {
+			session->request_transport_speed (-1.0);
+		} else {
+			session->request_transport_speed (session->transport_speed() - 0.1);
+		}
+	}
+}
+
+void
+TranzportControlProtocol::step_gain_up ()
+{
+	if (buttonmask & ButtonStop) {
+		gain_fraction += 0.001;
+	} else {
+		gain_fraction += 0.01;
+	}
+
+	if (gain_fraction > 2.0) {
+		gain_fraction = 2.0;
+	}
+	
+	route_set_gain (0, slider_position_to_gain (gain_fraction));
+}
+
+void
+TranzportControlProtocol::step_gain_down ()
+{
+	if (buttonmask & ButtonStop) {
+		gain_fraction -= 0.001;
+	} else {
+		gain_fraction -= 0.01;
+	}
+
+	if (gain_fraction < 0.0) {
+		gain_fraction = 0.0;
+	}
+	
+	route_set_gain (0, slider_position_to_gain (gain_fraction));
+}
+
+void
+TranzportControlProtocol::step_pan_right ()
+{
+}
+
+void
+TranzportControlProtocol::step_pan_left ()
+{
+}
+
+void
+TranzportControlProtocol::next_wheel_shift_mode ()
+{
+	switch (wheel_shift_mode) {
+	case WheelShiftGain:
+		wheel_shift_mode = WheelShiftPan;
+		break;
+	case WheelShiftPan:
+		wheel_shift_mode = WheelShiftMaster;
+		break;
+	case WheelShiftMaster:
+		wheel_shift_mode = WheelShiftGain;
+		break;
+	case WheelShiftMarker: // Not done yet, disabled
+ 	        wheel_shift_mode = WheelShiftGain;
+		break;
+	}
+
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::next_wheel_mode ()
+{
+	switch (wheel_mode) {
+	case WheelTimeline:
+		wheel_mode = WheelScrub;
+		break;
+	case WheelScrub:
+		wheel_mode = WheelShuttle;
+		break;
+	case WheelShuttle:
+		wheel_mode = WheelTimeline;
+	}
+
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::next_track ()
+{
+	ControlProtocol::next_track (current_track_id);
+	gain_fraction = gain_to_slider_position (route_get_effective_gain (0));
+}
+
+void
+TranzportControlProtocol::prev_track ()
+{
+	ControlProtocol::prev_track (current_track_id);
+	gain_fraction = gain_to_slider_position (route_get_effective_gain (0));
+}
+
+void
+TranzportControlProtocol::show_wheel_mode ()
+{
+	string text;
+
+	switch (wheel_mode) {
+		case WheelTimeline:
+			text = "Time";
+			break;
+		case WheelScrub:
+			text = "Scrb";
+			break;
+		case WheelShuttle:
+			text = "Shtl";
+			break;
+	}
+
+	switch (wheel_shift_mode) {
+		case WheelShiftGain:
+			text += ":Gain";
+			break;
+
+		case WheelShiftPan:
+			text += ":Pan ";
+			break;
+
+		case WheelShiftMaster:
+			text += ":Mstr";
+			break;
+
+		case WheelShiftMarker:
+			text += ":Mrkr";
+			break;
+	}
+
+	print (1, 0, text.c_str());
+}
+
+// Was going to keep state around saying to retry or not
+// haven't got to it yet, still not sure it's a good idea
+
+void
+TranzportControlProtocol::print (int row, int col, const char *text) {
+	print_noretry(row,col,text);
+}
+
+void
+TranzportControlProtocol::print_noretry (int row, int col, const char *text)
+{
+	int cell;
+	uint32_t left = strlen (text);
+	char tmp[5];
+	int base_col;
+	
+	if (row < 0 || row > 1) {
+		return;
+	}
+
+	if (col < 0 || col > 19) {
+		return;
+	}
+
+	while (left) {
+
+		if (col >= 0 && col < 4) {
+			cell = 0;
+			base_col = 0;
+		} else if (col >= 4 && col < 8) {
+			cell = 1;
+			base_col = 4;
+		} else if (col >= 8 && col < 12) {
+			cell = 2;
+			base_col = 8;
+		} else if (col >= 12 && col < 16) {
+			cell = 3;
+			base_col = 12;
+		} else if (col >= 16 && col < 20) {
+			cell = 4;
+			base_col = 16;
+		} else {
+			return;
+		}
+
+		int offset = col % 4;
+
+		/* copy current cell contents into tmp */
+		
+		memcpy (tmp, &screen_pending[row][base_col], 4);
+		
+		/* overwrite with new text */
+		
+		uint32_t tocopy = min ((4U - offset), left);
+		
+		memcpy (tmp+offset, text, tocopy);
+		
+		/* copy it back to pending */
+		
+		memcpy (&screen_pending[row][base_col], tmp, 4);
+		
+		text += tocopy;
+		left -= tocopy;
+		col  += tocopy;
+	}
+}	
+
+XMLNode&
+TranzportControlProtocol::get_state () 
+{
+	XMLNode* node = new XMLNode (X_("Protocol"));
+	node->add_property (X_("name"), _name);
+	return *node;
+}
+
+int
+TranzportControlProtocol::set_state (const XMLNode& node)
+{
+	return 0;
+}
+
+int
+TranzportControlProtocol::save (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
+
+int
+TranzportControlProtocol::load (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
new file mode 100644
index 0000000000..f13e4a3a44
--- /dev/null
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
@@ -0,0 +1,320 @@
+
+#ifndef ardour_tranzport_control_protocol_h
+#define ardour_tranzport_control_protocol_h
+
+#include <vector>
+
+#include <sys/time.h>
+#include <pthread.h>
+#include <usb.h>
+
+#include <glibmm/thread.h>
+
+#include <ardour/types.h>
+
+#include <control_protocol/control_protocol.h>
+
+class TranzportControlProtocol : public ARDOUR::ControlProtocol
+{
+  public:
+	TranzportControlProtocol (ARDOUR::Session&);
+	virtual ~TranzportControlProtocol();
+
+	int set_active (bool yn);
+
+	static bool probe ();
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&);
+
+  private:
+	static const int VENDORID = 0x165b;
+	static const int PRODUCTID = 0x8101;
+	static const int READ_ENDPOINT  = 0x81;
+	static const int WRITE_ENDPOINT = 0x02;
+	const static int STATUS_OFFLINE  = 0xff;
+	const static int STATUS_ONLINE = 0x01;
+	const static uint8_t WheelDirectionThreshold = 0x3f;
+
+	enum LightID {
+		LightRecord = 0,
+		LightTrackrec,
+		LightTrackmute,
+		LightTracksolo,
+		LightAnysolo,
+		LightLoop,
+		LightPunch
+	};
+
+	enum ButtonID {
+		ButtonBattery = 0x00004000,
+		ButtonBacklight = 0x00008000,
+		ButtonTrackLeft = 0x04000000,
+		ButtonTrackRight = 0x40000000,
+		ButtonTrackRec = 0x00040000,
+		ButtonTrackMute = 0x00400000,
+		ButtonTrackSolo = 0x00000400,
+		ButtonUndo = 0x80000000,
+		ButtonIn = 0x02000000,
+		ButtonOut = 0x20000000,
+		ButtonPunch = 0x00800000,
+		ButtonLoop = 0x00080000,
+		ButtonPrev = 0x00020000,
+		ButtonAdd = 0x00200000,
+		ButtonNext = 0x00000200,
+		ButtonRewind = 0x01000000,
+		ButtonFastForward = 0x10000000,
+		ButtonStop = 0x00010000,
+		ButtonPlay = 0x00100000,
+		ButtonRecord = 0x00000100,
+		ButtonShift = 0x08000000
+	};
+
+	enum WheelShiftMode {
+		WheelShiftGain,
+		WheelShiftPan,
+		WheelShiftMaster,
+		WheelShiftMarker
+	};
+		
+	enum WheelMode {
+		WheelTimeline,
+		WheelScrub,
+		WheelShuttle
+	};
+
+	// FIXME - look at gtk2_ardour for snap settings
+
+	enum WheelIncrement {
+	       WheelIncrSlave,
+	       WheelIncrScreen,
+	       WheelIncrSample,
+	       WheelIncrBeat,
+	       WheelIncrBar,
+	       WheelIncrSecond,
+	       WheelIncrMinute
+	};
+	  
+	enum DisplayMode {
+		DisplayNormal,
+		DisplayRecording,
+		DisplayRecordingMeter,
+		DisplayBigMeter,
+		DisplayConfig,
+		DisplayBling,
+		DisplayBlingMeter
+	};
+
+	enum BlingMode {
+	        BlingOff,
+	        BlingKit,
+	        BlingRotating,
+	        BlingPairs,
+	        BlingRows,
+	        BlingFlashAll
+	};
+	
+	pthread_t       thread;
+	uint32_t        buttonmask;
+	uint32_t        timeout;
+	uint32_t        inflight;
+	uint8_t        _datawheel;
+	uint8_t        _device_status;
+	uint32_t        current_track_id;
+	WheelMode       wheel_mode;
+	WheelShiftMode  wheel_shift_mode;
+	DisplayMode     display_mode;
+	BlingMode       bling_mode;
+	WheelIncrement  wheel_increment;
+	usb_dev_handle* udev;
+
+	ARDOUR::gain_t  gain_fraction;
+
+	Glib::Mutex update_lock;
+
+	bool screen_invalid[2][20];
+	char screen_current[2][20];
+	char screen_pending[2][20];
+	char screen_flash[2][20];
+
+	bool lights_invalid[7];
+	bool lights_current[7];
+	bool lights_pending[7];
+	bool lights_flash[7];
+
+	uint32_t       last_bars;
+	uint32_t       last_beats;
+	uint32_t       last_ticks;
+
+	bool           last_negative;
+	uint32_t       last_hrs;
+	uint32_t       last_mins;
+	uint32_t       last_secs;
+	uint32_t       last_frames;
+	nframes_t last_where;
+	ARDOUR::gain_t last_track_gain;
+	uint32_t       last_meter_fill;
+	struct timeval last_wheel_motion;
+	int            last_wheel_dir;
+
+	Glib::Mutex io_lock;
+
+	int open ();
+	int read (uint8_t *buf,uint32_t timeout_override = 0);
+	int write (uint8_t* cmd, uint32_t timeout_override = 0);
+	int write_noretry (uint8_t* cmd, uint32_t timeout_override = 0);
+	int close ();
+	int save(char *name = "default");
+	int load(char *name = "default");
+	void print (int row, int col, const char* text);
+	void print_noretry (int row, int col, const char* text);
+
+	int rtpriority_set(int priority = 52);
+	int rtpriority_unset(int priority = 0);
+
+	int open_core (struct usb_device*);
+
+	static void* _monitor_work (void* arg);
+	void* monitor_work ();
+
+	int process (uint8_t *);
+	int update_state();
+	void invalidate();
+	int flush();
+	// bool isuptodate(); // think on this. It seems futile to update more than 30/sec
+
+	// A screen is a cache of what should be on the lcd
+
+	void screen_init();
+	void screen_validate();
+	void screen_invalidate();
+	int  screen_flush();
+	void screen_clear();
+	// bool screen_isuptodate(); // think on this - 
+
+	// Commands to write to the lcd 
+
+	int  lcd_init();
+        bool lcd_damage();
+	bool lcd_isdamaged();
+
+        bool lcd_damage(int row, int col = 0, int length = 20);
+	bool lcd_isdamaged(int row, int col = 0, int length = 20);
+
+	int  lcd_flush();
+	int  lcd_write(uint8_t* cmd, uint32_t timeout_override = 0); // pedantic alias for write
+	void lcd_fill (uint8_t fill_char);
+	void lcd_clear ();
+	void lcd_print (int row, int col, const char* text);
+	void lcd_print_noretry (int row, int col, const char* text);
+
+	// Commands to write to the lights
+	// FIXME - on some devices lights can have intensity and colors
+
+	void lights_init();
+	void lights_validate();
+	void lights_invalidate();
+	void light_validate(LightID light);
+	void light_invalidate(LightID light);
+	int  lights_flush();
+	int  lights_write(uint8_t* cmd,uint32_t timeout_override = 0); // pedantic alias to write
+
+	// a cache of what should be lit
+
+	void lights_off ();
+	void lights_on ();
+	int  light_set(LightID, bool offon = true);
+	int  light_on (LightID);
+	int  light_off (LightID);
+
+	// some modes for the lights, should probably be renamed
+
+	int  lights_show_normal();
+	int  lights_show_recording();
+	int  lights_show_tempo();
+	int  lights_show_bling();
+
+	void enter_big_meter_mode ();
+	void enter_normal_display_mode ();
+	void enter_config_mode();
+	void enter_recording_mode();
+	void enter_bling_mode();
+
+	void next_display_mode ();
+	void normal_update ();
+
+	void show_current_track ();
+	void show_track_gain ();
+	void show_transport_time ();
+	void show_bbt (nframes_t where);	
+	void show_smpte (nframes_t where);
+	void show_wheel_mode ();
+	void show_gain ();
+	void show_pan ();
+	void show_meter ();
+
+	void datawheel ();
+	void scrub ();
+	void scroll ();
+	void shuttle ();
+	void config ();
+
+	void next_wheel_mode ();
+	void next_wheel_shift_mode ();
+
+	void set_current_track (ARDOUR::Route*);
+	void next_track ();
+	void prev_track ();
+	void step_gain_up ();
+	void step_gain_down ();
+	void step_pan_right ();
+	void step_pan_left ();
+
+
+	void button_event_battery_press (bool shifted);
+	void button_event_battery_release (bool shifted);
+	void button_event_backlight_press (bool shifted);
+	void button_event_backlight_release (bool shifted);
+	void button_event_trackleft_press (bool shifted);
+	void button_event_trackleft_release (bool shifted);
+	void button_event_trackright_press (bool shifted);
+	void button_event_trackright_release (bool shifted);
+	void button_event_trackrec_press (bool shifted);
+	void button_event_trackrec_release (bool shifted);
+	void button_event_trackmute_press (bool shifted);
+	void button_event_trackmute_release (bool shifted);
+	void button_event_tracksolo_press (bool shifted);
+	void button_event_tracksolo_release (bool shifted);
+	void button_event_undo_press (bool shifted);
+	void button_event_undo_release (bool shifted);
+	void button_event_in_press (bool shifted);
+	void button_event_in_release (bool shifted);
+	void button_event_out_press (bool shifted);
+	void button_event_out_release (bool shifted);
+	void button_event_punch_press (bool shifted);
+	void button_event_punch_release (bool shifted);
+	void button_event_loop_press (bool shifted);
+	void button_event_loop_release (bool shifted);
+	void button_event_prev_press (bool shifted);
+	void button_event_prev_release (bool shifted);
+	void button_event_add_press (bool shifted);
+	void button_event_add_release (bool shifted);
+	void button_event_next_press (bool shifted);
+	void button_event_next_release (bool shifted);
+	void button_event_rewind_press (bool shifted);
+	void button_event_rewind_release (bool shifted);
+	void button_event_fastforward_press (bool shifted);
+	void button_event_fastforward_release (bool shifted);
+	void button_event_stop_press (bool shifted);
+	void button_event_stop_release (bool shifted);
+	void button_event_play_press (bool shifted);
+	void button_event_play_release (bool shifted);
+	void button_event_record_press (bool shifted);
+	void button_event_record_release (bool shifted);
+
+	// new api
+	void button_event_mute (bool pressed, bool shifted);
+};
+
+
+#endif // ardour_tranzport_control_protocol_h
diff --git a/libs/surfaces/generic_midi/.cvsignore b/libs/surfaces/generic_midi/.cvsignore
new file mode 100644
index 0000000000..50700f873e
--- /dev/null
+++ b/libs/surfaces/generic_midi/.cvsignore
@@ -0,0 +1,2 @@
+*.os
+*.dylib
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
new file mode 100644
index 0000000000..051a61f148
--- /dev/null
+++ b/libs/surfaces/generic_midi/SConscript
@@ -0,0 +1,59 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+genericmidi = env.Copy()
+
+#
+# this defines the version number of libardour_genericmidi
+# 
+
+domain = 'ardour_genericmidi'
+
+genericmidi.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+genericmidi.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+genericmidi.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+genericmidi.Append(PACKAGE = domain)
+genericmidi.Append(POTFILE = domain + '.pot')
+
+genericmidi_files=Split("""
+interface.cc
+generic_midi_control_protocol.cc
+midicontrollable.cc
+""")
+
+genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+genericmidi.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+
+genericmidi.Merge ([
+	libraries['ardour'],
+	libraries['ardour_cp'],
+	libraries['sndfile-ardour'],
+	libraries['midi++2'],
+	libraries['pbd'],
+	libraries['sigc2'],
+	libraries['usb'],
+	libraries['xml'],
+	libraries['glib2'],
+	libraries['glibmm2']
+	])
+
+libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
+
+Default(libardour_genericmidi)
+
+if env['NLS']:
+	i18n (genericmidi, genericmidi_files, env)
+	      
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_genericmidi))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+				     [ 'SConscript' ] +
+				     genericmidi_files + 
+				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
new file mode 100644
index 0000000000..cd8c724e75
--- /dev/null
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -0,0 +1,405 @@
+/*
+    Copyright (C) 2006 Paul Davis
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#define __STDC_FORMAT_MACROS 1
+#include <stdint.h>
+
+#include <algorithm>
+
+#include <pbd/error.h>
+#include <pbd/failed_constructor.h>
+
+#include <midi++/port.h>
+#include <midi++/manager.h>
+
+#include <ardour/route.h>
+#include <ardour/session.h>
+
+#include "generic_midi_control_protocol.h"
+#include "midicontrollable.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+
+#include "i18n.h"
+
+GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
+	: ControlProtocol  (s, _("Generic MIDI"))
+{
+	MIDI::Manager* mm = MIDI::Manager::instance();
+
+	/* XXX it might be nice to run "control" through i18n, but thats a bit tricky because
+	   the name is defined in ardour.rc which is likely not internationalized.
+	*/
+	
+	_port = mm->port (X_("control"));
+
+	if (_port == 0) {
+		error << _("no MIDI port named \"control\" exists - generic MIDI control disabled") << endmsg;
+		throw failed_constructor();
+	}
+
+	do_feedback = false;
+	_feedback_interval = 10000; // microseconds
+	last_feedback_time = 0;
+
+	auto_binding = FALSE;
+
+	Controllable::StartLearning.connect (mem_fun (*this, &GenericMidiControlProtocol::start_learning));
+	Controllable::StopLearning.connect (mem_fun (*this, &GenericMidiControlProtocol::stop_learning));
+	Session::SendFeedback.connect (mem_fun (*this, &GenericMidiControlProtocol::send_feedback));
+	
+	Controllable::CreateBinding.connect (mem_fun (*this, &GenericMidiControlProtocol::create_binding));
+	Controllable::DeleteBinding.connect (mem_fun (*this, &GenericMidiControlProtocol::delete_binding));
+
+	Session::AutoBindingOn.connect (mem_fun (*this, &GenericMidiControlProtocol::auto_binding_on));
+	Session::AutoBindingOff.connect (mem_fun (*this, &GenericMidiControlProtocol::auto_binding_off));
+}
+
+GenericMidiControlProtocol::~GenericMidiControlProtocol ()
+{
+}
+
+int
+GenericMidiControlProtocol::set_active (bool yn)
+{
+	/* start/stop delivery/outbound thread */
+	return 0;
+}
+
+void
+GenericMidiControlProtocol::set_feedback_interval (microseconds_t ms)
+{
+	_feedback_interval = ms;
+}
+
+void 
+GenericMidiControlProtocol::send_feedback ()
+{
+	if (!do_feedback) {
+		return;
+	}
+
+	microseconds_t now = get_microseconds ();
+
+	if (last_feedback_time != 0) {
+		if ((now - last_feedback_time) < _feedback_interval) {
+			return;
+		}
+	}
+
+	_send_feedback ();
+	
+	last_feedback_time = now;
+}
+
+void 
+GenericMidiControlProtocol::_send_feedback ()
+{
+	const int32_t bufsize = 16 * 1024; /* XXX too big */
+	MIDI::byte buf[bufsize];
+	int32_t bsize = bufsize;
+	MIDI::byte* end = buf;
+	
+	for (MIDIControllables::iterator r = controllables.begin(); r != controllables.end(); ++r) {
+		end = (*r)->write_feedback (end, bsize);
+	}
+	
+	if (end == buf) {
+		return;
+	} 
+
+	// FIXME
+	//_port->write (buf, (int32_t) (end - buf));
+}
+
+bool
+GenericMidiControlProtocol::start_learning (Controllable* c)
+{
+	if (c == 0) {
+		return false;
+	}
+
+	MIDIControllables::iterator tmp;
+	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) {
+		tmp = i;
+		++tmp;
+		if (&(*i)->get_controllable() == c) {
+			delete (*i);
+			controllables.erase (i);
+		}
+		i = tmp;
+	}
+
+	MIDIPendingControllables::iterator ptmp;
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
+		ptmp = i;
+		++ptmp;
+		if (&((*i).first)->get_controllable() == c) {
+			(*i).second.disconnect();
+			delete (*i).first;
+			pending_controllables.erase (i);
+		}
+		i = ptmp;
+	}
+
+
+	MIDIControllable* mc = 0;
+
+	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
+		if ((*i)->get_controllable().id() == c->id()) {
+			mc = *i;
+			break;
+		}
+	}
+
+	if (!mc) {
+		mc = new MIDIControllable (*_port, *c);
+	}
+	
+	{
+		Glib::Mutex::Lock lm (pending_lock);
+
+		std::pair<MIDIControllable *, sigc::connection> element;
+		element.first = mc;
+		element.second = c->LearningFinished.connect (bind (mem_fun (*this, &GenericMidiControlProtocol::learning_stopped), mc));
+
+		pending_controllables.push_back (element);
+	}
+
+	mc->learn_about_external_control ();
+	return true;
+}
+
+void
+GenericMidiControlProtocol::learning_stopped (MIDIControllable* mc)
+{
+	Glib::Mutex::Lock lm (pending_lock);
+	Glib::Mutex::Lock lm2 (controllables_lock);
+	
+	MIDIPendingControllables::iterator tmp;
+
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
+		tmp = i;
+		++tmp;
+
+		if ( (*i).first == mc) {
+			(*i).second.disconnect();
+			pending_controllables.erase(i);
+		}
+
+		i = tmp;
+	}
+
+	controllables.insert (mc);
+}
+
+void
+GenericMidiControlProtocol::stop_learning (Controllable* c)
+{
+	Glib::Mutex::Lock lm (pending_lock);
+	Glib::Mutex::Lock lm2 (controllables_lock);
+	MIDIControllable* dptr = 0;
+
+	/* learning timed out, and we've been told to consider this attempt to learn to be cancelled. find the
+	   relevant MIDIControllable and remove it from the pending list.
+	*/
+
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
+		if (&((*i).first)->get_controllable() == c) {
+			(*i).first->stop_learning ();
+			dptr = (*i).first;
+			(*i).second.disconnect();
+
+			pending_controllables.erase (i);
+			break;
+		}
+	}
+	
+	if (dptr) {
+		delete dptr;
+	}
+}
+
+void
+GenericMidiControlProtocol::delete_binding ( PBD::Controllable* control )
+{
+	if( control != 0 ) {
+		Glib::Mutex::Lock lm2 (controllables_lock);
+		
+		for( MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end(); ++iter) {
+			MIDIControllable* existingBinding = (*iter);
+			
+			if( control == &(existingBinding->get_controllable()) ) {
+				delete existingBinding;
+				controllables.erase (iter);
+			}
+			
+		} // end for midi controllables
+	} // end null check
+}
+void
+GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos, int control_number)
+{
+	if( control != NULL ) {
+		Glib::Mutex::Lock lm2 (controllables_lock);
+		
+		MIDI::channel_t channel = (pos & 0xf);
+		MIDI::byte value = control_number;
+		
+		// Create a MIDIControllable::
+		MIDIControllable* mc = new MIDIControllable (*_port, *control);
+		
+		// Remove any old binding for this midi channel/type/value pair
+		// Note:  can't use delete_binding() here because we don't know the specific controllable we want to remove, only the midi information
+		for( MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end(); ++iter) {
+			MIDIControllable* existingBinding = (*iter);
+			
+			if( (existingBinding->get_control_channel() & 0xf ) == channel &&
+			    existingBinding->get_control_additional() == value &&
+			    (existingBinding->get_control_type() & 0xf0 ) == MIDI::controller ) {
+				
+				delete existingBinding;
+				controllables.erase (iter);
+			}
+			
+		} // end for midi controllables
+		
+		
+		// Update the MIDI Controllable based on the the pos param
+		// Here is where a table lookup for user mappings could go; for now we'll just wing it...
+		mc->bind_midi( channel, MIDI::controller, value );
+		
+		controllables.insert (mc);
+	} // end null test
+}
+
+void
+GenericMidiControlProtocol::auto_binding_on()
+{
+	auto_binding = TRUE;
+}
+
+void
+GenericMidiControlProtocol::auto_binding_off()
+{
+	auto_binding = FALSE;
+}
+
+XMLNode&
+GenericMidiControlProtocol::get_state () 
+{
+	XMLNode* node = new XMLNode ("Protocol"); 
+	char buf[32];
+
+	node->add_property (X_("name"), _name);
+	node->add_property (X_("feedback"), do_feedback ? "1" : "0");
+	snprintf (buf, sizeof (buf), "%" PRIu64, _feedback_interval);
+	node->add_property (X_("feedback_interval"), buf);
+
+	XMLNode* children = new XMLNode (X_("controls"));
+
+	node->add_child_nocopy (*children);
+
+	Glib::Mutex::Lock lm2 (controllables_lock);
+	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
+		children->add_child_nocopy ((*i)->get_state());
+	}
+
+	return *node;
+}
+
+int
+GenericMidiControlProtocol::set_state (const XMLNode& node)
+{
+	XMLNodeList nlist;
+	XMLNodeConstIterator niter;
+	const XMLProperty* prop;
+
+	if ((prop = node.property ("feedback")) != 0) {
+		do_feedback = (bool) atoi (prop->value().c_str());
+	} else {
+		do_feedback = false;
+	}
+
+	if ((prop = node.property ("feedback_interval")) != 0) {
+		if (sscanf (prop->value().c_str(), "%" PRIu64, &_feedback_interval) != 1) {
+			_feedback_interval = 10000;
+		}
+	} else {
+		_feedback_interval = 10000;
+	}
+
+	// Are we using the autobinding feature?  If so skip this part
+	if ( !auto_binding ) {
+		
+		boost::shared_ptr<Controllable> c;
+		
+		{
+			Glib::Mutex::Lock lm (pending_lock);
+			pending_controllables.clear ();
+		}
+		
+		Glib::Mutex::Lock lm2 (controllables_lock);
+		controllables.clear ();
+		nlist = node.children(); // "controls"
+		
+		if (nlist.empty()) {
+			return 0;
+		}
+		
+		nlist = nlist.front()->children ();
+		
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			
+			if ((prop = (*niter)->property ("id")) != 0) {
+
+				ID id = prop->value ();
+				c = session->controllable_by_id (id);
+				
+				if (c) {
+					MIDIControllable* mc = new MIDIControllable (*_port, *c);
+					if (mc->set_state (**niter) == 0) {
+						controllables.insert (mc);
+					}
+					
+				} else {
+					warning << string_compose (_("Generic MIDI control: controllable %1 not found in session (ignored)"),
+								   id)
+						<< endmsg;
+				}
+			}
+		}
+	} // end autobinding check
+	return 0;
+}
+
+int
+GenericMidiControlProtocol::set_feedback (bool yn)
+{
+	do_feedback = yn;
+	last_feedback_time = 0;
+	return 0;
+}
+
+bool
+GenericMidiControlProtocol::get_feedback () const
+{
+	return do_feedback;
+}
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
new file mode 100644
index 0000000000..dfff8810d1
--- /dev/null
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -0,0 +1,72 @@
+#ifndef ardour_generic_midi_control_protocol_h
+#define ardour_generic_midi_control_protocol_h
+
+#include <set>
+#include <glibmm/thread.h>
+#include <ardour/types.h>
+
+#include <control_protocol/control_protocol.h>
+
+namespace MIDI {
+	class Port;
+}
+
+namespace PBD {
+	class Controllable;
+}	
+
+namespace ARDOUR {
+	class Session;
+}
+
+class MIDIControllable;
+
+class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
+  public:
+	GenericMidiControlProtocol (ARDOUR::Session&);
+	virtual ~GenericMidiControlProtocol();
+
+	int set_active (bool yn);
+	static bool probe() { return true; }
+
+	MIDI::Port* port () const { return _port; }
+	void set_feedback_interval (ARDOUR::microseconds_t);
+
+	int set_feedback (bool yn);
+	bool get_feedback () const;
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&);
+
+  private:
+	MIDI::Port* _port;
+	ARDOUR::microseconds_t _feedback_interval;
+	ARDOUR::microseconds_t last_feedback_time;
+
+	bool  do_feedback;
+	bool  auto_binding;
+	void _send_feedback ();
+	void  send_feedback ();
+
+	typedef std::set<MIDIControllable*> MIDIControllables;
+	MIDIControllables controllables;
+
+	typedef std::list<std::pair<MIDIControllable*,sigc::connection> > MIDIPendingControllables;
+	MIDIPendingControllables pending_controllables;
+	Glib::Mutex controllables_lock;
+	Glib::Mutex pending_lock;
+
+	bool start_learning (PBD::Controllable*);
+	void stop_learning (PBD::Controllable*);
+
+	void learning_stopped (MIDIControllable*);
+
+	void create_binding (PBD::Controllable*, int, int);
+	void delete_binding (PBD::Controllable*);
+
+	void auto_binding_on();
+	void auto_binding_off();
+
+};
+
+#endif /* ardour_generic_midi_control_protocol_h */
diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc
new file mode 100644
index 0000000000..c70b5b6b61
--- /dev/null
+++ b/libs/surfaces/generic_midi/interface.cc
@@ -0,0 +1,58 @@
+#include <pbd/failed_constructor.h>
+
+#include <control_protocol/control_protocol.h>
+#include "generic_midi_control_protocol.h"
+
+using namespace ARDOUR;
+
+ControlProtocol*
+new_generic_midi_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+{
+	GenericMidiControlProtocol* gmcp;
+		
+	try {
+		gmcp =  new GenericMidiControlProtocol (*s);
+	} catch (failed_constructor& err) {
+		return 0;
+	}
+	
+	if (gmcp->set_active (true)) {
+		delete gmcp;
+		return 0;
+	}
+
+	return gmcp;
+}
+
+void
+delete_generic_midi_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+{
+	delete cp;
+}
+
+bool
+probe_generic_midi_protocol (ControlProtocolDescriptor* descriptor)
+{
+	return GenericMidiControlProtocol::probe ();
+}
+
+static ControlProtocolDescriptor generic_midi_descriptor = {
+	name : "Generic MIDI",
+	id : "uri://ardour.org/surfaces/generic_midi:0",
+	ptr : 0,
+	module : 0,
+	mandatory : 0,
+	supports_feedback : true,
+	probe : probe_generic_midi_protocol,
+	initialize : new_generic_midi_protocol,
+	destroy : delete_generic_midi_protocol
+};
+	
+
+extern "C" {
+ControlProtocolDescriptor* 
+protocol_descriptor () {
+	return &generic_midi_descriptor;
+}
+}
+
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
new file mode 100644
index 0000000000..7bf730b0f5
--- /dev/null
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -0,0 +1,382 @@
+/*
+    Copyright (C) 1998-2006 Paul Davis
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cstdio> /* for sprintf, sigh */
+#include <climits>
+#include <pbd/error.h>
+#include <pbd/xml++.h>
+#include <midi++/port.h>
+#include <midi++/channel.h>
+
+#include "midicontrollable.h"
+
+using namespace sigc;
+using namespace MIDI;
+using namespace PBD;
+using namespace ARDOUR;
+
+MIDIControllable::MIDIControllable (Port& p, Controllable& c, bool is_bistate)
+	: controllable (c), _port (p), bistate (is_bistate)
+{
+	setting = false;
+	last_value = 0; // got a better idea ?
+	control_type = none;
+	_control_description = "MIDI Control: none";
+	control_additional = (byte) -1;
+	connections = 0;
+	feedback = true; // for now
+	
+	/* use channel 0 ("1") as the initial channel */
+
+	midi_rebind (0);
+}
+
+MIDIControllable::~MIDIControllable ()
+{
+	drop_external_control ();
+}
+
+void
+MIDIControllable::midi_forget ()
+{
+	/* stop listening for incoming messages, but retain
+	   our existing event + type information.
+	*/
+	
+	if (connections > 0) {
+		midi_sense_connection[0].disconnect ();
+	} 
+	
+	if (connections > 1) {
+		midi_sense_connection[1].disconnect ();
+	}
+	
+	connections = 0;
+	midi_learn_connection.disconnect ();
+	
+}
+
+void
+MIDIControllable::midi_rebind (channel_t c)
+{
+	if (c >= 0) {
+		bind_midi (c, control_type, control_additional);
+	} else {
+		midi_forget ();
+	}
+}
+
+void
+MIDIControllable::learn_about_external_control ()
+{
+	drop_external_control ();
+	midi_learn_connection = _port.input()->any.connect (mem_fun (*this, &MIDIControllable::midi_receiver));
+}
+
+void
+MIDIControllable::stop_learning ()
+{
+	midi_learn_connection.disconnect ();
+}
+
+void
+MIDIControllable::drop_external_control ()
+{
+	cerr << "Dropping existing control using " << connections << " connections\n";
+
+	if (connections > 0) {
+		midi_sense_connection[0].disconnect ();
+	} 
+	if (connections > 1) {
+		midi_sense_connection[1].disconnect ();
+	}
+
+	connections = 0;
+	midi_learn_connection.disconnect ();
+
+	control_type = none;
+	control_additional = (byte) -1;
+}
+
+void 
+MIDIControllable::midi_sense_note_on (Parser &p, EventTwoBytes *tb) 
+{
+	midi_sense_note (p, tb, true);
+}
+
+void 
+MIDIControllable::midi_sense_note_off (Parser &p, EventTwoBytes *tb) 
+{
+	midi_sense_note (p, tb, false);
+}
+
+void
+MIDIControllable::midi_sense_note (Parser &p, EventTwoBytes *msg, bool is_on)
+{
+	if (!bistate) {
+		controllable.set_value (msg->note_number/127.0);
+	} else {
+
+		/* Note: parser handles the use of zero velocity to
+		   mean note off. if we get called with is_on=true, then we
+		   got a *real* note on.  
+		*/
+
+		if (msg->note_number == control_additional) {
+			controllable.set_value (is_on ? 1 : 0);
+		}
+	}
+
+	last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
+}
+
+void
+MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg)
+{
+	if (control_additional == msg->controller_number) {
+		if (!bistate) {
+			controllable.set_value (msg->value/127.0);
+		} else {
+			if (msg->value > 64.0) {
+				controllable.set_value (1);
+			} else {
+				controllable.set_value (0);
+			}
+		}
+
+		last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
+	}
+}
+
+void
+MIDIControllable::midi_sense_program_change (Parser &p, byte msg)
+{
+	/* XXX program change messages make no sense for bistates */
+
+	if (!bistate) {
+		controllable.set_value (msg/127.0);
+		last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
+	} 
+}
+
+void
+MIDIControllable::midi_sense_pitchbend (Parser &p, pitchbend_t pb)
+{
+	/* pitchbend messages make no sense for bistates */
+
+	/* XXX gack - get rid of assumption about typeof pitchbend_t */
+
+	controllable.set_value ((pb/(float) SHRT_MAX));
+	last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
+}			
+
+void
+MIDIControllable::midi_receiver (Parser &p, byte *msg, size_t len)
+{
+	/* we only respond to channel messages */
+
+	if ((msg[0] & 0xF0) < 0x80 || (msg[0] & 0xF0) > 0xE0) {
+		return;
+	}
+
+	/* if the our port doesn't do input anymore, forget it ... */
+
+	if (!_port.input()) {
+		return;
+	}
+
+	bind_midi ((channel_t) (msg[0] & 0xf), eventType (msg[0] & 0xF0), msg[1]);
+
+	controllable.LearningFinished ();
+}
+
+void
+MIDIControllable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional)
+{
+	char buf[64];
+
+	drop_external_control ();
+
+	control_type = ev;
+	control_channel = chn;
+	control_additional = additional;
+
+	if (_port.input() == 0) {
+		return;
+	}
+	
+	Parser& p = *_port.input();
+
+	int chn_i = chn;
+	switch (ev) {
+	case MIDI::off:
+		midi_sense_connection[0] = p.channel_note_off[chn_i].connect
+			(mem_fun (*this, &MIDIControllable::midi_sense_note_off));
+
+		/* if this is a bistate, connect to noteOn as well,
+		   and we'll toggle back and forth between the two.
+		*/
+
+		if (bistate) {
+			midi_sense_connection[1] = p.channel_note_on[chn_i].connect
+				(mem_fun (*this, &MIDIControllable::midi_sense_note_on));
+			connections = 2;
+		} else {
+			connections = 1;
+		}
+		_control_description = "MIDI control: NoteOff";
+		break;
+
+	case MIDI::on:
+		midi_sense_connection[0] = p.channel_note_on[chn_i].connect
+			(mem_fun (*this, &MIDIControllable::midi_sense_note_on));
+		if (bistate) {
+			midi_sense_connection[1] = p.channel_note_off[chn_i].connect 
+				(mem_fun (*this, &MIDIControllable::midi_sense_note_off));
+			connections = 2;
+		} else {
+			connections = 1;
+		}
+		_control_description = "MIDI control: NoteOn";
+		break;
+
+	case MIDI::controller:
+		midi_sense_connection[0] = p.channel_controller[chn_i].connect 
+			(mem_fun (*this, &MIDIControllable::midi_sense_controller));
+		connections = 1;
+		snprintf (buf, sizeof (buf), "MIDI control: Controller %d", control_additional);
+		_control_description = buf;
+		break;
+
+	case MIDI::program:
+		if (!bistate) {
+			midi_sense_connection[0] = p.channel_program_change[chn_i].connect
+				(mem_fun (*this, 
+				       &MIDIControllable::midi_sense_program_change));
+			connections = 1;
+			_control_description = "MIDI control: ProgramChange";
+		}
+		break;
+
+	case MIDI::pitchbend:
+		if (!bistate) {
+			midi_sense_connection[0] = p.channel_pitchbend[chn_i].connect
+				(mem_fun (*this, &MIDIControllable::midi_sense_pitchbend));
+			connections = 1;
+			_control_description = "MIDI control: Pitchbend";
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	cerr << "MIDI bound with " << connections << endl;
+}
+
+void
+MIDIControllable::send_feedback ()
+{
+	byte msg[3];
+
+	if (setting || !feedback || control_type == none) {
+		return;
+	}
+
+	msg[0] = (control_type & 0xF0) | (control_channel & 0xF); 
+	msg[1] = control_additional;
+	msg[2] = (byte) (controllable.get_value() * 127.0f);
+
+	//_port.write (msg, 3);
+}
+
+MIDI::byte*
+MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force)
+{
+	if (control_type != none && feedback && bufsize > 2) {
+
+		MIDI::byte gm = (MIDI::byte) (controllable.get_value() * 127.0);
+		
+		if (gm != last_value) {
+			*buf++ = (0xF0 & control_type) | (0xF & control_channel);
+			*buf++ = control_additional; /* controller number */
+			*buf++ = gm;
+			last_value = gm;
+			bufsize -= 3;
+		}
+	}
+	
+	return buf;
+}
+
+int 
+MIDIControllable::set_state (const XMLNode& node)
+{
+	const XMLProperty* prop;
+	int xx;
+
+	if ((prop = node.property ("event")) != 0) {
+		sscanf (prop->value().c_str(), "0x%x", &xx);
+		control_type = (MIDI::eventType) xx;
+	} else {
+		return -1;
+	}
+
+	if ((prop = node.property ("channel")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &xx);
+		control_channel = (MIDI::channel_t) xx;
+	} else {
+		return -1;
+	}
+
+	if ((prop = node.property ("additional")) != 0) {
+		sscanf (prop->value().c_str(), "0x%x", &xx);
+		control_additional = (MIDI::byte) xx;
+	} else {
+		return -1;
+	}
+
+	if ((prop = node.property ("feedback")) != 0) {
+		feedback = (prop->value() == "yes");
+	} else {
+		feedback = true; // default
+	}
+
+	bind_midi (control_channel, control_type, control_additional);
+	
+	return 0;
+}
+
+XMLNode&
+MIDIControllable::get_state ()
+{
+	char buf[32];
+	XMLNode& node (controllable.get_state ());
+
+	snprintf (buf, sizeof(buf), "0x%x", (int) control_type);
+	node.add_property ("event", buf);
+	snprintf (buf, sizeof(buf), "%d", (int) control_channel);
+	node.add_property ("channel", buf);
+	snprintf (buf, sizeof(buf), "0x%x", (int) control_additional);
+	node.add_property ("additional", buf);
+	node.add_property ("feedback", (feedback ? "yes" : "no"));
+
+	return node;
+}
+
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
new file mode 100644
index 0000000000..976c2d00fb
--- /dev/null
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -0,0 +1,96 @@
+/*
+    Copyright (C) 1998-2006 Paul Davis
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __gm_midicontrollable_h__
+#define __gm_midicontrollable_h__
+
+#include <string>
+
+#include <sigc++/sigc++.h>
+
+#include <midi++/types.h>
+#include <pbd/controllable.h>
+#include <pbd/stateful.h>
+#include <ardour/types.h>
+
+namespace MIDI {
+
+class Channel;
+class Port;
+class Parser;
+
+}
+
+class MIDIControllable : public PBD::Stateful
+{
+  public:
+	MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false);
+	virtual ~MIDIControllable ();
+
+	void send_feedback ();
+	MIDI::byte* write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force = false);
+	
+	void midi_rebind (MIDI::channel_t channel=-1);
+	void midi_forget ();
+	void learn_about_external_control ();
+	void stop_learning ();
+	void drop_external_control ();
+
+	bool get_midi_feedback () { return feedback; }
+	void set_midi_feedback (bool val) { feedback = val; }
+
+	MIDI::Port& get_port() const { return _port; }
+	PBD::Controllable& get_controllable() const { return controllable; }
+
+	std::string control_description() const { return _control_description; }
+
+	XMLNode& get_state (void);
+	int set_state (const XMLNode&);
+
+	void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
+	MIDI::channel_t get_control_channel () { return control_channel; }
+	MIDI::eventType get_control_type () { return control_type; }
+	MIDI::byte get_control_additional () { return control_additional; }
+  private:
+	PBD::Controllable& controllable;
+	MIDI::Port&     _port;
+	bool             setting;
+	MIDI::byte       last_value;
+	bool             bistate;
+	int              midi_msg_id;      /* controller ID or note number */
+	sigc::connection midi_sense_connection[2];
+	sigc::connection midi_learn_connection;
+	size_t           connections;
+	MIDI::eventType  control_type;
+	MIDI::byte       control_additional;
+	MIDI::channel_t  control_channel;
+	std::string     _control_description;
+	bool             feedback;
+	
+	void midi_receiver (MIDI::Parser &p, MIDI::byte *, size_t);
+	void midi_sense_note (MIDI::Parser &, MIDI::EventTwoBytes *, bool is_on);
+	void midi_sense_note_on (MIDI::Parser &p, MIDI::EventTwoBytes *tb);
+	void midi_sense_note_off (MIDI::Parser &p, MIDI::EventTwoBytes *tb);
+	void midi_sense_controller (MIDI::Parser &, MIDI::EventTwoBytes *);
+	void midi_sense_program_change (MIDI::Parser &, MIDI::byte);
+	void midi_sense_pitchbend (MIDI::Parser &, MIDI::pitchbend_t);
+};
+
+#endif // __gm_midicontrollable_h__
+
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
new file mode 100644
index 0000000000..4882658920
--- /dev/null
+++ b/libs/surfaces/mackie/SConscript
@@ -0,0 +1,77 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+mackie = env.Copy()
+
+#
+# this defines the version number of libardour_mackie
+# 
+
+domain = 'ardour_mackie'
+
+mackie.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+mackie.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+mackie.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+mackie.Append(PACKAGE = domain)
+mackie.Append(POTFILE = domain + '.pot')
+
+if mackie['IS_OSX']:
+    mackie.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+
+mackie_files=Split("""
+interface.cc
+midi_byte_array.cc
+controls.cc
+route_signal.cc
+mackie_midi_builder.cc
+mackie_button_handler.cc
+mackie_control_protocol_poll.cc
+surface_port.cc
+mackie_port.cc
+types.cc
+surface.cc
+mackie_control_protocol.cc
+bcf_surface.cc
+mackie_surface.cc
+""")
+
+mackie.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+mackie.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+mackie.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+mackie.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+
+mackie.Merge ([
+    libraries['ardour'],
+    libraries['ardour_cp'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['glib2'],
+    libraries['glibmm2'],
+    libraries['sndfile-ardour']
+    ])
+
+libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files)
+
+test_files = Split("""
+midi_byte_array.cc
+test.cc
+""")
+mackie_test = Program('mackie_test', test_files )
+
+if mackie['SURFACES']:
+	Default(libardour_mackie)
+	if env['NLS']:
+		i18n (mackie, mackie_files, env)
+	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+				     [ 'SConscript' ] +
+				     mackie_files + 
+				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/mackie/TODO b/libs/surfaces/mackie/TODO
new file mode 100644
index 0000000000..a9cb1b9878
--- /dev/null
+++ b/libs/surfaces/mackie/TODO
@@ -0,0 +1,45 @@
+* how long can UI signal callbacks take to execute? What happens if they block?
+  where ENSURE_CORRECT_THREAD is a macro that is modelled on ENSURE_GUI_THREAD
+  if the handler is not called in the "correct thread", it will use a pseudo-RT-safe-enough technique to get the correct thread to recall "handler" later on, and return.
+
+* jog with transport rolling doesn't work properly. My use of ScrollTimeline also doesn't work.
+* make loop button sensitive to current transport state
+* make sure rew button can go past the previous if pressed twice, relatively quickly.
+* finish button mapping. Only shifted buttons left for bcf.
+* concurrency for bank switching? And make sure "old" events aren't sent to "new" faders
+* TODOs in code
+* removal of a route results in a strip that isn't dead, but doesn't have any effect on the session
+* use i18n. see string_compose
+* docs in manual, including button assignment diagram
+
+Later
+-----
+* remove commented couts
+* Queueing of writes?
+* Generic surface code to common location
+* bulk remote id changes cause too many surface updates. use Config->remote_model.
+* which bank switching - overlap or dead faders? Option?
+* signals for buttons?
+* MackieControlProtocol in namespace Mackie?
+* power-cycling of surface. fd_midiport doesn't close.
+* mix busses and/or a "bus-only" bank/mode
+* what about surfaces like Mackie C4 and BCR2000?
+
+Need UI integration
+-------------------
+* Some indication on the UI of currently bank-switched-in routes?
+  Useful for surfaces that don't have a scribble strip.
+* use current zoom setting and snap state for shuttle wheel
+
+Actual Mackie
+-------------
+* docs claim that unit will send a host query on init.
+* test Mackie surface object. Apparently led rings don't work. Stereo busses?
+* timecode & 55 char displays
+* midi bandwidth
+
+Bugs
+----
+
+* definitely something wrong with remote_id assignment on session create
+  (master strip assigned 0).
diff --git a/libs/surfaces/mackie/bcf_surface.cc b/libs/surfaces/mackie/bcf_surface.cc
new file mode 100644
index 0000000000..45b5ad85fa
--- /dev/null
+++ b/libs/surfaces/mackie/bcf_surface.cc
@@ -0,0 +1,1443 @@
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "bcf_surface.h"
+
+#include "controls.h"
+#include "mackie_button_handler.h"
+
+using namespace Mackie;
+
+void Mackie::BcfSurface::init_controls()
+{
+	// intialise groups and strips
+	Group * group = 0;
+	
+	// make sure there are enough strips
+	strips.resize( 7 );
+	
+	group = new Group ( "user" );
+	groups["user"] = group;
+	
+	group = new Group ( "assignment" );
+	groups["assignment"] = group;
+	
+	group = new Group ( "none" );
+	groups["none"] = group;
+	
+	group = new MasterStrip ( "master", 0 );
+	groups["master"] = group;
+	strips[0] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_1", 0 );
+	groups["strip_1"] = group;
+	strips[0] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "cursor" );
+	groups["cursor"] = group;
+	
+	group = new Strip ( "strip_2", 1 );
+	groups["strip_2"] = group;
+	strips[1] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "functions" );
+	groups["functions"] = group;
+	
+	group = new Group ( "automation" );
+	groups["automation"] = group;
+	
+	group = new Strip ( "strip_3", 2 );
+	groups["strip_3"] = group;
+	strips[2] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "display" );
+	groups["display"] = group;
+	
+	group = new Strip ( "strip_4", 3 );
+	groups["strip_4"] = group;
+	strips[3] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_5", 4 );
+	groups["strip_5"] = group;
+	strips[4] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_6", 5 );
+	groups["strip_6"] = group;
+	strips[5] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "transport" );
+	groups["transport"] = group;
+	
+	group = new Strip ( "strip_7", 6 );
+	groups["strip_7"] = group;
+	strips[6] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "modifiers" );
+	groups["modifiers"] = group;
+	
+	group = new Group ( "bank" );
+	groups["bank"] = group;
+	
+
+	// initialise controls
+	Control * control = 0;
+
+	group = groups["strip_1"];
+	control = new Fader ( 0, 1, "gain", *group );
+	faders[0x00] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Fader ( 1, 2, "gain", *group );
+	faders[0x01] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Fader ( 2, 3, "gain", *group );
+	faders[0x02] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Fader ( 3, 4, "gain", *group );
+	faders[0x03] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Fader ( 4, 5, "gain", *group );
+	faders[0x04] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Fader ( 5, 6, "gain", *group );
+	faders[0x05] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Fader ( 6, 7, "gain", *group );
+	faders[0x06] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["master"];
+	control = new Fader ( 7, 1, "gain", *group );
+	faders[0x07] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Pot ( 16, 1, "vpot", *group );
+	pots[0x10] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Pot ( 17, 2, "vpot", *group );
+	pots[0x11] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Pot ( 18, 3, "vpot", *group );
+	pots[0x12] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Pot ( 19, 4, "vpot", *group );
+	pots[0x13] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Pot ( 20, 5, "vpot", *group );
+	pots[0x14] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Pot ( 21, 6, "vpot", *group );
+	pots[0x15] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Pot ( 22, 7, "vpot", *group );
+	pots[0x16] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Pot ( 23, 1, "jog", *group );
+	pots[0x17] = control;
+	controls.push_back( control );
+	controls_by_name["jog"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Pot ( 46, 1, "external", *group );
+	pots[0x2e] = control;
+	controls.push_back( control );
+	controls_by_name["external"] = control;
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 24, 1, "recenable", *group );
+	buttons[0x18] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 25, 2, "recenable", *group );
+	buttons[0x19] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 26, 3, "recenable", *group );
+	buttons[0x1a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 27, 4, "recenable", *group );
+	buttons[0x1b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 28, 5, "recenable", *group );
+	buttons[0x1c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 29, 6, "recenable", *group );
+	buttons[0x1d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 30, 7, "recenable", *group );
+	buttons[0x1e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 32, 1, "solo", *group );
+	buttons[0x20] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 33, 2, "solo", *group );
+	buttons[0x21] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 34, 3, "solo", *group );
+	buttons[0x22] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 35, 4, "solo", *group );
+	buttons[0x23] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 36, 5, "solo", *group );
+	buttons[0x24] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 37, 6, "solo", *group );
+	buttons[0x25] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 38, 7, "solo", *group );
+	buttons[0x26] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 16, 1, "mute", *group );
+	buttons[0x10] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 17, 2, "mute", *group );
+	buttons[0x11] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 18, 3, "mute", *group );
+	buttons[0x12] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 19, 4, "mute", *group );
+	buttons[0x13] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 20, 5, "mute", *group );
+	buttons[0x14] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 21, 6, "mute", *group );
+	buttons[0x15] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 22, 7, "mute", *group );
+	buttons[0x16] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 0, 1, "select", *group );
+	buttons[0x00] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 1, 2, "select", *group );
+	buttons[0x01] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 2, 3, "select", *group );
+	buttons[0x02] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 3, 4, "select", *group );
+	buttons[0x03] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 4, 5, "select", *group );
+	buttons[0x04] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 5, 6, "select", *group );
+	buttons[0x05] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 6, 7, "select", *group );
+	buttons[0x06] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 8, 1, "vselect", *group );
+	buttons[0x08] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 9, 2, "vselect", *group );
+	buttons[0x09] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 10, 3, "vselect", *group );
+	buttons[0x0a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 11, 4, "vselect", *group );
+	buttons[0x0b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 12, 5, "vselect", *group );
+	buttons[0x0c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 13, 6, "vselect", *group );
+	buttons[0x0d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 14, 7, "vselect", *group );
+	buttons[0x0e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 40, 1, "io", *group );
+	buttons[0x28] = control;
+	controls.push_back( control );
+	controls_by_name["io"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 90, 1, "sends", *group );
+	buttons[0x5a] = control;
+	controls.push_back( control );
+	controls_by_name["sends"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 89, 1, "pan", *group );
+	buttons[0x59] = control;
+	controls.push_back( control );
+	controls_by_name["pan"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 87, 1, "plugin", *group );
+	buttons[0x57] = control;
+	controls.push_back( control );
+	controls_by_name["plugin"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 88, 1, "eq", *group );
+	buttons[0x58] = control;
+	controls.push_back( control );
+	controls_by_name["eq"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 45, 1, "dyn", *group );
+	buttons[0x2d] = control;
+	controls.push_back( control );
+	controls_by_name["dyn"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 46, 1, "left", *group );
+	buttons[0x2e] = control;
+	controls.push_back( control );
+	controls_by_name["left"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 47, 1, "right", *group );
+	buttons[0x2f] = control;
+	controls.push_back( control );
+	controls_by_name["right"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 48, 1, "channel_left", *group );
+	buttons[0x30] = control;
+	controls.push_back( control );
+	controls_by_name["channel_left"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 49, 1, "channel_right", *group );
+	buttons[0x31] = control;
+	controls.push_back( control );
+	controls_by_name["channel_right"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 50, 1, "flip", *group );
+	buttons[0x32] = control;
+	controls.push_back( control );
+	controls_by_name["flip"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 86, 1, "edit", *group );
+	buttons[0x56] = control;
+	controls.push_back( control );
+	controls_by_name["edit"] = control;
+	group->add( *control );
+
+	group = groups["display"];
+	control = new Button ( 52, 1, "name_value", *group );
+	buttons[0x34] = control;
+	controls.push_back( control );
+	controls_by_name["name_value"] = control;
+	group->add( *control );
+
+	group = groups["display"];
+	control = new Button ( 53, 1, "smpte_beats", *group );
+	buttons[0x35] = control;
+	controls.push_back( control );
+	controls_by_name["smpte_beats"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 54, 1, "F1", *group );
+	buttons[0x36] = control;
+	controls.push_back( control );
+	controls_by_name["F1"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 55, 1, "F2", *group );
+	buttons[0x37] = control;
+	controls.push_back( control );
+	controls_by_name["F2"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 56, 1, "F3", *group );
+	buttons[0x38] = control;
+	controls.push_back( control );
+	controls_by_name["F3"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 57, 1, "F4", *group );
+	buttons[0x39] = control;
+	controls.push_back( control );
+	controls_by_name["F4"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 58, 1, "F5", *group );
+	buttons[0x3a] = control;
+	controls.push_back( control );
+	controls_by_name["F5"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 59, 1, "F6", *group );
+	buttons[0x3b] = control;
+	controls.push_back( control );
+	controls_by_name["F6"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 60, 1, "F7", *group );
+	buttons[0x3c] = control;
+	controls.push_back( control );
+	controls_by_name["F7"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 61, 1, "F8", *group );
+	buttons[0x3d] = control;
+	controls.push_back( control );
+	controls_by_name["F8"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 62, 1, "F9", *group );
+	buttons[0x3e] = control;
+	controls.push_back( control );
+	controls_by_name["F9"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 63, 1, "F10", *group );
+	buttons[0x3f] = control;
+	controls.push_back( control );
+	controls_by_name["F10"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 64, 1, "F11", *group );
+	buttons[0x40] = control;
+	controls.push_back( control );
+	controls_by_name["F11"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 65, 1, "F12", *group );
+	buttons[0x41] = control;
+	controls.push_back( control );
+	controls_by_name["F12"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 66, 1, "F13", *group );
+	buttons[0x42] = control;
+	controls.push_back( control );
+	controls_by_name["F13"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 67, 1, "F14", *group );
+	buttons[0x43] = control;
+	controls.push_back( control );
+	controls_by_name["F14"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 68, 1, "F15", *group );
+	buttons[0x44] = control;
+	controls.push_back( control );
+	controls_by_name["F15"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 69, 1, "F16", *group );
+	buttons[0x45] = control;
+	controls.push_back( control );
+	controls_by_name["F16"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 39, 1, "global_solo", *group );
+	buttons[0x27] = control;
+	controls.push_back( control );
+	controls_by_name["global_solo"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 80, 1, "option", *group );
+	buttons[0x50] = control;
+	controls.push_back( control );
+	controls_by_name["option"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 73, 1, "cmd_alt", *group );
+	buttons[0x49] = control;
+	controls.push_back( control );
+	controls_by_name["cmd_alt"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 74, 1, "on", *group );
+	buttons[0x4a] = control;
+	controls.push_back( control );
+	controls_by_name["on"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 75, 1, "rec_ready", *group );
+	buttons[0x4b] = control;
+	controls.push_back( control );
+	controls_by_name["rec_ready"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 76, 1, "undo", *group );
+	buttons[0x4c] = control;
+	controls.push_back( control );
+	controls_by_name["undo"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 77, 1, "snapshot", *group );
+	buttons[0x4d] = control;
+	controls.push_back( control );
+	controls_by_name["snapshot"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 79, 1, "redo", *group );
+	buttons[0x4f] = control;
+	controls.push_back( control );
+	controls_by_name["redo"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 71, 1, "marker", *group );
+	buttons[0x47] = control;
+	controls.push_back( control );
+	controls_by_name["marker"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 81, 1, "enter", *group );
+	buttons[0x51] = control;
+	controls.push_back( control );
+	controls_by_name["enter"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 82, 1, "cancel", *group );
+	buttons[0x52] = control;
+	controls.push_back( control );
+	controls_by_name["cancel"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 83, 1, "mixer", *group );
+	buttons[0x53] = control;
+	controls.push_back( control );
+	controls_by_name["mixer"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 91, 1, "frm_left", *group );
+	buttons[0x5b] = control;
+	controls.push_back( control );
+	controls_by_name["frm_left"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 92, 1, "frm_right", *group );
+	buttons[0x5c] = control;
+	controls.push_back( control );
+	controls_by_name["frm_right"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 70, 1, "loop", *group );
+	buttons[0x46] = control;
+	controls.push_back( control );
+	controls_by_name["loop"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 72, 1, "punch_in", *group );
+	buttons[0x48] = control;
+	controls.push_back( control );
+	controls_by_name["punch_in"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 78, 1, "punch_out", *group );
+	buttons[0x4e] = control;
+	controls.push_back( control );
+	controls_by_name["punch_out"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 42, 1, "home", *group );
+	buttons[0x2a] = control;
+	controls.push_back( control );
+	controls_by_name["home"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 41, 1, "end", *group );
+	buttons[0x29] = control;
+	controls.push_back( control );
+	controls_by_name["end"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 44, 1, "rewind", *group );
+	buttons[0x2c] = control;
+	controls.push_back( control );
+	controls_by_name["rewind"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 43, 1, "ffwd", *group );
+	buttons[0x2b] = control;
+	controls.push_back( control );
+	controls_by_name["ffwd"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 93, 1, "stop", *group );
+	buttons[0x5d] = control;
+	controls.push_back( control );
+	controls_by_name["stop"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 94, 1, "play", *group );
+	buttons[0x5e] = control;
+	controls.push_back( control );
+	controls_by_name["play"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 31, 1, "record", *group );
+	buttons[0x1f] = control;
+	controls.push_back( control );
+	controls_by_name["record"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 96, 1, "cursor_up", *group );
+	buttons[0x60] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_up"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 97, 1, "cursor_down", *group );
+	buttons[0x61] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_down"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 98, 1, "cursor_left", *group );
+	buttons[0x62] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_left"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 99, 1, "cursor_right", *group );
+	buttons[0x63] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_right"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 100, 1, "zoom", *group );
+	buttons[0x64] = control;
+	controls.push_back( control );
+	controls_by_name["zoom"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 101, 1, "scrub", *group );
+	buttons[0x65] = control;
+	controls.push_back( control );
+	controls_by_name["scrub"] = control;
+	group->add( *control );
+
+	group = groups["user"];
+	control = new Button ( 102, 1, "user_a", *group );
+	buttons[0x66] = control;
+	controls.push_back( control );
+	controls_by_name["user_a"] = control;
+	group->add( *control );
+
+	group = groups["user"];
+	control = new Button ( 103, 1, "user_b", *group );
+	buttons[0x67] = control;
+	controls.push_back( control );
+	controls_by_name["user_b"] = control;
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 104, 1, "fader_touch", *group );
+	buttons[0x68] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 105, 2, "fader_touch", *group );
+	buttons[0x69] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 106, 3, "fader_touch", *group );
+	buttons[0x6a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 107, 4, "fader_touch", *group );
+	buttons[0x6b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 108, 5, "fader_touch", *group );
+	buttons[0x6c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 109, 6, "fader_touch", *group );
+	buttons[0x6d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 110, 7, "fader_touch", *group );
+	buttons[0x6e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["master"];
+	control = new Button ( 111, 1, "fader_touch", *group );
+	buttons[0x6f] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["master"];
+	control = new Button ( 23, 1, "mute", *group );
+	buttons[0x17] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 51, 1, "clicking", *group );
+	buttons[0x33] = control;
+	controls.push_back( control );
+	controls_by_name["clicking"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 113, 1, "smpte", *group );
+	leds[0x71] = control;
+	controls.push_back( control );
+	controls_by_name["smpte"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 114, 1, "beats", *group );
+	leds[0x72] = control;
+	controls.push_back( control );
+	controls_by_name["beats"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 115, 1, "solo", *group );
+	leds[0x73] = control;
+	controls.push_back( control );
+	controls_by_name["solo"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 118, 1, "relay_click", *group );
+	leds[0x76] = control;
+	controls.push_back( control );
+	controls_by_name["relay_click"] = control;
+	group->add( *control );
+
+}
+
+void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button )
+{
+	if ( bs != press && bs != release )
+	{
+		mbh.update_led( button, none );
+		return;
+	}
+	
+	LedState ls;
+	switch ( button.id() )
+	{
+
+		case 0x28: // io
+			switch ( bs ) {
+				case press: ls = mbh.io_press( button ); break;
+				case release: ls = mbh.io_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5a: // sends
+			switch ( bs ) {
+				case press: ls = mbh.sends_press( button ); break;
+				case release: ls = mbh.sends_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x59: // pan
+			switch ( bs ) {
+				case press: ls = mbh.pan_press( button ); break;
+				case release: ls = mbh.pan_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x57: // plugin
+			switch ( bs ) {
+				case press: ls = mbh.plugin_press( button ); break;
+				case release: ls = mbh.plugin_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x58: // eq
+			switch ( bs ) {
+				case press: ls = mbh.eq_press( button ); break;
+				case release: ls = mbh.eq_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2d: // dyn
+			switch ( bs ) {
+				case press: ls = mbh.dyn_press( button ); break;
+				case release: ls = mbh.dyn_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2e: // left
+			switch ( bs ) {
+				case press: ls = mbh.left_press( button ); break;
+				case release: ls = mbh.left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2f: // right
+			switch ( bs ) {
+				case press: ls = mbh.right_press( button ); break;
+				case release: ls = mbh.right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x30: // channel_left
+			switch ( bs ) {
+				case press: ls = mbh.channel_left_press( button ); break;
+				case release: ls = mbh.channel_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x31: // channel_right
+			switch ( bs ) {
+				case press: ls = mbh.channel_right_press( button ); break;
+				case release: ls = mbh.channel_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x32: // flip
+			switch ( bs ) {
+				case press: ls = mbh.flip_press( button ); break;
+				case release: ls = mbh.flip_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x56: // edit
+			switch ( bs ) {
+				case press: ls = mbh.edit_press( button ); break;
+				case release: ls = mbh.edit_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x34: // name_value
+			switch ( bs ) {
+				case press: ls = mbh.name_value_press( button ); break;
+				case release: ls = mbh.name_value_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x35: // smpte_beats
+			switch ( bs ) {
+				case press: ls = mbh.smpte_beats_press( button ); break;
+				case release: ls = mbh.smpte_beats_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x36: // F1
+			switch ( bs ) {
+				case press: ls = mbh.F1_press( button ); break;
+				case release: ls = mbh.F1_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x37: // F2
+			switch ( bs ) {
+				case press: ls = mbh.F2_press( button ); break;
+				case release: ls = mbh.F2_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x38: // F3
+			switch ( bs ) {
+				case press: ls = mbh.F3_press( button ); break;
+				case release: ls = mbh.F3_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x39: // F4
+			switch ( bs ) {
+				case press: ls = mbh.F4_press( button ); break;
+				case release: ls = mbh.F4_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3a: // F5
+			switch ( bs ) {
+				case press: ls = mbh.F5_press( button ); break;
+				case release: ls = mbh.F5_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3b: // F6
+			switch ( bs ) {
+				case press: ls = mbh.F6_press( button ); break;
+				case release: ls = mbh.F6_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3c: // F7
+			switch ( bs ) {
+				case press: ls = mbh.F7_press( button ); break;
+				case release: ls = mbh.F7_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3d: // F8
+			switch ( bs ) {
+				case press: ls = mbh.F8_press( button ); break;
+				case release: ls = mbh.F8_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3e: // F9
+			switch ( bs ) {
+				case press: ls = mbh.F9_press( button ); break;
+				case release: ls = mbh.F9_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3f: // F10
+			switch ( bs ) {
+				case press: ls = mbh.F10_press( button ); break;
+				case release: ls = mbh.F10_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x40: // F11
+			switch ( bs ) {
+				case press: ls = mbh.F11_press( button ); break;
+				case release: ls = mbh.F11_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x41: // F12
+			switch ( bs ) {
+				case press: ls = mbh.F12_press( button ); break;
+				case release: ls = mbh.F12_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x42: // F13
+			switch ( bs ) {
+				case press: ls = mbh.F13_press( button ); break;
+				case release: ls = mbh.F13_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x43: // F14
+			switch ( bs ) {
+				case press: ls = mbh.F14_press( button ); break;
+				case release: ls = mbh.F14_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x44: // F15
+			switch ( bs ) {
+				case press: ls = mbh.F15_press( button ); break;
+				case release: ls = mbh.F15_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x45: // F16
+			switch ( bs ) {
+				case press: ls = mbh.F16_press( button ); break;
+				case release: ls = mbh.F16_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x27: // global_solo
+			switch ( bs ) {
+				case press: ls = mbh.global_solo_press( button ); break;
+				case release: ls = mbh.global_solo_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x50: // option
+			switch ( bs ) {
+				case press: ls = mbh.option_press( button ); break;
+				case release: ls = mbh.option_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x49: // cmd_alt
+			switch ( bs ) {
+				case press: ls = mbh.cmd_alt_press( button ); break;
+				case release: ls = mbh.cmd_alt_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4a: // on
+			switch ( bs ) {
+				case press: ls = mbh.on_press( button ); break;
+				case release: ls = mbh.on_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4b: // rec_ready
+			switch ( bs ) {
+				case press: ls = mbh.rec_ready_press( button ); break;
+				case release: ls = mbh.rec_ready_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4c: // undo
+			switch ( bs ) {
+				case press: ls = mbh.undo_press( button ); break;
+				case release: ls = mbh.undo_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4d: // snapshot
+			switch ( bs ) {
+				case press: ls = mbh.snapshot_press( button ); break;
+				case release: ls = mbh.snapshot_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4f: // redo
+			switch ( bs ) {
+				case press: ls = mbh.redo_press( button ); break;
+				case release: ls = mbh.redo_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x47: // marker
+			switch ( bs ) {
+				case press: ls = mbh.marker_press( button ); break;
+				case release: ls = mbh.marker_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x51: // enter
+			switch ( bs ) {
+				case press: ls = mbh.enter_press( button ); break;
+				case release: ls = mbh.enter_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x52: // cancel
+			switch ( bs ) {
+				case press: ls = mbh.cancel_press( button ); break;
+				case release: ls = mbh.cancel_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x53: // mixer
+			switch ( bs ) {
+				case press: ls = mbh.mixer_press( button ); break;
+				case release: ls = mbh.mixer_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5b: // frm_left
+			switch ( bs ) {
+				case press: ls = mbh.frm_left_press( button ); break;
+				case release: ls = mbh.frm_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5c: // frm_right
+			switch ( bs ) {
+				case press: ls = mbh.frm_right_press( button ); break;
+				case release: ls = mbh.frm_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x46: // loop
+			switch ( bs ) {
+				case press: ls = mbh.loop_press( button ); break;
+				case release: ls = mbh.loop_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x48: // punch_in
+			switch ( bs ) {
+				case press: ls = mbh.punch_in_press( button ); break;
+				case release: ls = mbh.punch_in_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4e: // punch_out
+			switch ( bs ) {
+				case press: ls = mbh.punch_out_press( button ); break;
+				case release: ls = mbh.punch_out_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2a: // home
+			switch ( bs ) {
+				case press: ls = mbh.home_press( button ); break;
+				case release: ls = mbh.home_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x29: // end
+			switch ( bs ) {
+				case press: ls = mbh.end_press( button ); break;
+				case release: ls = mbh.end_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2c: // rewind
+			switch ( bs ) {
+				case press: ls = mbh.rewind_press( button ); break;
+				case release: ls = mbh.rewind_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2b: // ffwd
+			switch ( bs ) {
+				case press: ls = mbh.ffwd_press( button ); break;
+				case release: ls = mbh.ffwd_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5d: // stop
+			switch ( bs ) {
+				case press: ls = mbh.stop_press( button ); break;
+				case release: ls = mbh.stop_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5e: // play
+			switch ( bs ) {
+				case press: ls = mbh.play_press( button ); break;
+				case release: ls = mbh.play_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x1f: // record
+			switch ( bs ) {
+				case press: ls = mbh.record_press( button ); break;
+				case release: ls = mbh.record_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x60: // cursor_up
+			switch ( bs ) {
+				case press: ls = mbh.cursor_up_press( button ); break;
+				case release: ls = mbh.cursor_up_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x61: // cursor_down
+			switch ( bs ) {
+				case press: ls = mbh.cursor_down_press( button ); break;
+				case release: ls = mbh.cursor_down_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x62: // cursor_left
+			switch ( bs ) {
+				case press: ls = mbh.cursor_left_press( button ); break;
+				case release: ls = mbh.cursor_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x63: // cursor_right
+			switch ( bs ) {
+				case press: ls = mbh.cursor_right_press( button ); break;
+				case release: ls = mbh.cursor_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x64: // zoom
+			switch ( bs ) {
+				case press: ls = mbh.zoom_press( button ); break;
+				case release: ls = mbh.zoom_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x65: // scrub
+			switch ( bs ) {
+				case press: ls = mbh.scrub_press( button ); break;
+				case release: ls = mbh.scrub_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x66: // user_a
+			switch ( bs ) {
+				case press: ls = mbh.user_a_press( button ); break;
+				case release: ls = mbh.user_a_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x67: // user_b
+			switch ( bs ) {
+				case press: ls = mbh.user_b_press( button ); break;
+				case release: ls = mbh.user_b_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x33: // clicking
+			switch ( bs ) {
+				case press: ls = mbh.clicking_press( button ); break;
+				case release: ls = mbh.clicking_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+	}
+	mbh.update_led( button, ls );
+}
diff --git a/libs/surfaces/mackie/bcf_surface.h b/libs/surfaces/mackie/bcf_surface.h
new file mode 100644
index 0000000000..a5fd3bf5a3
--- /dev/null
+++ b/libs/surfaces/mackie/bcf_surface.h
@@ -0,0 +1,27 @@
+#ifndef mackie_surface_bcf_h
+#define mackie_surface_bcf_h
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "surface.h"
+
+namespace Mackie
+{
+
+class MackieButtonHandler;
+
+class BcfSurface : public Surface
+{
+public:
+	BcfSurface( uint32_t max_strips ) : Surface( max_strips )
+	{
+	}
+	
+	virtual void handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button );
+	virtual void init_controls();
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
new file mode 100644
index 0000000000..e9808119b2
--- /dev/null
+++ b/libs/surfaces/mackie/controls.cc
@@ -0,0 +1,109 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "controls.h"
+#include "types.h"
+#include "mackie_midi_builder.h"
+
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+
+using namespace Mackie;
+using namespace std;
+
+void Group::add( Control & control )
+{
+	_controls.push_back( &control );
+}
+
+Strip::Strip( const std::string & name, int index )
+	: Group( name )
+	, _solo( 0 )
+	, _recenable( 0 )
+	, _mute( 0 )
+	, _select( 0 )
+	, _vselect( 0 )
+	, _fader_touch( 0 )
+	, _vpot( 0 )
+	, _gain( 0 )
+	, _index( index )
+{
+}
+
+/**
+ generated with
+
+controls[1].each do |x|
+  puts <<EOF
+#{x.class.name} & Strip::#{x.name}()
+{
+	if ( _#{x.name} == 0 )
+		throw MackieControlException( "#{x.name} is null" );
+	return *_#{x.name};
+}
+EOF
+end
+*/
+Fader & Strip::gain()
+{
+	if ( _gain == 0 )
+		throw MackieControlException( "gain is null" );
+	return *_gain;
+}
+Pot & Strip::vpot()
+{
+	if ( _vpot == 0 )
+		throw MackieControlException( "vpot is null" );
+	return *_vpot;
+}
+Button & Strip::recenable()
+{
+	if ( _recenable == 0 )
+		throw MackieControlException( "recenable is null" );
+	return *_recenable;
+}
+Button & Strip::solo()
+{
+	if ( _solo == 0 )
+		throw MackieControlException( "solo is null" );
+	return *_solo;
+}
+Button & Strip::mute()
+{
+	if ( _mute == 0 )
+		throw MackieControlException( "mute is null" );
+	return *_mute;
+}
+Button & Strip::select()
+{
+	if ( _select == 0 )
+		throw MackieControlException( "select is null" );
+	return *_select;
+}
+Button & Strip::vselect()
+{
+	if ( _vselect == 0 )
+		throw MackieControlException( "vselect is null" );
+	return *_vselect;
+}
+Button & Strip::fader_touch()
+{
+	if ( _fader_touch == 0 )
+		throw MackieControlException( "fader_touch is null" );
+	return *_fader_touch;
+}
diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h
new file mode 100644
index 0000000000..1092c40453
--- /dev/null
+++ b/libs/surfaces/mackie/controls.h
@@ -0,0 +1,301 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef mackie_controls_h
+#define mackie_controls_h
+
+#include <map>
+#include <vector>
+#include <string>
+
+#include "mackie_control_exception.h"
+
+namespace Mackie
+{
+
+class Control;
+
+/**
+	This is a loose group of controls, eg cursor buttons,
+	transport buttons, functions buttons etc.
+*/
+class Group
+{
+public:
+	Group( const std::string & name )
+	: _name( name )
+	{
+	}
+	
+	virtual ~Group() {}
+	
+	virtual bool is_strip() const
+	{
+		return false;
+	}
+	
+	virtual bool is_master() const
+	{
+		return false;
+	}
+	
+	virtual void add( Control & control );
+	
+	const std::string & name() const
+	{
+		return _name;
+	}
+	
+	// This is for Surface only
+	void name( const std::string & rhs ) { _name = rhs; }
+	
+	typedef std::vector<Control*> Controls;
+	const Controls & controls() const { return _controls; }
+	
+protected:
+	Controls _controls;
+	
+private:
+	std::string _name;
+};
+
+class Button;
+class Pot;
+class Fader;
+
+/**
+	This is the set of controls that make up a strip.
+*/
+class Strip : public Group
+{
+public:
+	Strip( const std::string & name, int index );
+	
+	virtual bool is_strip() const
+	{
+		return true;
+	}
+	
+	virtual void add( Control & control );
+	
+	/// This is the index of the strip
+	int index() const { return _index; }
+	
+	/// This is for Surface only
+	void index( int rhs ) { _index = rhs; }
+	
+	Button & solo();
+	Button & recenable();
+	Button & mute();
+	Button & select();
+	Button & vselect();
+	Button & fader_touch();
+	Pot & vpot();
+	Fader & gain();
+	
+	bool has_solo() { return _solo != 0; }
+	bool has_recenable() { return _recenable != 0; }
+	bool has_mute() { return _mute != 0; }
+	bool has_select() { return _select != 0; }
+	bool has_vselect() { return _vselect != 0; }
+	bool has_fader_touch() { return _fader_touch != 0; }
+	bool has_vpot() { return _vpot != 0; }
+	bool has_gain() { return _gain != 0; }
+	
+private:
+	Button * _solo;
+	Button * _recenable;
+	Button * _mute;
+	Button * _select;
+	Button * _vselect;
+	Button * _fader_touch;
+	Pot * _vpot;
+	Fader * _gain;
+	int _index;
+};
+
+class MasterStrip : public Strip
+{
+public:
+	MasterStrip( const std::string & name, int index )
+	: Strip( name, index )
+	{
+	}
+	
+	virtual bool is_master() const
+	{
+		return true;
+	}
+};
+
+class Led;
+
+/**
+	The base class for controls on the surface. They deliberately
+	don't know the midi protocol for updating them.
+*/
+class Control
+{
+public:
+	enum type_t { type_fader, type_button, type_pot, type_led, type_led_ring };
+	
+	Control( int id, int ordinal, std::string name, Group & group )
+	: _id( id ), _ordinal( ordinal ), _name( name ), _group( group )
+	{
+	}
+	
+	virtual ~Control() {}
+	
+	virtual const Led & led() const
+	{
+		throw MackieControlException( "no led available" );
+	}
+
+	/// The midi id of the control
+	int id() const
+	{
+		return _id;
+	}
+	
+	/// The 1-based number of the control
+	int ordinal() const
+	{
+		return _ordinal;
+	}
+	
+	const std::string & name() const
+	{
+		return _name;
+	}
+	
+	const Group & group() const
+	{
+		return _group;
+	}
+	
+	const Strip & strip() const
+	{
+		return dynamic_cast<const Strip&>( _group );
+	}
+	
+	Strip & strip()
+	{
+		return dynamic_cast<Strip&>( _group );
+	}
+	
+	virtual bool accepts_feedback() const
+	{
+		return true;
+	}
+	
+	virtual type_t type() const = 0;
+	
+private:
+	int _id;
+	int _ordinal;
+	std::string _name;
+	Group & _group;
+};
+
+std::ostream & operator << ( std::ostream & os, const Control & control );
+
+class Fader : public Control
+{
+public:
+	Fader( int id, int ordinal, std::string name, Group & group )
+	: Control( id, ordinal, name, group )
+	, _touch( false )
+	{
+	}
+	
+	bool touch() const { return _touch; }
+	
+	void touch( bool yn ) { _touch = yn; }
+
+	virtual type_t type() const { return type_fader; }
+
+private:
+	bool _touch;
+};
+
+class Led : public Control
+{
+public:
+	Led( int id, int ordinal, std::string name, Group & group )
+	: Control( id, ordinal, name, group )
+	{
+	}
+	
+	virtual const Led & led() const { return *this; }
+
+	virtual type_t type() const { return type_led; }
+};
+
+class Button : public Control
+{
+public:
+	Button( int id, int ordinal, std::string name, Group & group )
+	: Control( id, ordinal, name, group )
+	, _led( id, ordinal, name + "_led", group )
+	{
+	}
+	
+	virtual const Led & led() const
+	{
+		return _led;
+	}
+	
+	virtual type_t type() const { return type_button; };
+
+private:
+	Led _led;
+};
+
+class LedRing : public Led
+{
+public:
+	LedRing( int id, int ordinal, std::string name, Group & group )
+	: Led( id, ordinal, name, group )
+	{
+	}
+
+	virtual type_t type() const { return type_led_ring; }
+};
+
+class Pot : public Control
+{
+public:
+	Pot( int id, int ordinal, std::string name, Group & group )
+	: Control( id, ordinal, name, group )
+	, _led_ring( id, ordinal, name + "_ring", group )
+	{
+	}
+
+	virtual type_t type() const { return type_pot; }
+
+	virtual const LedRing & led_ring() const
+	{
+		return _led_ring;
+	}
+
+private:
+	LedRing _led_ring;
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
new file mode 100644
index 0000000000..eda485b5d6
--- /dev/null
+++ b/libs/surfaces/mackie/interface.cc
@@ -0,0 +1,96 @@
+/*
+	Copyright (C) 2006,2007 Paul Davis
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include <control_protocol/control_protocol.h>
+#include "mackie_control_protocol.h"
+
+#include <pbd/error.h>
+
+#include <stdexcept>
+
+using namespace ARDOUR;
+using namespace PBD;
+using namespace std;
+
+ControlProtocol*
+new_mackie_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+{
+	if ( Config->get_mmc_port_name().substr(0,3) == "mcu" )
+	{
+		error << "mcu already used as mmc port" << endmsg;
+	}
+	else if ( Config->get_mtc_port_name().substr(0,3) == "mcu" )
+	{
+		error << "mcu already used as mtc port" << endmsg;
+	}
+	else if ( Config->get_midi_port_name().substr(0,3) == "mcu" )
+	{
+		error << "mcu already used as midi port" << endmsg;
+	}
+	else
+	{
+		// no one else is using the port, so try instantiate the object
+		MackieControlProtocol * mcp = 0;
+		try
+		{
+			mcp = new MackieControlProtocol (*s);
+			mcp->set_active( true );
+		}
+		catch( exception & e )
+		{
+			error << "Error instantiating MackieControlProtocol: " << e.what() << endmsg;
+			delete mcp;
+			mcp = 0;
+		}
+		return mcp;
+	}
+	return 0;
+}
+
+void
+delete_mackie_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+{
+	delete cp;
+}
+
+bool
+probe_mackie_protocol (ControlProtocolDescriptor* descriptor)
+{
+	return MackieControlProtocol::probe();
+}
+
+static ControlProtocolDescriptor mackie_descriptor = {
+	name : "Mackie",
+	id : "uri://ardour.org/surfaces/mackie:0",
+	ptr : 0,
+	module : 0,
+	mandatory : 0,
+	supports_feedback : true,
+	probe : probe_mackie_protocol,
+	initialize : new_mackie_protocol,
+	destroy : delete_mackie_protocol
+};
+	
+
+extern "C" {
+
+ControlProtocolDescriptor* 
+protocol_descriptor () {
+	return &mackie_descriptor;
+}
+
+}
diff --git a/libs/surfaces/mackie/mackie_button_handler.cc b/libs/surfaces/mackie/mackie_button_handler.cc
new file mode 100644
index 0000000000..f7ac2ab6d5
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_button_handler.cc
@@ -0,0 +1,691 @@
+/*
+	Generated by scripts/generate-button-handlers.erb
+*/
+#include "mackie_button_handler.h"
+#include "controls.h"
+
+#include <iostream>
+
+using namespace std;
+using namespace Mackie;
+
+LedState MackieButtonHandler::default_button_press( Button & button )
+{
+	cout << "press: " << button << endl;
+	return on;
+}
+LedState MackieButtonHandler::default_button_release( Button & button )
+{
+	cout << "release: " << button << endl;
+	return off;
+}
+
+LedState MackieButtonHandler::io_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::io_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::sends_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::sends_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::pan_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::pan_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::plugin_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::plugin_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::eq_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::eq_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::dyn_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::dyn_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::left_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::left_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::right_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::right_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::channel_left_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::channel_left_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::channel_right_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::channel_right_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::flip_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::flip_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::edit_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::edit_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::name_value_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::name_value_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::smpte_beats_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::smpte_beats_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F1_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F1_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F2_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F2_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F3_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F3_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F4_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F4_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F5_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F5_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F6_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F6_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F7_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F7_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F8_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F8_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F9_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F9_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F10_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F10_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F11_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F11_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F12_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F12_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F13_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F13_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F14_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F14_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F15_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F15_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::F16_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::F16_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::shift_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::shift_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::option_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::option_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::control_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::control_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cmd_alt_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cmd_alt_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::on_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::on_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::rec_ready_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::rec_ready_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::undo_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::undo_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::snapshot_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::snapshot_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::touch_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::touch_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::redo_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::redo_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::marker_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::marker_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::enter_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::enter_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cancel_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cancel_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::mixer_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::mixer_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::frm_left_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::frm_left_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::frm_right_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::frm_right_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::loop_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::loop_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::punch_in_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::punch_in_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::punch_out_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::punch_out_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::home_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::home_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::end_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::end_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::rewind_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::rewind_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::ffwd_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::ffwd_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::stop_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::stop_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::play_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::play_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::record_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::record_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cursor_up_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cursor_up_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cursor_down_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cursor_down_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cursor_left_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cursor_left_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::cursor_right_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::cursor_right_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::zoom_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::zoom_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::scrub_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::scrub_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::user_a_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::user_a_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::user_b_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::user_b_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::fader_touch_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::fader_touch_release( Button & button )
+{
+	return default_button_release( button );
+}
+
+LedState MackieButtonHandler::clicking_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::clicking_release( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::global_solo_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::global_solo_release( Button & button )
+{
+	return default_button_press( button );
+}
diff --git a/libs/surfaces/mackie/mackie_button_handler.h b/libs/surfaces/mackie/mackie_button_handler.h
new file mode 100644
index 0000000000..ee4187c7ce
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_button_handler.h
@@ -0,0 +1,227 @@
+#ifndef mackie_button_handler_h
+#define mackie_button_handler_h
+/*
+	Generated by scripts/generate-button-handlers.erb
+*/
+
+#include "types.h"
+
+namespace Mackie
+{
+
+class MackieButtonHandler
+{
+public:
+	virtual ~MackieButtonHandler() {}
+	
+	virtual LedState default_button_press( Button & button );
+	virtual LedState default_button_release( Button & button );
+	
+	virtual void update_led( Button & button, LedState ls ) = 0;
+	
+
+	virtual LedState io_press( Button & );
+	virtual LedState io_release( Button & );
+
+	virtual LedState sends_press( Button & );
+	virtual LedState sends_release( Button & );
+
+	virtual LedState pan_press( Button & );
+	virtual LedState pan_release( Button & );
+
+	virtual LedState plugin_press( Button & );
+	virtual LedState plugin_release( Button & );
+
+	virtual LedState eq_press( Button & );
+	virtual LedState eq_release( Button & );
+
+	virtual LedState dyn_press( Button & );
+	virtual LedState dyn_release( Button & );
+
+	virtual LedState left_press( Button & );
+	virtual LedState left_release( Button & );
+
+	virtual LedState right_press( Button & );
+	virtual LedState right_release( Button & );
+
+	virtual LedState channel_left_press( Button & );
+	virtual LedState channel_left_release( Button & );
+
+	virtual LedState channel_right_press( Button & );
+	virtual LedState channel_right_release( Button & );
+
+	virtual LedState flip_press( Button & );
+	virtual LedState flip_release( Button & );
+
+	virtual LedState edit_press( Button & );
+	virtual LedState edit_release( Button & );
+
+	virtual LedState name_value_press( Button & );
+	virtual LedState name_value_release( Button & );
+
+	virtual LedState smpte_beats_press( Button & );
+	virtual LedState smpte_beats_release( Button & );
+
+	virtual LedState F1_press( Button & );
+	virtual LedState F1_release( Button & );
+
+	virtual LedState F2_press( Button & );
+	virtual LedState F2_release( Button & );
+
+	virtual LedState F3_press( Button & );
+	virtual LedState F3_release( Button & );
+
+	virtual LedState F4_press( Button & );
+	virtual LedState F4_release( Button & );
+
+	virtual LedState F5_press( Button & );
+	virtual LedState F5_release( Button & );
+
+	virtual LedState F6_press( Button & );
+	virtual LedState F6_release( Button & );
+
+	virtual LedState F7_press( Button & );
+	virtual LedState F7_release( Button & );
+
+	virtual LedState F8_press( Button & );
+	virtual LedState F8_release( Button & );
+
+	virtual LedState F9_press( Button & );
+	virtual LedState F9_release( Button & );
+
+	virtual LedState F10_press( Button & );
+	virtual LedState F10_release( Button & );
+
+	virtual LedState F11_press( Button & );
+	virtual LedState F11_release( Button & );
+
+	virtual LedState F12_press( Button & );
+	virtual LedState F12_release( Button & );
+
+	virtual LedState F13_press( Button & );
+	virtual LedState F13_release( Button & );
+
+	virtual LedState F14_press( Button & );
+	virtual LedState F14_release( Button & );
+
+	virtual LedState F15_press( Button & );
+	virtual LedState F15_release( Button & );
+
+	virtual LedState F16_press( Button & );
+	virtual LedState F16_release( Button & );
+
+	virtual LedState shift_press( Button & );
+	virtual LedState shift_release( Button & );
+
+	virtual LedState option_press( Button & );
+	virtual LedState option_release( Button & );
+
+	virtual LedState control_press( Button & );
+	virtual LedState control_release( Button & );
+
+	virtual LedState cmd_alt_press( Button & );
+	virtual LedState cmd_alt_release( Button & );
+
+	virtual LedState on_press( Button & );
+	virtual LedState on_release( Button & );
+
+	virtual LedState rec_ready_press( Button & );
+	virtual LedState rec_ready_release( Button & );
+
+	virtual LedState undo_press( Button & );
+	virtual LedState undo_release( Button & );
+
+	virtual LedState snapshot_press( Button & );
+	virtual LedState snapshot_release( Button & );
+
+	virtual LedState touch_press( Button & );
+	virtual LedState touch_release( Button & );
+
+	virtual LedState redo_press( Button & );
+	virtual LedState redo_release( Button & );
+
+	virtual LedState marker_press( Button & );
+	virtual LedState marker_release( Button & );
+
+	virtual LedState enter_press( Button & );
+	virtual LedState enter_release( Button & );
+
+	virtual LedState cancel_press( Button & );
+	virtual LedState cancel_release( Button & );
+
+	virtual LedState mixer_press( Button & );
+	virtual LedState mixer_release( Button & );
+
+	virtual LedState frm_left_press( Button & );
+	virtual LedState frm_left_release( Button & );
+
+	virtual LedState frm_right_press( Button & );
+	virtual LedState frm_right_release( Button & );
+
+	virtual LedState loop_press( Button & );
+	virtual LedState loop_release( Button & );
+
+	virtual LedState punch_in_press( Button & );
+	virtual LedState punch_in_release( Button & );
+
+	virtual LedState punch_out_press( Button & );
+	virtual LedState punch_out_release( Button & );
+
+	virtual LedState home_press( Button & );
+	virtual LedState home_release( Button & );
+
+	virtual LedState end_press( Button & );
+	virtual LedState end_release( Button & );
+
+	virtual LedState rewind_press( Button & );
+	virtual LedState rewind_release( Button & );
+
+	virtual LedState ffwd_press( Button & );
+	virtual LedState ffwd_release( Button & );
+
+	virtual LedState stop_press( Button & );
+	virtual LedState stop_release( Button & );
+
+	virtual LedState play_press( Button & );
+	virtual LedState play_release( Button & );
+
+	virtual LedState record_press( Button & );
+	virtual LedState record_release( Button & );
+
+	virtual LedState cursor_up_press( Button & );
+	virtual LedState cursor_up_release( Button & );
+
+	virtual LedState cursor_down_press( Button & );
+	virtual LedState cursor_down_release( Button & );
+
+	virtual LedState cursor_left_press( Button & );
+	virtual LedState cursor_left_release( Button & );
+
+	virtual LedState cursor_right_press( Button & );
+	virtual LedState cursor_right_release( Button & );
+
+	virtual LedState zoom_press( Button & );
+	virtual LedState zoom_release( Button & );
+
+	virtual LedState scrub_press( Button & );
+	virtual LedState scrub_release( Button & );
+
+	virtual LedState user_a_press( Button & );
+	virtual LedState user_a_release( Button & );
+
+	virtual LedState user_b_press( Button & );
+	virtual LedState user_b_release( Button & );
+
+	virtual LedState fader_touch_press( Button & );
+	virtual LedState fader_touch_release( Button & );
+
+	virtual LedState clicking_press( Button & );
+	virtual LedState clicking_release( Button & );
+
+	virtual LedState global_solo_press( Button & );
+	virtual LedState global_solo_release( Button & );
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/mackie_control_exception.h b/libs/surfaces/mackie/mackie_control_exception.h
new file mode 100644
index 0000000000..afe7016948
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_control_exception.h
@@ -0,0 +1,47 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef mackie_control_exception_h
+#define mackie_control_exception_h
+
+#include <stdexcept>
+
+namespace Mackie
+{
+
+class MackieControlException : public std::exception
+{
+public:
+	MackieControlException( const std::string & msg )
+	: _msg( msg )
+	{
+	}
+	
+	virtual ~MackieControlException() throw () {}
+	
+	const char * what() const throw ()
+	{
+		return _msg.c_str();
+	}
+	
+private:
+	std::string _msg;
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
new file mode 100644
index 0000000000..5ef28d4549
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -0,0 +1,1449 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+#include <sstream>
+#include <vector>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <poll.h>
+
+#include <boost/shared_array.hpp>
+
+#include <midi++/types.h>
+#include <midi++/port.h>
+#include <midi++/manager.h>
+#include <pbd/pthread_utils.h>
+#include <pbd/error.h>
+#include <pbd/memento_command.h>
+
+#include <ardour/route.h>
+#include <ardour/session.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+#include <ardour/panner.h>
+
+#include "mackie_control_protocol.h"
+
+#include "midi_byte_array.h"
+#include "mackie_control_exception.h"
+#include "route_signal.h"
+#include "mackie_midi_builder.h"
+#include "surface_port.h"
+#include "surface.h"
+#include "bcf_surface.h"
+#include "mackie_surface.h"
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace Mackie;
+using namespace PBD;
+
+using boost::shared_ptr;
+
+#include "i18n.h"
+
+MackieMidiBuilder builder;
+
+// Copied from tranzport_control_protocol.cc
+static inline double 
+gain_to_slider_position (ARDOUR::gain_t g)
+{
+	if (g == 0) return 0;
+	return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0);
+}
+
+/*
+	Copied from tranzport_control_protocol.cc
+	TODO this seems to return slightly wrong values, namely
+	with the UI slider at max, we get a 0.99something value.
+*/
+static inline ARDOUR::gain_t 
+slider_position_to_gain (double pos)
+{
+	/* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */
+	if (pos == 0.0) return 0;
+	return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
+}
+
+MackieControlProtocol::MackieControlProtocol (Session& session)
+	: ControlProtocol  (session, X_("Mackie"))
+	, _current_initial_bank( 0 )
+	, connections_back( _connections )
+	, _surface( 0 )
+	, _ports_changed( false )
+	, _polling( true )
+	, pfd( 0 )
+	, nfds( 0 )
+{
+	//cout << "MackieControlProtocol::MackieControlProtocol" << endl;
+	// will start reading from ports, as soon as there are some
+	pthread_create_and_store (X_("mackie monitor"), &thread, 0, _monitor_work, this);
+}
+
+MackieControlProtocol::~MackieControlProtocol()
+{
+	//cout << "~MackieControlProtocol::MackieControlProtocol" << endl;
+	try
+	{
+		close();
+	}
+	catch ( exception & e )
+	{
+		cout << "~MackieControlProtocol caught " << e.what() << endl;
+	}
+	catch ( ... )
+	{
+		cout << "~MackieControlProtocol caught unknown" << endl;
+	}
+	//cout << "finished ~MackieControlProtocol::MackieControlProtocol" << endl;
+}
+
+Mackie::Surface & MackieControlProtocol::surface()
+{
+	if ( _surface == 0 )
+	{
+		throw MackieControlException( "_surface is 0 in MackieControlProtocol::surface" );
+	}
+	return *_surface;
+}
+
+const Mackie::MackiePort & MackieControlProtocol::mcu_port() const
+{
+	return dynamic_cast<const MackiePort &>( *_ports[0] );
+}
+
+Mackie::MackiePort & MackieControlProtocol::mcu_port()
+{
+	return dynamic_cast<const MackiePort &>( *_ports[0] );
+}
+
+// go to the previous track.
+// Assume that get_sorted_routes().size() > route_table.size()
+void MackieControlProtocol::prev_track()
+{
+	if ( _current_initial_bank >= 1 )
+	{
+		session->set_dirty();
+		switch_banks( _current_initial_bank - 1 );
+	}
+}
+
+// go to the next track.
+// Assume that get_sorted_routes().size() > route_table.size()
+void MackieControlProtocol::next_track()
+{
+	Sorted sorted = get_sorted_routes();
+	if ( _current_initial_bank + route_table.size() < sorted.size() )
+	{
+		session->set_dirty();
+		switch_banks( _current_initial_bank + 1 );
+	}
+}
+
+void MackieControlProtocol::clear_route_signals()
+{
+	for( RouteSignals::iterator it = route_signals.begin(); it != route_signals.end(); ++it )
+	{
+		delete *it;
+	}
+	route_signals.clear();
+}
+
+// return the port for a given id - 0 based
+// throws an exception if no port found
+MackiePort & MackieControlProtocol::port_for_id( uint32_t index )
+{
+	uint32_t current_max = 0;
+	for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+	{
+		current_max += (*it)->strips();
+		if ( index < current_max ) return **it;
+	}
+	
+	// oops - no matching port
+	ostringstream os;
+	os << "No port for index " << index;
+	throw MackieControlException( os.str() );
+}
+
+// predicate for sort call in get_sorted_routes
+struct RouteByRemoteId
+{
+	bool operator () ( const shared_ptr<Route> & a, const shared_ptr<Route> & b ) const
+	{
+		return a->remote_control_id() < b->remote_control_id();
+	}
+
+	bool operator () ( const Route & a, const Route & b ) const
+	{
+		return a.remote_control_id() < b.remote_control_id();
+	}
+
+	bool operator () ( const Route * a, const Route * b ) const
+	{
+		return a->remote_control_id() < b->remote_control_id();
+	}
+};
+
+MackieControlProtocol::Sorted MackieControlProtocol::get_sorted_routes()
+{
+	Sorted sorted;
+	
+	// fetch all routes
+	boost::shared_ptr<Session::RouteList> routes = session->get_routes();
+	set<uint32_t> remote_ids;
+	
+	// routes with remote_id 0 should never be added
+	// TODO verify this with ardour devs
+	// remote_ids.insert( 0 );
+	
+	// sort in remote_id order, and exclude master, control and hidden routes
+	// and any routes that are already set.
+	for ( Session::RouteList::iterator it = routes->begin(); it != routes->end(); ++it )
+	{
+		Route & route = **it;
+		if (
+				route.active()
+				&& !route.is_master()
+				&& !route.is_hidden()
+				&& !route.is_control()
+				&& remote_ids.find( route.remote_control_id() ) == remote_ids.end()
+		)
+		{
+			sorted.push_back( *it );
+			remote_ids.insert( route.remote_control_id() );
+		}
+	}
+	sort( sorted.begin(), sorted.end(), RouteByRemoteId() );
+	return sorted;
+}
+
+void MackieControlProtocol::refresh_current_bank()
+{
+	switch_banks( _current_initial_bank );
+}
+
+void MackieControlProtocol::switch_banks( int initial )
+{
+	// DON'T prevent bank switch if initial == _current_initial_bank
+	// because then this method can't be used as a refresh
+	
+	// sanity checking
+	Sorted sorted = get_sorted_routes();
+	int delta = sorted.size() - route_table.size();
+	if ( initial < 0 || ( delta > 0 && initial > delta ) )
+	{
+#ifdef DEBUG
+		cout << "not switching to " << initial << endl;
+#endif
+		return;
+	}
+	_current_initial_bank = initial;
+	
+	// first clear the signals from old routes
+	// taken care of by the RouteSignal destructors
+	clear_route_signals();
+	
+	// now set the signals for new routes
+	if ( _current_initial_bank <= sorted.size() )
+	{
+		// fetch the bank start and end to switch to
+		uint32_t end_pos = min( route_table.size(), sorted.size() );
+		Sorted::iterator it = sorted.begin() + _current_initial_bank;
+		Sorted::iterator end = sorted.begin() + _current_initial_bank + end_pos;
+		//cout << "switch to " << _current_initial_bank << ", " << end_pos << endl;
+		
+		// link routes to strips
+		uint32_t i = 0;
+		for ( ; it != end && it != sorted.end(); ++it, ++i )
+		{
+			boost::shared_ptr<Route> route = *it;
+			Strip & strip = *surface().strips[i];
+			//cout << "remote id " << route->remote_control_id() << " connecting " << route->name() << " to " << strip.name() << " with port " << port_for_id(i) << endl;
+			route_table[i] = route;
+			RouteSignal * rs = new RouteSignal( *route, *this, strip, port_for_id(i) );
+			route_signals.push_back( rs );
+			// update strip from route
+			rs->notify_all();
+		}
+		
+		// create dead strips if there aren't enough routes to
+		// fill a bank
+		for ( ; i < route_table.size(); ++i )
+		{
+			Strip & strip = *surface().strips[i];
+			// send zero for this strip
+			port_for_id(i).write( builder.zero_strip( strip ) );
+		}
+	}
+	
+	// display the current start bank.
+	if ( mcu_port().emulation() == MackiePort::bcf2000 )
+	{
+		if ( _current_initial_bank == 0 )
+		{
+			// send Ar. to 2-char display on the master
+			mcu_port().write( builder.two_char_display( "Ar", ".." ) );
+		}
+		else
+		{
+			// write the current first remote_id to the 2-char display
+			mcu_port().write( builder.two_char_display( _current_initial_bank ) );
+		}
+	}
+}
+
+void MackieControlProtocol::zero_all()
+{
+	// TODO turn off 55-char and SMPTE displays
+	
+	if ( mcu_port().emulation() == MackiePort::bcf2000 )
+	{
+		// clear 2-char display
+		mcu_port().write( builder.two_char_display( "LC" ) );
+	}
+	
+	// zero all strips
+	for ( Surface::Strips::iterator it = surface().strips.begin(); it != surface().strips.end(); ++it )
+	{
+		port_for_id( (*it)->index() ).write( builder.zero_strip( **it ) );
+	}
+	
+	// and the master strip
+	mcu_port().write( builder.zero_strip( master_strip() ) );
+	
+	// and the led ring for the master strip, in bcf mode
+	if ( mcu_port().emulation() == MackiePort::bcf2000 )
+	{
+		Control & control = *surface().controls_by_name["jog"];
+		mcu_port().write( builder.build_led_ring( dynamic_cast<Pot &>( control ), off ) );
+	}
+	
+	// turn off global buttons and leds
+	// global buttons are only ever on mcu_port, so we don't have
+	// to figure out which port.
+	for ( Surface::Controls::iterator it = surface().controls.begin(); it != surface().controls.end(); ++it )
+	{
+		Control & control = **it;
+		if ( !control.group().is_strip() && control.accepts_feedback() )
+		{
+			mcu_port().write( builder.zero_control( control ) );
+		}
+	}
+}
+
+int MackieControlProtocol::set_active (bool yn)
+{
+	if ( yn != _active )
+	{
+		try
+		{
+			// the reason for the locking and unlocking is that
+			// glibmm can't do a condition wait on a RecMutex
+			if ( yn )
+			{
+				// TODO what happens if this fails half way?
+				
+				// create MackiePorts
+				{
+					Glib::Mutex::Lock lock( update_mutex );
+					create_ports();
+				}
+				
+				// make sure the ports are being listened to
+				update_ports();
+				
+				// wait until poll thread is running, with ports to poll
+				// the mutex is only there because conditions require a mutex
+				{
+					Glib::Mutex::Lock lock( update_mutex );
+					while ( nfds == 0 ) update_cond.wait( update_mutex );
+				}
+				
+				// now initialise MackiePorts - ie exchange sysex messages
+				for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+				{
+					(*it)->open();
+				}
+				
+				// wait until all ports are active
+				// TODO a more sophisticated approach would
+				// allow things to start up with only an MCU, even if
+				// extenders were specified but not responding.
+				for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+				{
+					(*it)->wait_for_init();
+				}
+				
+				// create surface object. This depends on the ports being
+				// correctly initialised
+				initialize_surface();
+				connect_session_signals();
+				
+				// yeehah!
+				_active = true;
+				
+				// send current control positions to surface
+				// must come after _active = true otherwise it won't run
+				update_surface();
+			}
+			else
+			{
+				close();
+				_active = false;
+			}
+		}
+		catch( exception & e )
+		{
+#ifdef DEBUG
+			cout << "set_active to false because exception caught: " << e.what() << endl;
+#endif
+			_active = false;
+			throw;
+		}
+	}
+
+	return 0;
+}
+
+bool MackieControlProtocol::handle_strip_button( Control & control, ButtonState bs, boost::shared_ptr<Route> route )
+{
+	bool state = false;
+
+	if ( bs == press )
+	{
+		if ( control.name() == "recenable" )
+		{
+			state = !route->record_enabled();
+			route->set_record_enable( state, this );
+		}
+		else if ( control.name() == "mute" )
+		{
+			state = !route->muted();
+			route->set_mute( state, this );
+		}
+		else if ( control.name() == "solo" )
+		{
+			state = !route->soloed();
+			route->set_solo( state, this );
+		}
+		else if ( control.name() == "select" )
+		{
+			// TODO make the track selected. Whatever that means.
+			//state = default_button_press( dynamic_cast<Button&>( control ) );
+		}
+		else if ( control.name() == "vselect" )
+		{
+			// TODO could be used to select different things to apply the pot to?
+			//state = default_button_press( dynamic_cast<Button&>( control ) );
+		}
+	}
+	
+	if ( control.name() == "fader_touch" )
+	{
+		state = bs == press;
+		control.strip().gain().touch( state );
+	}
+	
+	return state;
+}
+
+void MackieControlProtocol::update_led( Mackie::Button & button, Mackie::LedState ls )
+{
+	MackiePort * port = 0;
+	if ( button.group().is_strip() )
+	{
+		if ( button.group().is_master() )
+		{
+			port = &mcu_port();
+		}
+		else
+		{
+			port = &port_for_id( dynamic_cast<const Strip&>( button.group() ).index() );
+		}
+	}
+	else
+	{
+		port = &mcu_port();
+	}
+	if ( ls != none ) port->write( builder.build_led( button, ls ) );
+}
+
+void MackieControlProtocol::update_global_button( const string & name, LedState ls )
+{
+	if ( surface().controls_by_name.find( name ) !=surface().controls_by_name.end() )
+	{
+		Button * button = dynamic_cast<Button*>( surface().controls_by_name[name] );
+		mcu_port().write( builder.build_led( button->led(), ls ) );
+	}
+	else
+	{
+#ifdef DEBUG
+		cout << "Button " << name << " not found" << endl;
+#endif
+		}
+}
+
+// send messages to surface to set controls to correct values
+void MackieControlProtocol::update_surface()
+{
+	if ( _active )
+	{
+		// do the initial bank switch to connect signals
+		// _current_initial_bank is initialised by set_state
+		switch_banks( _current_initial_bank );
+		
+		// create a RouteSignal for the master route
+		// but only the first time around
+		master_route_signal = shared_ptr<RouteSignal>( new RouteSignal( *master_route(), *this, master_strip(), mcu_port() ) );
+		// update strip from route
+		master_route_signal->notify_all();
+		
+		// update global buttons and displays
+		notify_record_state_changed();
+		notify_transport_state_changed();
+	}
+}
+
+void MackieControlProtocol::connect_session_signals()
+{
+	// receive routes added
+	connections_back = session->RouteAdded.connect( ( mem_fun (*this, &MackieControlProtocol::notify_route_added) ) );
+	// receive record state toggled
+	connections_back = session->RecordStateChanged.connect( ( mem_fun (*this, &MackieControlProtocol::notify_record_state_changed) ) );
+	// receive transport state changed
+	connections_back = session->TransportStateChange.connect( ( mem_fun (*this, &MackieControlProtocol::notify_transport_state_changed) ) );
+	// receive punch-in and punch-out
+	connections_back = Config->ParameterChanged.connect( ( mem_fun (*this, &MackieControlProtocol::notify_parameter_changed) ) );
+	// receive rude solo changed
+	connections_back = session->SoloActive.connect( ( mem_fun (*this, &MackieControlProtocol::notify_solo_active_changed) ) );
+	
+	// make sure remote id changed signals reach here
+	// see also notify_route_added
+	Sorted sorted = get_sorted_routes();
+	for ( Sorted::iterator it = sorted.begin(); it != sorted.end(); ++it )
+	{
+		connections_back = (*it)->RemoteControlIDChanged.connect( ( mem_fun (*this, &MackieControlProtocol::notify_remote_id_changed) ) );
+	}
+}
+
+void MackieControlProtocol::add_port( MIDI::Port & midi_port, int number )
+{
+	MackiePort * sport = new MackiePort( *this, midi_port, number );
+	_ports.push_back( sport );
+
+	connections_back = sport->init_event.connect(
+		sigc::bind (
+			mem_fun (*this, &MackieControlProtocol::handle_port_init)
+			, sport
+		)
+	);
+
+	connections_back = sport->active_event.connect(
+		sigc::bind (
+			mem_fun (*this, &MackieControlProtocol::handle_port_active)
+			, sport
+		)
+	);
+
+	connections_back = sport->inactive_event.connect(
+		sigc::bind (
+			mem_fun (*this, &MackieControlProtocol::handle_port_inactive)
+			, sport
+		)
+	);
+	
+	_ports_changed = true;
+}
+
+void MackieControlProtocol::create_ports()
+{
+	MIDI::Manager * mm = MIDI::Manager::instance();
+
+	// open main port
+	{
+		MIDI::Port * midi_port = mm->port( default_port_name );
+
+		if ( midi_port == 0 ) {
+			ostringstream os;
+			os << string_compose( _("no MIDI port named \"%1\" exists - Mackie control disabled"), default_port_name );
+			error << os.str() << endmsg;
+			throw MackieControlException( os.str() );
+		}
+		add_port( *midi_port, 0 );
+	}
+	
+	// open extender ports. Up to 9. Should be enough.
+	// could also use mm->get_midi_ports()
+	string ext_port_base = "mcu_xt_";
+	for ( int index = 1; index <= 9; ++index )
+	{
+		ostringstream os;
+		os << ext_port_base << index;
+		MIDI::Port * midi_port = mm->port( os.str() );
+		if ( midi_port != 0 ) add_port( *midi_port, index );
+	}
+}
+
+shared_ptr<Route> MackieControlProtocol::master_route()
+{
+	shared_ptr<Route> retval;
+	retval = session->route_by_name( "master" );
+	if ( retval == 0 )
+	{
+		// TODO search through all routes for one with the master attribute set
+	}
+	return retval;
+}
+
+Strip & MackieControlProtocol::master_strip()
+{
+	return dynamic_cast<Strip&>( *surface().groups["master"] );
+}
+
+void MackieControlProtocol::initialize_surface()
+{
+	// set up the route table
+	int strips = 0;
+	for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+	{
+		strips += (*it)->strips();
+	}
+	
+	set_route_table_size( strips );
+	
+	switch ( mcu_port().emulation() )
+	{
+		case MackiePort::bcf2000: _surface = new BcfSurface( strips ); break;
+		case MackiePort::mackie: _surface = new MackieSurface( strips ); break;
+		default:
+			ostringstream os;
+			os << "no Surface class found for emulation: " << mcu_port().emulation();
+			throw MackieControlException( os.str() );
+	}
+	_surface->init();
+	
+	// Connect events. Must be after route table otherwise there will be trouble
+	for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+	{
+		connections_back = (*it)->control_event.connect( ( mem_fun (*this, &MackieControlProtocol::handle_control_event) ) );
+	}
+}
+
+void MackieControlProtocol::close()
+{
+	// TODO disconnect port active/inactive signals
+	// Or at least put a lock here
+	
+	// disconnect global signals from Session
+	// TODO Since *this is a sigc::trackable, this shouldn't be necessary
+	// but it is for some reason
+#if 0
+	for( vector<sigc::connection>::iterator it = _connections.begin(); it != _connections.end(); ++it )
+	{
+		it->disconnect();
+	}
+#endif
+	
+	if ( _surface != 0 )
+	{
+		// These will fail if the port has gone away.
+		// So catch the exception and do the rest of the
+		// close afterwards
+		// because the bcf doesn't respond to the next 3 sysex messages
+		try
+		{
+			zero_all();
+		}
+		catch ( exception & e )
+		{
+#ifdef DEBUG
+			cout << "MackieControlProtocol::close caught exception: " << e.what() << endl;
+#endif
+		}
+		
+		for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+		{
+			try
+			{
+				MackiePort & port = **it;
+				// faders to minimum
+				port.write_sysex( 0x61 );
+				// All LEDs off
+				port.write_sysex( 0x62 );
+				// Reset (reboot into offline mode)
+				port.write_sysex( 0x63 );
+			}
+			catch ( exception & e )
+			{
+#ifdef DEBUG
+				cout << "MackieControlProtocol::close caught exception: " << e.what() << endl;
+#endif
+			}
+		}
+		
+		// disconnect routes from strips
+		clear_route_signals();
+		
+		delete _surface;
+		_surface = 0;
+	}
+	
+	// stop polling, and wait for it...
+	_polling = false;
+	pthread_join( thread, 0 );
+	
+	// shut down MackiePorts
+	for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+	{
+		delete *it;
+	}
+	_ports.clear();
+	
+	// this is done already in monitor_work. But it's here so we know.
+	delete[] pfd;
+	pfd = 0;
+	nfds = 0;
+}
+
+void* MackieControlProtocol::_monitor_work (void* arg)
+{
+	return static_cast<MackieControlProtocol*>(arg)->monitor_work ();
+}
+
+XMLNode & MackieControlProtocol::get_state()
+{
+	//cout << "MackieControlProtocol::get_state" << endl;
+	
+	// add name of protocol
+	XMLNode* node = new XMLNode( X_("Protocol") );
+	node->add_property( X_("name"), _name );
+	
+	// add current bank
+	ostringstream os;
+	os << _current_initial_bank;
+	node->add_property( X_("bank"), os.str() );
+	
+	return *node;
+}
+
+int MackieControlProtocol::set_state( const XMLNode & node )
+{
+	//cout << "MackieControlProtocol::set_state: active " << _active << endl;
+	int retval = 0;
+	
+	// fetch current bank
+	if ( node.property( X_("bank") ) != 0 )
+	{
+		string bank = node.property( X_("bank") )->value();
+		try
+		{
+			set_active( true );
+			uint32_t new_bank = atoi( bank.c_str() );
+			if ( _current_initial_bank != new_bank ) switch_banks( new_bank );
+		}
+		catch ( exception & e )
+		{
+#ifdef DEBUG
+			cout << "exception in MackieControlProtocol::set_state: " << e.what() << endl;
+#endif
+			return -1;
+		}
+	}
+	
+	return retval;
+}
+
+void MackieControlProtocol::handle_control_event( SurfacePort & port, Control & control, const ControlState & state )
+{
+	uint32_t index = control.ordinal() - 1 + ( port.number() * port.strips() );
+	boost::shared_ptr<Route> route;
+	if ( control.group().is_strip() )
+	{
+		if ( control.group().is_master() )
+		{
+			route = master_route();
+		}
+		else if ( index < route_table.size() )
+			route = route_table[index];
+		else
+			cerr << "Warning: index is " << index << " which is not in the route table, size: " << route_table.size() << endl;
+	}
+	
+	// This handles control element events from the surface
+	// the state of the controls on the surface is usually updated
+	// from UI events.
+	switch ( control.type() )
+	{
+		case Control::type_fader:
+			if ( control.group().is_strip() )
+			{
+				// find the route in the route table for the id
+				// if the route isn't available, skip it
+				// at which point the fader should just reset itself
+				if ( route != 0 )
+				{
+					route->set_gain( slider_position_to_gain( state.pos ), this );
+					
+					// must echo bytes back to slider now, because
+					// the notifier only works if the fader is not being
+					// touched. Which it is if we're getting input.
+					port.write( builder.build_fader( (Fader&)control, state.pos ) );
+				}
+			}
+			else
+			{
+				// master fader
+				boost::shared_ptr<Route> route = master_route();
+				if ( route )
+				{
+					route->set_gain( slider_position_to_gain( state.pos ), this );
+					port.write( builder.build_fader( (Fader&)control, state.pos ) );
+				}
+			}
+			break;
+			
+		case Control::type_button:
+			if ( control.group().is_strip() )
+			{
+				// strips
+				if ( route != 0 )
+				{
+					handle_strip_button( control, state.button_state, route );
+				}
+				else
+				{
+					// no route so always switch the light off
+					// because no signals will be emitted by a non-route
+					port.write( builder.build_led( control.led(), off ) );
+				}
+			}
+			else if ( control.group().is_master() )
+			{
+				// master fader touch
+				boost::shared_ptr<Route> route = master_route();
+				if ( route )
+					handle_strip_button( control, state.button_state, route );
+			}
+			else
+			{
+				// handle all non-strip buttons
+				surface().handle_button( *this, state.button_state, dynamic_cast<Button&>( control ) );
+			}
+			break;
+			
+		// pot (jog wheel, external control)
+		case Control::type_pot:
+			if ( control.group().is_strip() )
+			{
+				if ( route != 0 )
+				{
+					if ( route->panner().size() == 1 )
+					{
+						// assume pan for now
+						float xpos;
+						route->panner()[0]->get_effective_position (xpos);
+						
+						// calculate new value, and trim
+						xpos += state.delta;
+						if ( xpos > 1.0 )
+							xpos = 1.0;
+						else if ( xpos < 0.0 )
+							xpos = 0.0;
+						
+						route->panner()[0]->set_position( xpos );
+					}
+				}
+				else
+				{
+					// it's a pot for an umnapped route, so turn all the lights off
+					port.write( builder.build_led_ring( dynamic_cast<Pot &>( control ), off ) );
+				}
+			}
+			else
+			{
+				if ( control.name() == "jog" )
+				{
+					// TODO use current snap-to setting?
+					long delta = state.ticks * 1000;
+					nframes_t next = session->transport_frame() + delta;
+					if ( delta < 0 && session->transport_frame() < (nframes_t) abs( delta )  )
+					{
+						next = session->current_start_frame();
+					}
+					else if ( next > session->current_end_frame() )
+					{
+						next = session->current_end_frame();
+					}
+					
+					// doesn't work very well
+					session->request_locate( next, session->transport_rolling() );
+					
+					// turn off the led ring, for bcf emulation mode
+					port.write( builder.build_led_ring( dynamic_cast<Pot &>( control ), off ) );
+				}
+				else
+				{
+					cout << "external controller" << state.ticks << endl;
+				}
+			}
+			break;
+			
+		default:
+			cout << "Control::type not handled: " << control.type() << endl;
+	}
+}
+
+/////////////////////////////////////////////////
+// handlers for Route signals
+// TODO should these be part of RouteSignal?
+// They started off as sigc handlers for signals
+// from Route, but they're also used in polling for automation
+/////////////////////////////////////////////////
+
+void MackieControlProtocol::notify_solo_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		Button & button = route_signal->strip().solo();
+		route_signal->port().write( builder.build_led( button, route_signal->route().soloed() ) );
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+void MackieControlProtocol::notify_mute_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		Button & button = route_signal->strip().mute();
+		route_signal->port().write( builder.build_led( button, route_signal->route().muted() ) );
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+void MackieControlProtocol::notify_record_enable_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		Button & button = route_signal->strip().recenable();
+		route_signal->port().write( builder.build_led( button, route_signal->route().record_enabled() ) );
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+void MackieControlProtocol::notify_gain_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		Fader & fader = route_signal->strip().gain();
+		if ( !fader.touch() )
+		{
+			route_signal->port().write( builder.build_fader( fader, gain_to_slider_position( route_signal->route().effective_gain() ) ) );
+		}
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+void MackieControlProtocol::notify_name_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		// TODO implement MackieControlProtocol::notify_name_changed
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+// TODO deal with > 1 channel being panned
+void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal )
+{
+	try
+	{
+		Pot & pot = route_signal->strip().vpot();
+		
+		if ( route_signal->route().panner().size() == 1 )
+		{
+			float pos;
+			route_signal->route().panner()[0]->get_effective_position( pos);
+			route_signal->port().write( builder.build_led_ring( pot, ControlState( on, pos ) ) );
+		}
+		else
+		{
+			route_signal->port().write( builder.zero_control( pot ) );
+		}
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+// TODO handle plugin automation polling
+void MackieControlProtocol::update_automation( RouteSignal & rs )
+{
+	ARDOUR::AutoState gain_state = rs.route().gain_control()->list()->automation_state();
+	if ( gain_state == Touch || gain_state == Play )
+	{
+		notify_gain_changed( &rs );
+	}
+	
+	ARDOUR::AutoState panner_state = rs.route().panner().automation_state();
+	if ( panner_state == Touch || panner_state == Play )
+	{
+		notify_panner_changed( &rs );
+	}
+}
+
+void MackieControlProtocol::poll_automation()
+{
+	if ( _active )
+	{
+		// do all currently mapped routes
+		for( RouteSignals::iterator it = route_signals.begin(); it != route_signals.end(); ++it )
+		{
+			update_automation( **it );
+		}
+		
+		// and the master strip
+		if ( master_route_signal != 0 ) update_automation( *master_route_signal );
+	}
+}
+
+/////////////////////////////////////
+// Transport Buttons
+/////////////////////////////////////
+
+LedState MackieControlProtocol::frm_left_press( Button & button )
+{
+	// can use first_mark_before/after as well
+	Location * loc = session->locations()->first_location_before (
+		session->transport_frame()
+	);
+	if ( loc != 0 ) session->request_locate( loc->start(), session->transport_rolling() );
+	return on;
+}
+
+LedState MackieControlProtocol::frm_left_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::frm_right_press( Button & button )
+{
+	// can use first_mark_before/after as well
+	Location * loc = session->locations()->first_location_after (
+		session->transport_frame()
+	);
+	if ( loc != 0 ) session->request_locate( loc->start(), session->transport_rolling() );
+	return on;
+}
+
+LedState MackieControlProtocol::frm_right_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::stop_press( Button & button )
+{
+	session->request_stop();
+	return on;
+}
+
+LedState MackieControlProtocol::stop_release( Button & button )
+{
+	return session->transport_stopped();
+}
+
+LedState MackieControlProtocol::play_press( Button & button )
+{
+	session->request_transport_speed( 1.0 );
+	return on;
+}
+
+LedState MackieControlProtocol::play_release( Button & button )
+{
+	return session->transport_rolling();
+}
+
+LedState MackieControlProtocol::record_press( Button & button )
+{
+	if ( session->get_record_enabled() )
+		session->disable_record( false );
+	else
+		session->maybe_enable_record();
+	return on;
+}
+
+LedState MackieControlProtocol::record_release( Button & button )
+{
+	if ( session->get_record_enabled() )
+	{
+		if ( session->transport_rolling() )
+			return on;
+		else
+			return flashing;
+	}
+	else
+		return off;
+}
+
+LedState MackieControlProtocol::rewind_press( Button & button )
+{
+	session->request_transport_speed( -4.0 );
+	return on;
+}
+
+LedState MackieControlProtocol::rewind_release( Button & button )
+{
+	if ( _transport_previously_rolling )
+		session->request_transport_speed( 1.0 );
+	else
+		session->request_stop();
+	return off;
+}
+
+LedState MackieControlProtocol::ffwd_press( Button & button )
+{
+	session->request_transport_speed( 4.0 );
+	return on;
+}
+
+LedState MackieControlProtocol::ffwd_release( Button & button )
+{
+	if ( _transport_previously_rolling )
+		session->request_transport_speed( 1.0 );
+	else
+		session->request_stop();
+	return off;
+}
+
+///////////////////////////////////////////
+// Session signals
+///////////////////////////////////////////
+
+void MackieControlProtocol::notify_parameter_changed( const char * name_str )
+{
+	string name( name_str );
+	if ( name == "punch-in" )
+	{
+		update_global_button( "punch_in", Config->get_punch_in() );
+	}
+	else if ( name == "punch-out" )
+	{
+		update_global_button( "punch_out", Config->get_punch_out() );
+	}
+	else if ( name == "clicking" )
+	{
+		update_global_button( "clicking", Config->get_clicking() );
+	}
+	else
+	{
+#ifdef DEBUG
+		cout << "parameter changed: " << name << endl;
+#endif
+	}
+}
+
+// RouteList is the set of routes that have just been added
+void MackieControlProtocol::notify_route_added( ARDOUR::Session::RouteList & rl )
+{
+	// currently assigned banks are less than the full set of
+	// strips, so activate the new strip now.
+	if ( route_signals.size() < route_table.size() )
+	{
+		refresh_current_bank();
+	}
+	// otherwise route added, but current bank needs no updating
+	
+	// make sure remote id changes in the new route are handled
+	typedef ARDOUR::Session::RouteList ARS;
+	for ( ARS::iterator it = rl.begin(); it != rl.end(); ++it )
+	{
+		connections_back = (*it)->RemoteControlIDChanged.connect( ( mem_fun (*this, &MackieControlProtocol::notify_remote_id_changed) ) );
+	}
+}
+
+void MackieControlProtocol::notify_solo_active_changed( bool active )
+{
+	Button * rude_solo = reinterpret_cast<Button*>( surface().controls_by_name["solo"] );
+	mcu_port().write( builder.build_led( *rude_solo, active ? flashing : off ) );
+}
+
+void MackieControlProtocol::notify_remote_id_changed()
+{
+	Sorted sorted = get_sorted_routes();
+	
+	// if a remote id has been moved off the end, we need to shift
+	// the current bank backwards.
+	if ( sorted.size() - _current_initial_bank < route_signals.size() )
+	{
+		// but don't shift backwards past the zeroth channel
+		switch_banks( max((Sorted::size_type) 0, sorted.size() - route_signals.size() ) );
+	}
+	// Otherwise just refresh the current bank
+	else
+	{
+		refresh_current_bank();
+	}
+}
+
+///////////////////////////////////////////
+// Transport signals
+///////////////////////////////////////////
+
+void MackieControlProtocol::notify_record_state_changed()
+{
+	// switch rec button on / off / flashing
+	Button * rec = reinterpret_cast<Button*>( surface().controls_by_name["record"] );
+	mcu_port().write( builder.build_led( *rec, record_release( *rec ) ) );
+}
+
+void MackieControlProtocol::notify_transport_state_changed()
+{
+	// switch various play and stop buttons on / off
+	update_global_button( "play", session->transport_rolling() );
+	update_global_button( "stop", !session->transport_rolling() );
+	update_global_button( "loop", session->get_play_loop() );
+	
+	_transport_previously_rolling = session->transport_rolling();
+	
+	// rec is special because it's tristate
+	Button * rec = reinterpret_cast<Button*>( surface().controls_by_name["record"] );
+	mcu_port().write( builder.build_led( *rec, record_release( *rec ) ) );
+}
+
+LedState MackieControlProtocol::loop_press( Button & button )
+{
+	session->request_play_loop( !session->get_play_loop() );
+	return on;
+}
+
+LedState MackieControlProtocol::loop_release( Button & button )
+{
+	return session->get_play_loop();
+}
+
+LedState MackieControlProtocol::punch_in_press( Button & button )
+{
+	bool state = !Config->get_punch_in();
+	Config->set_punch_in( state );
+	return state;
+}
+
+LedState MackieControlProtocol::punch_in_release( Button & button )
+{
+	return Config->get_punch_in();
+}
+
+LedState MackieControlProtocol::punch_out_press( Button & button )
+{
+	bool state = !Config->get_punch_out();
+	Config->set_punch_out( state );
+	return state;
+}
+
+LedState MackieControlProtocol::punch_out_release( Button & button )
+{
+	return Config->get_punch_out();
+}
+
+LedState MackieControlProtocol::home_press( Button & button )
+{
+	session->goto_start();
+	return on;
+}
+
+LedState MackieControlProtocol::home_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::end_press( Button & button )
+{
+	session->goto_end();
+	return on;
+}
+
+LedState MackieControlProtocol::end_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::clicking_press( Button & button )
+{
+	bool state = !Config->get_clicking();
+	Config->set_clicking( state );
+	return state;
+}
+
+LedState MackieControlProtocol::clicking_release( Button & button )
+{
+	return Config->get_clicking();
+}
+
+LedState MackieControlProtocol::global_solo_press( Button & button )
+{
+	bool state = !session->soloing();
+	session->set_all_solo ( state );
+	return state;
+}
+
+LedState MackieControlProtocol::global_solo_release( Button & button )
+{
+	return session->soloing();
+}
+
+/////////////////////////////////////
+// Bank Switching
+/////////////////////////////////////
+LedState MackieControlProtocol::left_press( Button & button )
+{
+	Sorted sorted = get_sorted_routes();
+	if ( sorted.size() > route_table.size() )
+	{
+		int new_initial = _current_initial_bank - route_table.size();
+		if ( new_initial < 0 ) new_initial = 0;
+		if ( new_initial != int( _current_initial_bank ) )
+		{
+			session->set_dirty();
+			switch_banks( new_initial );
+		}
+		
+		return on;
+	}
+	else
+	{
+		return flashing;
+	}
+}
+
+LedState MackieControlProtocol::left_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::right_press( Button & button )
+{
+	Sorted sorted = get_sorted_routes();
+	if ( sorted.size() > route_table.size() )
+	{
+		uint32_t delta = sorted.size() - ( route_table.size() + _current_initial_bank );
+		if ( delta > route_table.size() ) delta = route_table.size();
+		if ( delta > 0 )
+		{
+			session->set_dirty();
+			switch_banks( _current_initial_bank + delta );
+		}
+		
+		return on;
+	}
+	else
+	{
+		return flashing;
+	}
+}
+
+LedState MackieControlProtocol::right_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::channel_left_press( Button & button )
+{
+	Sorted sorted = get_sorted_routes();
+	if ( sorted.size() > route_table.size() )
+	{
+		prev_track();
+		return on;
+	}
+	else
+	{
+		return flashing;
+	}
+}
+
+LedState MackieControlProtocol::channel_left_release( Button & button )
+{
+	return off;
+}
+
+LedState MackieControlProtocol::channel_right_press( Button & button )
+{
+	Sorted sorted = get_sorted_routes();
+	if ( sorted.size() > route_table.size() )
+	{
+		next_track();
+		return on;
+	}
+	else
+	{
+		return flashing;
+	}
+}
+
+LedState MackieControlProtocol::channel_right_release( Button & button )
+{
+	return off;
+}
+
+/////////////////////////////////////
+// Functions
+/////////////////////////////////////
+LedState MackieControlProtocol::marker_press( Button & button )
+{
+	// cut'n'paste from LocationUI::add_new_location()
+	string markername;
+	nframes_t where = session->audible_frame();
+	session->locations()->next_available_name(markername,"mcu");
+	Location *location = new Location (where, where, markername, Location::IsMark);
+	session->begin_reversible_command (_("add marker"));
+	XMLNode &before = session->locations()->get_state();
+	session->locations()->add (location, true);
+	XMLNode &after = session->locations()->get_state();
+	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+	session->commit_reversible_command ();
+	return on;
+}
+
+LedState MackieControlProtocol::marker_release( Button & button )
+{
+	return off;
+}
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
new file mode 100644
index 0000000000..0ff7fbd9d4
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -0,0 +1,319 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef ardour_mackie_control_protocol_h
+#define ardour_mackie_control_protocol_h
+
+#include <vector>
+
+#include <sys/time.h>
+#include <pthread.h>
+
+#include <glibmm/thread.h>
+
+#include <ardour/types.h>
+#include <ardour/session.h>
+#include <midi++/types.h>
+
+#include <control_protocol/control_protocol.h>
+#include "midi_byte_array.h"
+#include "controls.h"
+#include "route_signal.h"
+#include "mackie_button_handler.h"
+#include "mackie_port.h"
+
+namespace MIDI {
+	class Port;
+	class Parser;
+}
+
+namespace Mackie {
+	class Surface;
+}
+
+/**
+	This handles the plugin duties, and the midi encoding and decoding,
+	and the signal callbacks, mostly from ARDOUR::Route.
+
+	The model of the control surface is handled by classes in controls.h
+
+	What happens is that each strip on the control surface has
+	a corresponding route in ControlProtocol::route_table. When
+	an incoming midi message is signaled, the correct route
+	is looked up, and the relevant changes made to it.
+
+	For each route currently in route_table, there's a RouteSignal object
+	which encapsulates the signals that indicate that there are changes
+	to be sent to the surface. The signals are handled by this class.
+
+	Calls to signal handlers pass a Route object which is used to look
+	up the relevant Strip in Surface. Then the state is retrieved from
+	the Route and encoded as the correct midi message.
+*/
+class MackieControlProtocol
+: public ARDOUR::ControlProtocol
+, public Mackie::MackieButtonHandler
+{
+  public:
+	MackieControlProtocol( ARDOUR::Session & );
+	virtual ~MackieControlProtocol();
+
+	int set_active (bool yn);
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&);
+  
+	static bool probe();
+	
+	Mackie::Surface & surface();
+
+   // control events
+   void handle_control_event( Mackie::SurfacePort & port, Mackie::Control & control, const Mackie::ControlState & state );
+
+  // strip/route related stuff
+  public:	
+	/// Signal handler for Route::solo
+	void notify_solo_changed( Mackie::RouteSignal * );
+	/// Signal handler for Route::mute
+	void notify_mute_changed( Mackie::RouteSignal * );
+	/// Signal handler for Route::record_enable_changed
+	void notify_record_enable_changed( Mackie::RouteSignal * );
+	/// Signal handler for Route::gain_changed ( from IO )
+	void notify_gain_changed( Mackie::RouteSignal * );
+	/// Signal handler for Route::name_change
+	void notify_name_changed( Mackie::RouteSignal * );
+	/// Signal handler from Panner::Change
+	void notify_panner_changed( Mackie::RouteSignal * );
+	/// Signal handler for new routes added
+	void notify_route_added( ARDOUR::Session::RouteList & );
+
+	void notify_remote_id_changed();
+
+	/// rebuild the current bank. Called on route added/removed and
+   /// remote id changed.
+	void refresh_current_bank();
+
+  // global buttons (ie button not part of strips)
+  public:
+   // button-related signals
+	void notify_record_state_changed();
+   void notify_transport_state_changed();
+   // mainly to pick up punch-in and punch-out
+	void notify_parameter_changed( const char * );
+   void notify_solo_active_changed( bool );
+
+	// this is called to generate the midi to send in response to
+   // a button press.
+	void update_led( Mackie::Button & button, Mackie::LedState );
+  
+	// calls update_led, but looks up the button by name
+	void update_global_button( const std::string & name, Mackie::LedState );
+  
+   // transport button handler methods from MackieButtonHandler
+	virtual Mackie::LedState frm_left_press( Mackie::Button & );
+	virtual Mackie::LedState frm_left_release( Mackie::Button & );
+
+	virtual Mackie::LedState frm_right_press( Mackie::Button & );
+	virtual Mackie::LedState frm_right_release( Mackie::Button & );
+
+	virtual Mackie::LedState stop_press( Mackie::Button & );
+	virtual Mackie::LedState stop_release( Mackie::Button & );
+
+	virtual Mackie::LedState play_press( Mackie::Button & );
+	virtual Mackie::LedState play_release( Mackie::Button & );
+
+	virtual Mackie::LedState record_press( Mackie::Button & );
+	virtual Mackie::LedState record_release( Mackie::Button & );
+
+	virtual Mackie::LedState loop_press( Mackie::Button & );
+	virtual Mackie::LedState loop_release( Mackie::Button & );
+
+	virtual Mackie::LedState punch_in_press( Mackie::Button & );
+	virtual Mackie::LedState punch_in_release( Mackie::Button & );
+
+	virtual Mackie::LedState punch_out_press( Mackie::Button & );
+	virtual Mackie::LedState punch_out_release( Mackie::Button & );
+
+	virtual Mackie::LedState home_press( Mackie::Button & );
+	virtual Mackie::LedState home_release( Mackie::Button & );
+
+	virtual Mackie::LedState end_press( Mackie::Button & );
+	virtual Mackie::LedState end_release( Mackie::Button & );
+	
+	virtual Mackie::LedState rewind_press( Mackie::Button & button );
+	virtual Mackie::LedState rewind_release( Mackie::Button & button );
+
+	virtual Mackie::LedState ffwd_press( Mackie::Button & button );
+	virtual Mackie::LedState ffwd_release( Mackie::Button & button );
+
+	// bank switching button handler methods from MackieButtonHandler
+	virtual Mackie::LedState left_press( Mackie::Button & );
+	virtual Mackie::LedState left_release( Mackie::Button & );
+
+	virtual Mackie::LedState right_press( Mackie::Button & );
+	virtual Mackie::LedState right_release( Mackie::Button & );
+
+	virtual Mackie::LedState channel_left_press( Mackie::Button & );
+	virtual Mackie::LedState channel_left_release( Mackie::Button & );
+
+	virtual Mackie::LedState channel_right_press( Mackie::Button & );
+	virtual Mackie::LedState channel_right_release( Mackie::Button & );
+	
+	virtual Mackie::LedState clicking_press( Mackie::Button & );
+	virtual Mackie::LedState clicking_release( Mackie::Button & );
+	
+	virtual Mackie::LedState global_solo_press( Mackie::Button & );
+	virtual Mackie::LedState global_solo_release( Mackie::Button & );
+	
+	// function buttons
+	virtual Mackie::LedState marker_press( Mackie::Button & );
+	virtual Mackie::LedState marker_release( Mackie::Button & );
+
+  protected:
+	// create instances of MackiePort, depending on what's found in ardour.rc
+	void create_ports();
+  
+	// shut down the surface
+	void close();
+  
+	// create the Surface object, with the correct number
+	// of strips for the currently connected ports and 
+	// hook up the control event notification
+	void initialize_surface();
+  
+	// This sets up the notifications and sets the
+   // controls to the correct values
+	void update_surface();
+  
+   // connects global (not strip) signals from the Session to here
+   // so the surface can be notified of changes from the other UIs.
+   void connect_session_signals();
+  
+   // set all controls to their zero position
+	void zero_all();
+	
+	/**
+		Fetch the set of routes to be considered for control by the
+		surface. Excluding master, hidden and control routes, and inactive routes
+	*/
+	typedef std::vector<boost::shared_ptr<ARDOUR::Route> > Sorted;
+	Sorted get_sorted_routes();
+  
+   // bank switching
+   void switch_banks( int initial );
+   void prev_track();
+   void next_track();
+  
+   // delete all RouteSignal objects connecting Routes to Strips
+   void clear_route_signals();
+	
+   /// This is the main MCU port, ie not an extender port
+	const Mackie::MackiePort & mcu_port() const;
+	Mackie::MackiePort & mcu_port();
+ 
+	typedef std::vector<Mackie::RouteSignal*> RouteSignals;
+	RouteSignals route_signals;
+	
+   // return which of the ports a particular route_table
+   // index belongs to
+	Mackie::MackiePort & port_for_id( uint32_t index );
+
+	/**
+		Handle a button press for the control and return whether
+		the corresponding light should be on or off.
+	*/
+	bool handle_strip_button( Mackie::Control &, Mackie::ButtonState, boost::shared_ptr<ARDOUR::Route> );
+
+	/// thread started. Calls monitor_work.
+	static void* _monitor_work (void* arg);
+	
+	/// Polling midi port(s) for incoming messages
+	void* monitor_work ();
+	
+	/// rebuild the set of ports for this surface
+	void update_ports();
+	
+	/// Returns true if there is pending data, false otherwise
+	bool poll_ports();
+	
+	/// Trigger the MIDI::Parser
+	void read_ports();
+
+	void add_port( MIDI::Port &, int number );
+
+	/// read automation data from the currently active routes and send to surface
+	void poll_automation();
+	
+	// called from poll_automation to figure out which automations need to be sent
+	void update_automation( Mackie::RouteSignal & );
+
+	/**
+		notification that the port is about to start it's init sequence.
+		We must make sure that before this exits, the port is being polled
+		for new data.
+	*/
+	void handle_port_init( Mackie::SurfacePort * );
+
+	/// notification from a MackiePort that it's now active
+	void handle_port_active( Mackie::SurfacePort * );
+	
+	/// notification from a MackiePort that it's now inactive
+	void handle_port_inactive( Mackie::SurfacePort * );
+	
+	boost::shared_ptr<ARDOUR::Route> master_route();
+	Mackie::Strip & master_strip();
+
+  private:
+	boost::shared_ptr<Mackie::RouteSignal> master_route_signal;
+  
+   static const char * default_port_name;
+  
+	/// The Midi port(s) connected to the units
+	typedef vector<Mackie::MackiePort*> MackiePorts;
+	MackiePorts _ports;
+  
+   // the thread that polls the ports for incoming midi data
+	pthread_t thread;
+  
+	/// The initial remote_id of the currently switched in bank.
+   uint32_t _current_initial_bank;
+	
+   /// protects the port list, and polling structures
+	Glib::Mutex update_mutex;
+  
+	/// Protects set_active, and allows waiting on the poll thread
+	Glib::Cond update_cond;
+
+	// because sigc::trackable doesn't seem to be working
+	std::vector<sigc::connection> _connections;
+	std::back_insert_iterator<std::vector<sigc::connection> > connections_back;
+
+   /// The representation of the physical controls on the surface.
+  	Mackie::Surface * _surface;
+	
+	/// If a port is opened or closed, this will be
+	/// true until the port configuration is updated;
+	bool _ports_changed;
+
+	bool _polling;
+	struct pollfd * pfd;
+	int nfds;
+	
+	bool _transport_previously_rolling;
+};
+
+#endif // ardour_mackie_control_protocol_h
diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
new file mode 100644
index 0000000000..fa7134fa95
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
@@ -0,0 +1,191 @@
+#include "mackie_control_protocol.h"
+
+#include "midi_byte_array.h"
+#include "surface_port.h"
+
+#include <pbd/pthread_utils.h>
+#include <pbd/error.h>
+
+#include <midi++/types.h>
+#include <midi++/port.h>
+#include <midi++/manager.h>
+#include "i18n.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <errno.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+using namespace std;
+using namespace Mackie;
+using namespace PBD;
+
+const char * MackieControlProtocol::default_port_name = "mcu";
+
+bool MackieControlProtocol::probe()
+{
+	return MIDI::Manager::instance()->port( default_port_name ) != 0;
+}
+
+void * MackieControlProtocol::monitor_work()
+{
+	// What does ThreadCreatedWithRequestSize do?
+	PBD::ThreadCreated (pthread_self(), X_("Mackie"));
+
+	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
+	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
+
+	// read from midi ports
+	while ( _polling )
+	{
+		try
+		{
+			if ( poll_ports() )
+			{
+				try { read_ports(); }
+				catch ( exception & e ) {
+					cout << "MackieControlProtocol::poll_ports caught exception: " << e.what() << endl;
+					_ports_changed = true;
+					update_ports();
+				}
+			}
+			// poll for automation data from the routes
+			poll_automation();
+		}
+		catch ( exception & e )
+		{
+			cout << "caught exception in MackieControlProtocol::monitor_work " << e.what() << endl;
+		}
+	}
+
+	// TODO ports and pfd and nfds should be in a separate class
+	delete[] pfd;
+	pfd = 0;
+	nfds = 0;
+
+	return (void*) 0;
+}
+
+void MackieControlProtocol::update_ports()
+{
+	if ( _ports_changed )
+	{
+		Glib::Mutex::Lock ul( update_mutex );
+		// yes, this is a double-test locking paradigm, or whatever it's called
+		// because we don't *always* need to acquire the lock for the first test
+		if ( _ports_changed )
+		{
+			// create new pollfd structures
+			if ( pfd != 0 ) delete[] pfd;
+			// TODO This might be a memory leak. How does thread cancellation cleanup work?
+			pfd = new pollfd[_ports.size()];
+			nfds = 0;
+
+			for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
+			{
+				//cout << "adding port " << (*it)->port().name() << " to pollfd" << endl;
+				pfd[nfds].fd = (*it)->port().selectable();
+				pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
+				++nfds;
+			}
+			_ports_changed = false;
+		}
+		update_cond.signal();
+	}
+}
+
+void MackieControlProtocol::read_ports()
+{
+	/* now read any data on the ports */
+	Glib::Mutex::Lock lock( update_mutex );
+	for ( int p = 0; p < nfds; ++p )
+	{
+		// this will cause handle_midi_any in the MackiePort to be triggered
+		if ( pfd[p].revents & POLLIN > 0 )
+		{
+			// avoid deadlocking?
+			// doesn't seem to make a difference
+			//lock.release();
+			_ports[p]->read();
+			//lock.acquire();
+		}
+	}
+}
+
+bool MackieControlProtocol::poll_ports()
+{
+	int timeout = 10; // milliseconds
+	int no_ports_sleep = 1000; // milliseconds
+
+	Glib::Mutex::Lock lock( update_mutex );
+	// if there are no ports
+	if ( nfds < 1 )
+	{
+		lock.release();
+		//cout << "poll_ports no ports" << endl;
+		usleep( no_ports_sleep * 1000 );
+		return false;
+	}
+
+	int retval = poll( pfd, nfds, timeout );
+	if ( retval < 0 )
+	{
+		// gdb at work, perhaps
+		if ( errno != EINTR )
+		{
+			error << string_compose(_("Mackie MIDI thread poll failed (%1)"), strerror( errno ) ) << endmsg;
+		}
+		return false;
+	}
+	
+	return retval > 0;
+}
+
+void MackieControlProtocol::handle_port_inactive( SurfacePort * port )
+{
+	// port gone away. So stop polling it ASAP
+	{
+		// delete the port instance
+		Glib::Mutex::Lock lock( update_mutex );
+		MackiePorts::iterator it = find( _ports.begin(), _ports.end(), port );
+		if ( it != _ports.end() )
+		{
+			delete *it;
+			_ports.erase( it );
+		}
+	}
+	_ports_changed = true;
+	update_ports();
+	
+	// TODO all the rebuilding of surfaces and so on
+}
+
+void MackieControlProtocol::handle_port_active( SurfacePort * port )
+{
+	// no need to re-add port because it was already added
+	// during the init phase. So just update the local surface
+	// representation and send the representation to 
+	// all existing ports
+	
+	// TODO update bank size
+	
+	// TODO rebuild surface, to have new units
+	
+	// finally update session state to the surface
+	// TODO but this is also done in set_active, and
+	// in fact update_surface won't execute unless
+	// _active == true
+	//cout << "update_surface in handle_port_active" << endl;
+	update_surface();
+}
+
+void MackieControlProtocol::handle_port_init( Mackie::SurfacePort * sport )
+{
+	//cout << "MackieControlProtocol::handle_port_init" << endl;
+	_ports_changed = true;
+	update_ports();
+}
diff --git a/libs/surfaces/mackie/mackie_midi_builder.cc b/libs/surfaces/mackie/mackie_midi_builder.cc
new file mode 100644
index 0000000000..8ed98a5720
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_midi_builder.cc
@@ -0,0 +1,173 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "mackie_midi_builder.h"
+
+#include <typeinfo>
+#include <sstream>
+#include <iomanip>
+
+#include "controls.h"
+#include "midi_byte_array.h"
+
+using namespace Mackie;
+using namespace std;
+
+MIDI::byte MackieMidiBuilder::calculate_pot_value( midi_pot_mode mode, const ControlState & state )
+{
+	// TODO do an exact calc for 0.50? To allow manually re-centering the port.
+	
+	// center on or off
+	MIDI::byte retval = ( state.pos > 0.45 && state.pos < 0.55 ? 1 : 0 ) << 6;
+	
+	// mode
+	retval |= ( mode << 4 );
+	
+	// value, but only if off hasn't explicitly been set
+	if ( state.led_state != off )
+		retval += ( int(state.pos * 10.0) + 1 ) & 0x0f; // 0b00001111
+	
+	return retval;
+}
+
+MidiByteArray MackieMidiBuilder::build_led_ring( const Pot & pot, const ControlState & state )
+{
+	return build_led_ring( pot.led_ring(), state );
+}
+
+MidiByteArray MackieMidiBuilder::build_led_ring( const LedRing & led_ring, const ControlState & state )
+{
+	// The other way of doing this:
+	// 0x30 + pot/ring number (0-7)
+	//, 0x30 + led_ring.ordinal() - 1
+	return MidiByteArray ( 3
+		// the control type
+		, midi_pot_id
+		// the id
+		, 0x20 + led_ring.id()
+		// the value
+		, calculate_pot_value( midi_pot_mode_dot, state )
+	);
+}
+
+MidiByteArray MackieMidiBuilder::build_led( const Button & button, LedState ls )
+{
+	return build_led( button.led(), ls );
+}
+
+MidiByteArray MackieMidiBuilder::build_led( const Led & led, LedState ls )
+{
+	MIDI::byte state = 0;
+	switch ( ls.state() )
+	{
+		case LedState::on:			state = 0x7f; break;
+		case LedState::off:			state = 0x00; break;
+		case LedState::none:			state = 0x00; break; // actually, this should never happen.
+		case LedState::flashing:	state = 0x01; break;
+	}
+	
+	return MidiByteArray ( 3
+		, midi_button_id
+		, led.id()
+		, state
+	);
+}
+
+MidiByteArray MackieMidiBuilder::build_fader( const Fader & fader, float pos )
+{
+	int posi = int( 0x3fff * pos );
+	
+	return MidiByteArray ( 3
+		, midi_fader_id | fader.id()
+		// lower-order bits
+		, posi & 0x7f
+		// higher-order bits
+		, ( posi >> 7 )
+	);
+}
+
+MidiByteArray MackieMidiBuilder::zero_strip( const Strip & strip )
+{
+	Group::Controls::const_iterator it = strip.controls().begin();
+	MidiByteArray retval;
+	for (; it != strip.controls().end(); ++it )
+	{
+		Control & control = **it;
+		if ( control.accepts_feedback() )
+			retval << zero_control( control );
+	}
+	return retval;
+}
+
+MidiByteArray MackieMidiBuilder::zero_control( const Control & control )
+{
+	switch( control.type() )
+	{
+		case Control::type_button:
+			return build_led( (Button&)control, off );
+		
+		case Control::type_led:
+			return build_led( (Led&)control, off );
+		
+		case Control::type_fader:
+			return build_fader( (Fader&)control, 0.0 );
+		
+		case Control::type_pot:
+			return build_led_ring( dynamic_cast<const Pot&>( control ), off );
+		
+		case Control::type_led_ring:
+			return build_led_ring( dynamic_cast<const LedRing&>( control ), off );
+		
+		default:
+			ostringstream os;
+			os << "Unknown control type " << control << " in Strip::zero_control";
+			throw MackieControlException( os.str() );
+	}
+}
+
+char translate_seven_segment( char achar )
+{
+	achar = toupper( achar );
+	if ( achar >= 0x40 && achar <= 0x60 )
+		return achar - 0x40;
+	else if ( achar >= 0x21 && achar <= 0x3f )
+      return achar;
+	else
+      return 0x00;
+}
+
+MidiByteArray MackieMidiBuilder::two_char_display( const std::string & msg, const std::string & dots )
+{
+	if ( msg.length() != 2 ) throw MackieControlException( "MackieMidiBuilder::two_char_display: msg must be exactly 2 characters" );
+	if ( dots.length() != 2 ) throw MackieControlException( "MackieMidiBuilder::two_char_display: dots must be exactly 2 characters" );
+	
+	MidiByteArray bytes( 5, 0xb0, 0x4a, 0x00, 0x4b, 0x00 );
+	
+	// chars are understood by the surface in right-to-left order
+	// could also exchange the 0x4a and 0x4b, above
+	bytes[4] = translate_seven_segment( msg[0] ) + ( dots[0] == '.' ? 0x40 : 0x00 );
+	bytes[2] = translate_seven_segment( msg[1] ) + ( dots[1] == '.' ? 0x40 : 0x00 );
+	
+	return bytes;
+}
+
+MidiByteArray MackieMidiBuilder::two_char_display( unsigned int value, const std::string & dots )
+{
+	ostringstream os;
+	os << setfill('0') << setw(2) << value % 100;
+	return two_char_display( os.str() );
+}
diff --git a/libs/surfaces/mackie/mackie_midi_builder.h b/libs/surfaces/mackie/mackie_midi_builder.h
new file mode 100644
index 0000000000..f0c3d51a54
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_midi_builder.h
@@ -0,0 +1,81 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef mackie_midi_builder_h
+#define mackie_midi_builder_h
+
+#include "midi_byte_array.h"
+#include "types.h"
+
+namespace Mackie
+{
+
+/**
+	This knows how to build midi messages given a control and
+	a state.
+*/
+class MackieMidiBuilder
+{
+public:
+	/**
+		The first byte of a midi message from the surface
+		will contain one of these, sometimes bitmasked
+		with the control id
+	*/
+	enum midi_types {
+		midi_fader_id = 0xe0
+		, midi_button_id = 0x90
+		, midi_pot_id = 0xb0
+	};
+
+	/**
+		The LED rings have these modes.
+	*/
+	enum midi_pot_mode {
+		midi_pot_mode_dot = 0
+		, midi_pot_mode_boost_cut = 1
+		, midi_pot_mode_wrap = 2
+		, midi_pot_mode_spread = 3
+	};
+
+	MidiByteArray build_led_ring( const Pot & pot, const ControlState & );
+	MidiByteArray build_led_ring( const LedRing & led_ring, const ControlState & );
+
+  	MidiByteArray build_led( const Led & led, LedState ls );
+  	MidiByteArray build_led( const Button & button, LedState ls );
+	
+	MidiByteArray build_fader( const Fader & fader, float pos );
+	
+	/// return bytes that will reset all controls to their zero positions
+	MidiByteArray zero_strip( const Strip & strip );
+	
+	// provide bytes to zero the given control
+	MidiByteArray zero_control( const Control & control );
+	
+	// display the first 2 chars of the msg in the 2 char display
+	// . is appended to the previous character, so A.B. would
+	// be two characters
+	MidiByteArray two_char_display( const std::string & msg, const std::string & dots = "  " );
+	MidiByteArray two_char_display( unsigned int value, const std::string & dots = "  " );
+	
+protected:
+	static MIDI::byte calculate_pot_value( midi_pot_mode mode, const ControlState & );
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc
new file mode 100644
index 0000000000..9bcee638fb
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_port.cc
@@ -0,0 +1,399 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "mackie_port.h"
+
+#include "mackie_control_exception.h"
+#include "mackie_control_protocol.h"
+#include "mackie_midi_builder.h"
+#include "controls.h"
+#include "surface.h"
+
+#include <midi++/types.h>
+#include <midi++/port.h>
+#include <sigc++/sigc++.h>
+#include <boost/shared_array.hpp>
+#include <ardour/configuration.h>
+
+#include "i18n.h"
+
+#include <sstream>
+
+using namespace std;
+using namespace Mackie;
+
+// The MCU sysex header
+MidiByteArray mackie_sysex_hdr ( 5, MIDI::sysex, 0x0, 0x0, 0x66, 0x10 );
+
+// The MCU extender sysex header
+MidiByteArray mackie_sysex_hdr_xt ( 5, MIDI::sysex, 0x0, 0x0, 0x66, 0x11 );
+
+MackiePort::MackiePort( MackieControlProtocol & mcp, MIDI::Port & port, int number, port_type_t port_type )
+: SurfacePort( port, number )
+, _mcp( mcp )
+, _port_type( port_type )
+, _emulation( none )
+, _initialising( true )
+{
+	//cout << "MackiePort::MackiePort" <<endl;
+}
+
+MackiePort::~MackiePort()
+{
+	//cout << "~MackiePort" << endl;
+	close();
+	//cout << "~MackiePort finished" << endl;
+}
+
+int MackiePort::strips() const
+{
+	if ( _port_type == mcu )
+	{
+		switch ( _emulation )
+		{
+			// BCF2000 only has 8 faders, so reserve one for master
+			case bcf2000: return 7;
+			case mackie: return 8;
+			case none:
+			default:
+				throw MackieControlException( "MackiePort::strips: don't know what emulation we're using" );
+		}
+	}
+	else
+	{
+		// must be an extender, ie no master fader
+		return 8;
+	}
+}
+
+// should really be in MackiePort
+void MackiePort::open()
+{
+	//cout << "MackiePort::open " << *this << endl;
+	_sysex = port().input()->sysex.connect( ( mem_fun (*this, &MackiePort::handle_midi_sysex) ) );
+	
+	// make sure the device is connected
+	init();
+}
+
+void MackiePort::close()
+{
+	//cout << "MackiePort::close" << endl;
+	
+	// disconnect signals
+	_any.disconnect();
+	_sysex.disconnect();
+	
+	// TODO emit a "closing" signal?
+	//cout << "MackiePort::close finished" << endl;
+}
+
+const MidiByteArray & MackiePort::sysex_hdr() const
+{
+	switch ( _port_type )
+	{
+		case mcu: return mackie_sysex_hdr;
+		case ext: return mackie_sysex_hdr_xt;
+	}
+	cout << "MackiePort::sysex_hdr _port_type not known" << endl;
+	return mackie_sysex_hdr;
+}
+
+Control & MackiePort::lookup_control( const MidiByteArray & bytes )
+{
+	Control * control = 0;
+	int midi_id = -1;
+	MIDI::byte midi_type = bytes[0] & 0xf0; //0b11110000
+	switch( midi_type )
+	{
+		// fader
+		case MackieMidiBuilder::midi_fader_id:
+			midi_id = bytes[0] & 0x0f;
+			control = _mcp.surface().faders[midi_id];
+			if ( control == 0 )
+			{
+				ostringstream os;
+				os << "control for fader" << midi_id << " is null";
+				throw MackieControlException( os.str() );
+			}
+			break;
+			
+		// button
+		case MackieMidiBuilder::midi_button_id:
+			midi_id = bytes[1];
+			control = _mcp.surface().buttons[midi_id];
+			if ( control == 0 )
+			{
+				ostringstream os;
+				os << "control for button" << midi_id << " is null";
+				throw MackieControlException( os.str() );
+			}
+			break;
+			
+		// pot (jog wheel, external control)
+		case MackieMidiBuilder::midi_pot_id:
+			midi_id = bytes[1] & 0x1f;
+			control = _mcp.surface().pots[midi_id];
+			if ( control == 0 )
+			{
+				ostringstream os;
+				os << "control for button" << midi_id << " is null";
+				throw MackieControlException( os.str() );
+			}
+			break;
+		
+		default:
+			ostringstream os;
+			os << "Cannot find control for " << bytes;
+			throw MackieControlException( os.str() );
+	}
+	return *control;
+}
+
+MidiByteArray calculate_challenge_response( MidiByteArray::iterator begin, MidiByteArray::iterator end )
+{
+	MidiByteArray l;
+	back_insert_iterator<MidiByteArray> back ( l );
+	copy( begin, end, back );
+	
+	MidiByteArray retval;
+	
+	// this is how to calculate the response to the challenge.
+	// from the Logic docs.
+	retval << ( 0x7f & ( l[0] + ( l[1] ^ 0xa ) - l[3] ) );
+	retval << ( 0x7f & ( ( l[2] >> l[3] ) ^ ( l[0] + l[3] ) ) );
+	retval << ( 0x7f & ( l[3] - ( l[2] << 2 ) ^ ( l[0] | l[1] ) ) );
+	retval << ( 0x7f & ( l[1] - l[2] + ( 0xf0 ^ ( l[3] << 4 ) ) ) );
+	
+	return retval;
+}
+
+// not used right now
+MidiByteArray MackiePort::host_connection_query( MidiByteArray & bytes )
+{
+	// handle host connection query
+	//cout << "host connection query: " << bytes << endl;
+	
+	if ( bytes.size() != 18 )
+	{
+		finalise_init( false );
+		ostringstream os;
+		os << "expecting 18 bytes, read " << bytes << " from " << port().name();
+		throw MackieControlException( os.str() );
+	}
+
+	// build and send host connection reply
+	MidiByteArray response;
+	response << 0x02;
+	copy( bytes.begin() + 6, bytes.begin() + 6 + 7, back_inserter( response ) );
+	response << calculate_challenge_response( bytes.begin() + 6 + 7, bytes.begin() + 6 + 7 + 4 );
+	return response;
+}
+
+// not used right now
+MidiByteArray MackiePort::host_connection_confirmation( const MidiByteArray & bytes )
+{
+	//cout << "host_connection_confirmation: " << bytes << endl;
+	
+	// decode host connection confirmation
+	if ( bytes.size() != 14 )
+	{
+		finalise_init( false );
+		ostringstream os;
+		os << "expecting 14 bytes, read " << bytes << " from " << port().name();
+		throw MackieControlException( os.str() );
+	}
+	
+	// send version request
+	return MidiByteArray( 2, 0x13, 0x00 );
+}
+
+void MackiePort::probe_emulation( const MidiByteArray & bytes )
+{
+	//cout << "MackiePort::probe_emulation: " << bytes.size() << ", " << bytes << endl;
+	string version_string;
+	for ( int i = 6; i < 11; ++i ) version_string.append( 1, (char)bytes[i] );
+	//cout << "version_string: " << version_string << endl;
+	
+	// TODO investigate using serial number. Also, possibly size of bytes might
+	// give an indication. Also, apparently MCU sends non-documented messages
+	// sometimes.
+	if (!_initialising)
+	{
+		cout << "MackiePort::probe_emulation out of sequence." << endl;
+		return;
+	}
+
+	finalise_init( true );
+}
+
+void MackiePort::init()
+{
+	//cout << "MackiePort::init" << endl;
+	init_mutex.lock();
+	_initialising = true;
+	
+	//cout << "MackiePort::lock acquired" << endl;
+	// emit pre-init signal
+	init_event();
+	
+	// kick off initialisation. See docs in header file for init()
+	
+	// bypass the init sequence because sometimes the first
+	// message doesn't get to the unit, and there's no way
+	// to do a timed lock in Glib.
+	//write_sysex ( MidiByteArray ( 2, 0x13, 0x00 ) );
+	
+	finalise_init( true );
+}
+
+void MackiePort::finalise_init( bool yn )
+{
+	//cout << "MackiePort::finalise_init" << endl;
+	bool emulation_ok = false;
+	
+	// probing doesn't work very well, so just use a config variable
+	// to set the emulation mode
+	if ( _emulation == none )
+	{
+		if ( ARDOUR::Config->get_mackie_emulation() == "bcf" )
+		{
+			_emulation = bcf2000;
+			emulation_ok = true;
+		}
+		else if ( ARDOUR::Config->get_mackie_emulation() == "mcu" )
+		{
+			_emulation = mackie;
+			emulation_ok = true;
+		}
+		else
+		{
+			cout << "unknown mackie emulation: " << ARDOUR::Config->get_mackie_emulation() << endl;
+			emulation_ok = false;
+		}
+	}
+	
+	yn = yn && emulation_ok;
+	
+	SurfacePort::active( yn );
+
+	if ( yn )
+	{
+		active_event();
+		
+		// start handling messages from controls
+		_any = port().input()->any.connect( ( mem_fun (*this, &MackiePort::handle_midi_any) ) );
+	}
+	_initialising = false;
+	init_cond.signal();
+	init_mutex.unlock();
+}
+
+bool MackiePort::wait_for_init()
+{
+	Glib::Mutex::Lock lock( init_mutex );
+	while ( _initialising )
+	{
+		//cout << "MackiePort::wait_for_active waiting" << endl;
+		init_cond.wait( init_mutex );
+		//cout << "MackiePort::wait_for_active released" << endl;
+	}
+	//cout << "MackiePort::wait_for_active returning" << endl;
+	return SurfacePort::active();
+}
+
+void MackiePort::handle_midi_sysex (MIDI::Parser & parser, MIDI::byte * raw_bytes, size_t count )
+{
+	MidiByteArray bytes( count, raw_bytes );
+	//cout << "handle_midi_sysex: " << bytes << endl;
+	switch( bytes[5] )
+	{
+		case 0x01:
+			// not used right now
+			write_sysex( host_connection_query( bytes ) );
+			break;
+		case 0x03:
+			// not used right now
+			write_sysex( host_connection_confirmation( bytes ) );
+			break;
+		case 0x04:
+			inactive_event();
+			cout << "host connection error" << bytes << endl;
+			break;
+		case 0x14:
+			probe_emulation( bytes );
+			break;
+		default:
+			cout << "unknown sysex: " << bytes << endl;
+	}
+}
+
+// converts midi messages into control_event signals
+void MackiePort::handle_midi_any (MIDI::Parser & parser, MIDI::byte * raw_bytes, size_t count )
+{
+	MidiByteArray bytes( count, raw_bytes );
+	try
+	{
+		// ignore sysex messages
+		if ( bytes[0] == MIDI::sysex ) return;
+
+		Control & control = lookup_control( bytes );
+		
+		// This handles incoming bytes. Outgoing bytes
+		// are sent by the signal handlers.
+		switch ( control.type() )
+		{
+			// fader
+			case Control::type_fader:
+				{
+					// for a BCF2000, max is 7f for high-order byte and 0x70 for low-order byte
+					// According to the Logic docs, these should both be 0x7f.
+					// Although it does mention something about only the top-order
+					// 10 bits out of 14 being used
+					int midi_pos = ( bytes[2] << 7 ) + bytes[1];
+					control_event( *this, control, float(midi_pos) / float(0x3fff) );
+				}
+				break;
+				
+			// button
+			case Control::type_button:
+				control_event( *this, control, bytes[2] == 0x7f ? press : release );
+				break;
+				
+			// pot (jog wheel, external control)
+			case Control::type_pot:
+				{
+					ControlState state;
+					
+					// bytes[2] & 0b01000000 (0x40) give sign
+					int sign = ( bytes[2] & 0x40 ) == 0 ? 1 : -1; 
+					// bytes[2] & 0b00111111 (0x3f) gives delta
+					state.ticks = ( bytes[2] & 0x3f) * sign;
+					state.delta = float( state.ticks ) / float( 0x3f );
+					
+					control_event( *this, control, state );
+				}
+				break;
+			default:
+				cerr << "Do not understand control type " << control;
+		}
+	}
+	catch( MackieControlException & e )
+	{
+		//cout << bytes << ' ' << e.what() << endl;
+	}
+}
diff --git a/libs/surfaces/mackie/mackie_port.h b/libs/surfaces/mackie/mackie_port.h
new file mode 100644
index 0000000000..2ad5cf6154
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_port.h
@@ -0,0 +1,122 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef mackie_port_h
+#define mackie_port_h
+
+#include "surface_port.h"
+
+#include <midi++/types.h>
+#include <sigc++/signal.h>
+#include <sigc++/connection.h>
+
+#include <glibmm/thread.h>
+
+#include "midi_byte_array.h"
+#include "types.h"
+
+namespace MIDI {
+	class Port;
+	class Parser;
+}
+
+class MackieControlProtocol;
+
+namespace Mackie
+{
+
+class MackiePort : public SurfacePort
+{
+public:
+	enum port_type_t { mcu, ext };
+	enum emulation_t { none, mackie, bcf2000 };
+	
+	MackiePort( MackieControlProtocol & mcp, MIDI::Port & port, int number, port_type_t = mcu );
+	~MackiePort();
+
+	virtual void open();
+	virtual void close();
+
+	/// MCU and extenders have different sysex headers
+	virtual const MidiByteArray & sysex_hdr() const;
+
+	/// Handle device initialisation
+	void handle_midi_sysex( MIDI::Parser &, MIDI::byte *, size_t );
+
+	/// Handle all control messags
+	void handle_midi_any( MIDI::Parser &, MIDI::byte *, size_t );
+	
+	Control & lookup_control( const MidiByteArray & bytes );
+	
+	/// return the number of strips associated with this port
+	virtual int strips() const;
+
+	/// Block until the port has finished initialising, and then return
+	/// whether the intialisation succeeded
+	bool wait_for_init();
+	
+	emulation_t emulation() const { return _emulation; }
+	
+protected:
+	/**
+		The initialisation sequence is fairly complex. First a lock is acquired
+		so that a condition can be used to signal the end of the init process.
+		Then a sysex is sent to the device. The response to the sysex
+		is handled by a switch in handle_midi_sysex which calls one of the
+		other methods.
+		
+		However, windows DAWs ignore the documented init sequence and so we
+		do too. Thanks to Essox for helping with this.
+		
+		So we use the version firmware to figure out what device is on
+		the other end of the cable.
+	*/
+	void init();
+
+	/**
+		Once the device is initialised, finalise_init(true) is called, which
+		releases the lock and signals the condition, and starts handling incoming
+		messages. finalise_init(false) will also release the lock but doesn't
+		start handling messages.
+	*/
+	void finalise_init( bool yn );
+
+	MidiByteArray host_connection_query( MidiByteArray & bytes );
+	MidiByteArray host_connection_confirmation( const MidiByteArray & bytes );
+
+	/**
+		Will set _emulation to what it thinks is correct, based
+		on responses from the device. Or get/set parameters. Or
+		environment variables. Or existence of a file.
+	*/
+	void probe_emulation( const MidiByteArray & bytes );
+
+private:
+	MackieControlProtocol & _mcp;
+	port_type_t _port_type;
+	sigc::connection _any;
+	sigc::connection _sysex;
+	emulation_t _emulation;
+
+	bool _initialising;
+	Glib::Cond init_cond;
+	Glib::Mutex init_mutex;
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/mackie_surface.cc b/libs/surfaces/mackie/mackie_surface.cc
new file mode 100644
index 0000000000..b527f710cc
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_surface.cc
@@ -0,0 +1,1504 @@
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "mackie_surface.h"
+
+#include "controls.h"
+#include "mackie_button_handler.h"
+
+using namespace Mackie;
+
+void Mackie::MackieSurface::init_controls()
+{
+	// intialise groups and strips
+	Group * group = 0;
+	
+	// make sure there are enough strips
+	strips.resize( 8 );
+	
+	group = new Group ( "user" );
+	groups["user"] = group;
+	
+	group = new Group ( "assignment" );
+	groups["assignment"] = group;
+	
+	group = new Group ( "none" );
+	groups["none"] = group;
+	
+	group = new MasterStrip ( "master", 0 );
+	groups["master"] = group;
+	strips[0] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_1", 0 );
+	groups["strip_1"] = group;
+	strips[0] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "cursor" );
+	groups["cursor"] = group;
+	
+	group = new Strip ( "strip_2", 1 );
+	groups["strip_2"] = group;
+	strips[1] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "functions" );
+	groups["functions"] = group;
+	
+	group = new Group ( "automation" );
+	groups["automation"] = group;
+	
+	group = new Strip ( "strip_3", 2 );
+	groups["strip_3"] = group;
+	strips[2] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "display" );
+	groups["display"] = group;
+	
+	group = new Strip ( "strip_4", 3 );
+	groups["strip_4"] = group;
+	strips[3] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_5", 4 );
+	groups["strip_5"] = group;
+	strips[4] = dynamic_cast<Strip*>( group );
+	
+	group = new Strip ( "strip_6", 5 );
+	groups["strip_6"] = group;
+	strips[5] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "transport" );
+	groups["transport"] = group;
+	
+	group = new Strip ( "strip_7", 6 );
+	groups["strip_7"] = group;
+	strips[6] = dynamic_cast<Strip*>( group );
+	
+	group = new Group ( "modifiers" );
+	groups["modifiers"] = group;
+	
+	group = new Group ( "bank" );
+	groups["bank"] = group;
+	
+	group = new Strip ( "strip_8", 7 );
+	groups["strip_8"] = group;
+	strips[7] = dynamic_cast<Strip*>( group );
+	
+
+	// initialise controls
+	Control * control = 0;
+
+	group = groups["strip_1"];
+	control = new Fader ( 0, 1, "gain", *group );
+	faders[0x00] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Fader ( 1, 2, "gain", *group );
+	faders[0x01] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Fader ( 2, 3, "gain", *group );
+	faders[0x02] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Fader ( 3, 4, "gain", *group );
+	faders[0x03] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Fader ( 4, 5, "gain", *group );
+	faders[0x04] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Fader ( 5, 6, "gain", *group );
+	faders[0x05] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Fader ( 6, 7, "gain", *group );
+	faders[0x06] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Fader ( 7, 8, "gain", *group );
+	faders[0x07] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["master"];
+	control = new Fader ( 8, 1, "gain", *group );
+	faders[0x08] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Pot ( 16, 1, "vpot", *group );
+	pots[0x10] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Pot ( 17, 2, "vpot", *group );
+	pots[0x11] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Pot ( 18, 3, "vpot", *group );
+	pots[0x12] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Pot ( 19, 4, "vpot", *group );
+	pots[0x13] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Pot ( 20, 5, "vpot", *group );
+	pots[0x14] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Pot ( 21, 6, "vpot", *group );
+	pots[0x15] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Pot ( 22, 7, "vpot", *group );
+	pots[0x16] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Pot ( 23, 8, "vpot", *group );
+	pots[0x17] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Pot ( 60, 1, "jog", *group );
+	pots[0x3c] = control;
+	controls.push_back( control );
+	controls_by_name["jog"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Pot ( 46, 1, "external", *group );
+	pots[0x2e] = control;
+	controls.push_back( control );
+	controls_by_name["external"] = control;
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 0, 1, "recenable", *group );
+	buttons[0x00] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 1, 2, "recenable", *group );
+	buttons[0x01] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 2, 3, "recenable", *group );
+	buttons[0x02] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 3, 4, "recenable", *group );
+	buttons[0x03] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 4, 5, "recenable", *group );
+	buttons[0x04] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 5, 6, "recenable", *group );
+	buttons[0x05] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 6, 7, "recenable", *group );
+	buttons[0x06] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 7, 8, "recenable", *group );
+	buttons[0x07] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 8, 1, "solo", *group );
+	buttons[0x08] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 9, 2, "solo", *group );
+	buttons[0x09] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 10, 3, "solo", *group );
+	buttons[0x0a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 11, 4, "solo", *group );
+	buttons[0x0b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 12, 5, "solo", *group );
+	buttons[0x0c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 13, 6, "solo", *group );
+	buttons[0x0d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 14, 7, "solo", *group );
+	buttons[0x0e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 15, 8, "solo", *group );
+	buttons[0x0f] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 16, 1, "mute", *group );
+	buttons[0x10] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 17, 2, "mute", *group );
+	buttons[0x11] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 18, 3, "mute", *group );
+	buttons[0x12] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 19, 4, "mute", *group );
+	buttons[0x13] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 20, 5, "mute", *group );
+	buttons[0x14] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 21, 6, "mute", *group );
+	buttons[0x15] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 22, 7, "mute", *group );
+	buttons[0x16] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 23, 8, "mute", *group );
+	buttons[0x17] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 24, 1, "select", *group );
+	buttons[0x18] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 25, 2, "select", *group );
+	buttons[0x19] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 26, 3, "select", *group );
+	buttons[0x1a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 27, 4, "select", *group );
+	buttons[0x1b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 28, 5, "select", *group );
+	buttons[0x1c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 29, 6, "select", *group );
+	buttons[0x1d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 30, 7, "select", *group );
+	buttons[0x1e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 31, 8, "select", *group );
+	buttons[0x1f] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 32, 1, "vselect", *group );
+	buttons[0x20] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 33, 2, "vselect", *group );
+	buttons[0x21] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 34, 3, "vselect", *group );
+	buttons[0x22] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 35, 4, "vselect", *group );
+	buttons[0x23] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 36, 5, "vselect", *group );
+	buttons[0x24] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 37, 6, "vselect", *group );
+	buttons[0x25] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 38, 7, "vselect", *group );
+	buttons[0x26] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 39, 8, "vselect", *group );
+	buttons[0x27] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 40, 1, "io", *group );
+	buttons[0x28] = control;
+	controls.push_back( control );
+	controls_by_name["io"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 41, 1, "sends", *group );
+	buttons[0x29] = control;
+	controls.push_back( control );
+	controls_by_name["sends"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 42, 1, "pan", *group );
+	buttons[0x2a] = control;
+	controls.push_back( control );
+	controls_by_name["pan"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 43, 1, "plugin", *group );
+	buttons[0x2b] = control;
+	controls.push_back( control );
+	controls_by_name["plugin"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 44, 1, "eq", *group );
+	buttons[0x2c] = control;
+	controls.push_back( control );
+	controls_by_name["eq"] = control;
+	group->add( *control );
+
+	group = groups["assignment"];
+	control = new Button ( 45, 1, "dyn", *group );
+	buttons[0x2d] = control;
+	controls.push_back( control );
+	controls_by_name["dyn"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 46, 1, "left", *group );
+	buttons[0x2e] = control;
+	controls.push_back( control );
+	controls_by_name["left"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 47, 1, "right", *group );
+	buttons[0x2f] = control;
+	controls.push_back( control );
+	controls_by_name["right"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 48, 1, "channel_left", *group );
+	buttons[0x30] = control;
+	controls.push_back( control );
+	controls_by_name["channel_left"] = control;
+	group->add( *control );
+
+	group = groups["bank"];
+	control = new Button ( 49, 1, "channel_right", *group );
+	buttons[0x31] = control;
+	controls.push_back( control );
+	controls_by_name["channel_right"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 50, 1, "flip", *group );
+	buttons[0x32] = control;
+	controls.push_back( control );
+	controls_by_name["flip"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 51, 1, "edit", *group );
+	buttons[0x33] = control;
+	controls.push_back( control );
+	controls_by_name["edit"] = control;
+	group->add( *control );
+
+	group = groups["display"];
+	control = new Button ( 52, 1, "name_value", *group );
+	buttons[0x34] = control;
+	controls.push_back( control );
+	controls_by_name["name_value"] = control;
+	group->add( *control );
+
+	group = groups["display"];
+	control = new Button ( 53, 1, "smpte_beats", *group );
+	buttons[0x35] = control;
+	controls.push_back( control );
+	controls_by_name["smpte_beats"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 54, 1, "F1", *group );
+	buttons[0x36] = control;
+	controls.push_back( control );
+	controls_by_name["F1"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 55, 1, "F2", *group );
+	buttons[0x37] = control;
+	controls.push_back( control );
+	controls_by_name["F2"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 56, 1, "F3", *group );
+	buttons[0x38] = control;
+	controls.push_back( control );
+	controls_by_name["F3"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 57, 1, "F4", *group );
+	buttons[0x39] = control;
+	controls.push_back( control );
+	controls_by_name["F4"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 58, 1, "F5", *group );
+	buttons[0x3a] = control;
+	controls.push_back( control );
+	controls_by_name["F5"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 59, 1, "F6", *group );
+	buttons[0x3b] = control;
+	controls.push_back( control );
+	controls_by_name["F6"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 60, 1, "F7", *group );
+	buttons[0x3c] = control;
+	controls.push_back( control );
+	controls_by_name["F7"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 61, 1, "F8", *group );
+	buttons[0x3d] = control;
+	controls.push_back( control );
+	controls_by_name["F8"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 62, 1, "F9", *group );
+	buttons[0x3e] = control;
+	controls.push_back( control );
+	controls_by_name["F9"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 63, 1, "F10", *group );
+	buttons[0x3f] = control;
+	controls.push_back( control );
+	controls_by_name["F10"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 64, 1, "F11", *group );
+	buttons[0x40] = control;
+	controls.push_back( control );
+	controls_by_name["F11"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 65, 1, "F12", *group );
+	buttons[0x41] = control;
+	controls.push_back( control );
+	controls_by_name["F12"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 66, 1, "F13", *group );
+	buttons[0x42] = control;
+	controls.push_back( control );
+	controls_by_name["F13"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 67, 1, "F14", *group );
+	buttons[0x43] = control;
+	controls.push_back( control );
+	controls_by_name["F14"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 68, 1, "F15", *group );
+	buttons[0x44] = control;
+	controls.push_back( control );
+	controls_by_name["F15"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 69, 1, "F16", *group );
+	buttons[0x45] = control;
+	controls.push_back( control );
+	controls_by_name["F16"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 70, 1, "shift", *group );
+	buttons[0x46] = control;
+	controls.push_back( control );
+	controls_by_name["shift"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 71, 1, "option", *group );
+	buttons[0x47] = control;
+	controls.push_back( control );
+	controls_by_name["option"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 72, 1, "control", *group );
+	buttons[0x48] = control;
+	controls.push_back( control );
+	controls_by_name["control"] = control;
+	group->add( *control );
+
+	group = groups["modifiers"];
+	control = new Button ( 73, 1, "cmd_alt", *group );
+	buttons[0x49] = control;
+	controls.push_back( control );
+	controls_by_name["cmd_alt"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 74, 1, "on", *group );
+	buttons[0x4a] = control;
+	controls.push_back( control );
+	controls_by_name["on"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 75, 1, "rec_ready", *group );
+	buttons[0x4b] = control;
+	controls.push_back( control );
+	controls_by_name["rec_ready"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 76, 1, "undo", *group );
+	buttons[0x4c] = control;
+	controls.push_back( control );
+	controls_by_name["undo"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 77, 1, "snapshot", *group );
+	buttons[0x4d] = control;
+	controls.push_back( control );
+	controls_by_name["snapshot"] = control;
+	group->add( *control );
+
+	group = groups["automation"];
+	control = new Button ( 78, 1, "touch", *group );
+	buttons[0x4e] = control;
+	controls.push_back( control );
+	controls_by_name["touch"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 79, 1, "redo", *group );
+	buttons[0x4f] = control;
+	controls.push_back( control );
+	controls_by_name["redo"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 80, 1, "marker", *group );
+	buttons[0x50] = control;
+	controls.push_back( control );
+	controls_by_name["marker"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 81, 1, "enter", *group );
+	buttons[0x51] = control;
+	controls.push_back( control );
+	controls_by_name["enter"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 82, 1, "cancel", *group );
+	buttons[0x52] = control;
+	controls.push_back( control );
+	controls_by_name["cancel"] = control;
+	group->add( *control );
+
+	group = groups["functions"];
+	control = new Button ( 83, 1, "mixer", *group );
+	buttons[0x53] = control;
+	controls.push_back( control );
+	controls_by_name["mixer"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 84, 1, "frm_left", *group );
+	buttons[0x54] = control;
+	controls.push_back( control );
+	controls_by_name["frm_left"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 85, 1, "frm_right", *group );
+	buttons[0x55] = control;
+	controls.push_back( control );
+	controls_by_name["frm_right"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 86, 1, "loop", *group );
+	buttons[0x56] = control;
+	controls.push_back( control );
+	controls_by_name["loop"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 87, 1, "punch_in", *group );
+	buttons[0x57] = control;
+	controls.push_back( control );
+	controls_by_name["punch_in"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 88, 1, "punch_out", *group );
+	buttons[0x58] = control;
+	controls.push_back( control );
+	controls_by_name["punch_out"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 89, 1, "home", *group );
+	buttons[0x59] = control;
+	controls.push_back( control );
+	controls_by_name["home"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 90, 1, "end", *group );
+	buttons[0x5a] = control;
+	controls.push_back( control );
+	controls_by_name["end"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 91, 1, "rewind", *group );
+	buttons[0x5b] = control;
+	controls.push_back( control );
+	controls_by_name["rewind"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 92, 1, "ffwd", *group );
+	buttons[0x5c] = control;
+	controls.push_back( control );
+	controls_by_name["ffwd"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 93, 1, "stop", *group );
+	buttons[0x5d] = control;
+	controls.push_back( control );
+	controls_by_name["stop"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 94, 1, "play", *group );
+	buttons[0x5e] = control;
+	controls.push_back( control );
+	controls_by_name["play"] = control;
+	group->add( *control );
+
+	group = groups["transport"];
+	control = new Button ( 95, 1, "record", *group );
+	buttons[0x5f] = control;
+	controls.push_back( control );
+	controls_by_name["record"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 96, 1, "cursor_up", *group );
+	buttons[0x60] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_up"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 97, 1, "cursor_down", *group );
+	buttons[0x61] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_down"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 98, 1, "cursor_left", *group );
+	buttons[0x62] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_left"] = control;
+	group->add( *control );
+
+	group = groups["cursor"];
+	control = new Button ( 99, 1, "cursor_right", *group );
+	buttons[0x63] = control;
+	controls.push_back( control );
+	controls_by_name["cursor_right"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 100, 1, "zoom", *group );
+	buttons[0x64] = control;
+	controls.push_back( control );
+	controls_by_name["zoom"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Button ( 101, 1, "scrub", *group );
+	buttons[0x65] = control;
+	controls.push_back( control );
+	controls_by_name["scrub"] = control;
+	group->add( *control );
+
+	group = groups["user"];
+	control = new Button ( 102, 1, "user_a", *group );
+	buttons[0x66] = control;
+	controls.push_back( control );
+	controls_by_name["user_a"] = control;
+	group->add( *control );
+
+	group = groups["user"];
+	control = new Button ( 103, 1, "user_b", *group );
+	buttons[0x67] = control;
+	controls.push_back( control );
+	controls_by_name["user_b"] = control;
+	group->add( *control );
+
+	group = groups["strip_1"];
+	control = new Button ( 104, 1, "fader_touch", *group );
+	buttons[0x68] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_2"];
+	control = new Button ( 105, 2, "fader_touch", *group );
+	buttons[0x69] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_3"];
+	control = new Button ( 106, 3, "fader_touch", *group );
+	buttons[0x6a] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_4"];
+	control = new Button ( 107, 4, "fader_touch", *group );
+	buttons[0x6b] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_5"];
+	control = new Button ( 108, 5, "fader_touch", *group );
+	buttons[0x6c] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_6"];
+	control = new Button ( 109, 6, "fader_touch", *group );
+	buttons[0x6d] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_7"];
+	control = new Button ( 110, 7, "fader_touch", *group );
+	buttons[0x6e] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["strip_8"];
+	control = new Button ( 111, 8, "fader_touch", *group );
+	buttons[0x6f] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["master"];
+	control = new Button ( 112, 1, "fader_touch", *group );
+	buttons[0x70] = control;
+	controls.push_back( control );
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 113, 1, "smpte", *group );
+	leds[0x71] = control;
+	controls.push_back( control );
+	controls_by_name["smpte"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 114, 1, "beats", *group );
+	leds[0x72] = control;
+	controls.push_back( control );
+	controls_by_name["beats"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 115, 1, "solo", *group );
+	leds[0x73] = control;
+	controls.push_back( control );
+	controls_by_name["solo"] = control;
+	group->add( *control );
+
+	group = groups["none"];
+	control = new Led ( 118, 1, "relay_click", *group );
+	leds[0x76] = control;
+	controls.push_back( control );
+	controls_by_name["relay_click"] = control;
+	group->add( *control );
+
+}
+
+void Mackie::MackieSurface::handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button )
+{
+	if ( bs != press && bs != release )
+	{
+		mbh.update_led( button, none );
+		return;
+	}
+	
+	LedState ls;
+	switch ( button.id() )
+	{
+
+		case 0x28: // io
+			switch ( bs ) {
+				case press: ls = mbh.io_press( button ); break;
+				case release: ls = mbh.io_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x29: // sends
+			switch ( bs ) {
+				case press: ls = mbh.sends_press( button ); break;
+				case release: ls = mbh.sends_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2a: // pan
+			switch ( bs ) {
+				case press: ls = mbh.pan_press( button ); break;
+				case release: ls = mbh.pan_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2b: // plugin
+			switch ( bs ) {
+				case press: ls = mbh.plugin_press( button ); break;
+				case release: ls = mbh.plugin_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2c: // eq
+			switch ( bs ) {
+				case press: ls = mbh.eq_press( button ); break;
+				case release: ls = mbh.eq_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2d: // dyn
+			switch ( bs ) {
+				case press: ls = mbh.dyn_press( button ); break;
+				case release: ls = mbh.dyn_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2e: // left
+			switch ( bs ) {
+				case press: ls = mbh.left_press( button ); break;
+				case release: ls = mbh.left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x2f: // right
+			switch ( bs ) {
+				case press: ls = mbh.right_press( button ); break;
+				case release: ls = mbh.right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x30: // channel_left
+			switch ( bs ) {
+				case press: ls = mbh.channel_left_press( button ); break;
+				case release: ls = mbh.channel_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x31: // channel_right
+			switch ( bs ) {
+				case press: ls = mbh.channel_right_press( button ); break;
+				case release: ls = mbh.channel_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x32: // flip
+			switch ( bs ) {
+				case press: ls = mbh.flip_press( button ); break;
+				case release: ls = mbh.flip_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x33: // edit
+			switch ( bs ) {
+				case press: ls = mbh.edit_press( button ); break;
+				case release: ls = mbh.edit_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x34: // name_value
+			switch ( bs ) {
+				case press: ls = mbh.name_value_press( button ); break;
+				case release: ls = mbh.name_value_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x35: // smpte_beats
+			switch ( bs ) {
+				case press: ls = mbh.smpte_beats_press( button ); break;
+				case release: ls = mbh.smpte_beats_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x36: // F1
+			switch ( bs ) {
+				case press: ls = mbh.F1_press( button ); break;
+				case release: ls = mbh.F1_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x37: // F2
+			switch ( bs ) {
+				case press: ls = mbh.F2_press( button ); break;
+				case release: ls = mbh.F2_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x38: // F3
+			switch ( bs ) {
+				case press: ls = mbh.F3_press( button ); break;
+				case release: ls = mbh.F3_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x39: // F4
+			switch ( bs ) {
+				case press: ls = mbh.F4_press( button ); break;
+				case release: ls = mbh.F4_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3a: // F5
+			switch ( bs ) {
+				case press: ls = mbh.F5_press( button ); break;
+				case release: ls = mbh.F5_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3b: // F6
+			switch ( bs ) {
+				case press: ls = mbh.F6_press( button ); break;
+				case release: ls = mbh.F6_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3c: // F7
+			switch ( bs ) {
+				case press: ls = mbh.F7_press( button ); break;
+				case release: ls = mbh.F7_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3d: // F8
+			switch ( bs ) {
+				case press: ls = mbh.F8_press( button ); break;
+				case release: ls = mbh.F8_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3e: // F9
+			switch ( bs ) {
+				case press: ls = mbh.F9_press( button ); break;
+				case release: ls = mbh.F9_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x3f: // F10
+			switch ( bs ) {
+				case press: ls = mbh.F10_press( button ); break;
+				case release: ls = mbh.F10_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x40: // F11
+			switch ( bs ) {
+				case press: ls = mbh.F11_press( button ); break;
+				case release: ls = mbh.F11_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x41: // F12
+			switch ( bs ) {
+				case press: ls = mbh.F12_press( button ); break;
+				case release: ls = mbh.F12_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x42: // F13
+			switch ( bs ) {
+				case press: ls = mbh.F13_press( button ); break;
+				case release: ls = mbh.F13_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x43: // F14
+			switch ( bs ) {
+				case press: ls = mbh.F14_press( button ); break;
+				case release: ls = mbh.F14_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x44: // F15
+			switch ( bs ) {
+				case press: ls = mbh.F15_press( button ); break;
+				case release: ls = mbh.F15_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x45: // F16
+			switch ( bs ) {
+				case press: ls = mbh.F16_press( button ); break;
+				case release: ls = mbh.F16_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x46: // shift
+			switch ( bs ) {
+				case press: ls = mbh.shift_press( button ); break;
+				case release: ls = mbh.shift_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x47: // option
+			switch ( bs ) {
+				case press: ls = mbh.option_press( button ); break;
+				case release: ls = mbh.option_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x48: // control
+			switch ( bs ) {
+				case press: ls = mbh.control_press( button ); break;
+				case release: ls = mbh.control_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x49: // cmd_alt
+			switch ( bs ) {
+				case press: ls = mbh.cmd_alt_press( button ); break;
+				case release: ls = mbh.cmd_alt_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4a: // on
+			switch ( bs ) {
+				case press: ls = mbh.on_press( button ); break;
+				case release: ls = mbh.on_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4b: // rec_ready
+			switch ( bs ) {
+				case press: ls = mbh.rec_ready_press( button ); break;
+				case release: ls = mbh.rec_ready_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4c: // undo
+			switch ( bs ) {
+				case press: ls = mbh.undo_press( button ); break;
+				case release: ls = mbh.undo_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4d: // snapshot
+			switch ( bs ) {
+				case press: ls = mbh.snapshot_press( button ); break;
+				case release: ls = mbh.snapshot_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4e: // touch
+			switch ( bs ) {
+				case press: ls = mbh.touch_press( button ); break;
+				case release: ls = mbh.touch_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x4f: // redo
+			switch ( bs ) {
+				case press: ls = mbh.redo_press( button ); break;
+				case release: ls = mbh.redo_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x50: // marker
+			switch ( bs ) {
+				case press: ls = mbh.marker_press( button ); break;
+				case release: ls = mbh.marker_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x51: // enter
+			switch ( bs ) {
+				case press: ls = mbh.enter_press( button ); break;
+				case release: ls = mbh.enter_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x52: // cancel
+			switch ( bs ) {
+				case press: ls = mbh.cancel_press( button ); break;
+				case release: ls = mbh.cancel_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x53: // mixer
+			switch ( bs ) {
+				case press: ls = mbh.mixer_press( button ); break;
+				case release: ls = mbh.mixer_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x54: // frm_left
+			switch ( bs ) {
+				case press: ls = mbh.frm_left_press( button ); break;
+				case release: ls = mbh.frm_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x55: // frm_right
+			switch ( bs ) {
+				case press: ls = mbh.frm_right_press( button ); break;
+				case release: ls = mbh.frm_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x56: // loop
+			switch ( bs ) {
+				case press: ls = mbh.loop_press( button ); break;
+				case release: ls = mbh.loop_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x57: // punch_in
+			switch ( bs ) {
+				case press: ls = mbh.punch_in_press( button ); break;
+				case release: ls = mbh.punch_in_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x58: // punch_out
+			switch ( bs ) {
+				case press: ls = mbh.punch_out_press( button ); break;
+				case release: ls = mbh.punch_out_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x59: // home
+			switch ( bs ) {
+				case press: ls = mbh.home_press( button ); break;
+				case release: ls = mbh.home_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5a: // end
+			switch ( bs ) {
+				case press: ls = mbh.end_press( button ); break;
+				case release: ls = mbh.end_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5b: // rewind
+			switch ( bs ) {
+				case press: ls = mbh.rewind_press( button ); break;
+				case release: ls = mbh.rewind_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5c: // ffwd
+			switch ( bs ) {
+				case press: ls = mbh.ffwd_press( button ); break;
+				case release: ls = mbh.ffwd_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5d: // stop
+			switch ( bs ) {
+				case press: ls = mbh.stop_press( button ); break;
+				case release: ls = mbh.stop_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5e: // play
+			switch ( bs ) {
+				case press: ls = mbh.play_press( button ); break;
+				case release: ls = mbh.play_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x5f: // record
+			switch ( bs ) {
+				case press: ls = mbh.record_press( button ); break;
+				case release: ls = mbh.record_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x60: // cursor_up
+			switch ( bs ) {
+				case press: ls = mbh.cursor_up_press( button ); break;
+				case release: ls = mbh.cursor_up_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x61: // cursor_down
+			switch ( bs ) {
+				case press: ls = mbh.cursor_down_press( button ); break;
+				case release: ls = mbh.cursor_down_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x62: // cursor_left
+			switch ( bs ) {
+				case press: ls = mbh.cursor_left_press( button ); break;
+				case release: ls = mbh.cursor_left_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x63: // cursor_right
+			switch ( bs ) {
+				case press: ls = mbh.cursor_right_press( button ); break;
+				case release: ls = mbh.cursor_right_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x64: // zoom
+			switch ( bs ) {
+				case press: ls = mbh.zoom_press( button ); break;
+				case release: ls = mbh.zoom_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x65: // scrub
+			switch ( bs ) {
+				case press: ls = mbh.scrub_press( button ); break;
+				case release: ls = mbh.scrub_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x66: // user_a
+			switch ( bs ) {
+				case press: ls = mbh.user_a_press( button ); break;
+				case release: ls = mbh.user_a_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+		case 0x67: // user_b
+			switch ( bs ) {
+				case press: ls = mbh.user_b_press( button ); break;
+				case release: ls = mbh.user_b_release( button ); break;
+				case neither: break;
+			}
+			break;
+
+	}
+	mbh.update_led( button, ls );
+}
diff --git a/libs/surfaces/mackie/mackie_surface.h b/libs/surfaces/mackie/mackie_surface.h
new file mode 100644
index 0000000000..735cbc5851
--- /dev/null
+++ b/libs/surfaces/mackie/mackie_surface.h
@@ -0,0 +1,27 @@
+#ifndef mackie_surface_mackie_h
+#define mackie_surface_mackie_h
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "surface.h"
+
+namespace Mackie
+{
+
+class MackieButtonHandler;
+
+class MackieSurface : public Surface
+{
+public:
+	MackieSurface( uint32_t max_strips ) : Surface( max_strips )
+	{
+	}
+	
+	virtual void handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button );
+	virtual void init_controls();
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/midi_byte_array.cc b/libs/surfaces/mackie/midi_byte_array.cc
new file mode 100644
index 0000000000..192af6a1ce
--- /dev/null
+++ b/libs/surfaces/mackie/midi_byte_array.cc
@@ -0,0 +1,98 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "midi_byte_array.h"
+
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <algorithm>
+#include <cstdarg>
+#include <iomanip>
+
+using namespace std;
+
+MidiByteArray::MidiByteArray( size_t size, MIDI::byte array[] )
+: std::vector<MIDI::byte>()
+{
+	for ( size_t i = 0; i < size; ++i )
+	{
+		push_back( array[i] );
+	}			
+}
+
+MidiByteArray::MidiByteArray( size_t count, MIDI::byte first, ... )
+: vector<MIDI::byte>()
+{
+	push_back( first );
+	va_list var_args;
+	va_start( var_args, first );
+	for ( size_t i = 1; i < count; ++i )
+	{
+		MIDI::byte b = va_arg( var_args, int );
+		push_back( b );
+	}
+	va_end( var_args );
+}
+
+boost::shared_array<MIDI::byte> MidiByteArray::bytes() const
+{
+	MIDI::byte * buf = new MIDI::byte[size()];
+	const_iterator it = begin();
+	for( MIDI::byte * ptr = buf; it != end(); ++it )
+	{
+		*ptr++ = *it;
+	}
+	return boost::shared_array<MIDI::byte>( buf );
+}
+
+void MidiByteArray::copy( size_t count, MIDI::byte * arr )
+{
+	for( size_t i = 0; i < count; ++i )
+	{
+		push_back( arr[i] );
+	}
+}
+
+MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b )
+{
+	mba.push_back( b );
+	return mba;
+}
+
+MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr )
+{
+	back_insert_iterator<MidiByteArray> bit( mba );
+	copy( barr.begin(), barr.end(), bit );
+	return mba;
+}
+
+ostream & operator << ( ostream & os, const MidiByteArray & mba )
+{
+	os << "[";
+	char fill = os.fill('0');
+	for( MidiByteArray::const_iterator it = mba.begin(); it != mba.end(); ++it )
+	{
+		if ( it != mba.begin() ) os << " ";
+		os << hex << setw(2) << (int)*it;
+	}
+	os.fill( fill );
+	os << dec;
+	os << "]";
+	return os;
+}
diff --git a/libs/surfaces/mackie/midi_byte_array.h b/libs/surfaces/mackie/midi_byte_array.h
new file mode 100644
index 0000000000..e77ece1b88
--- /dev/null
+++ b/libs/surfaces/mackie/midi_byte_array.h
@@ -0,0 +1,76 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef midi_byte_array_h
+#define midi_byte_array_h
+
+#include <iostream>
+#include <vector>
+
+#include <boost/shared_array.hpp>
+
+//#include <midi++/types.h>
+namespace MIDI {
+	typedef unsigned char byte;
+}
+
+/**
+	To make building arrays of bytes easier. Thusly:
+
+	MidiByteArray mba;
+	mba << 0xf0 << 0x00 << 0xf7;
+
+	MidiByteArray buf;
+	buf << mba;
+
+	MidiByteArray direct( 3, 0xf0, 0x00, 0xf7 );
+
+	cout << mba << endl;
+	cout << buf << endl;
+	cout << direct << endl;
+
+	will all result in "f0 00 f7" being output to stdout
+*/
+class MidiByteArray : public std::vector<MIDI::byte>
+{
+public:
+	MidiByteArray() : std::vector<MIDI::byte>() {}
+	
+	MidiByteArray( size_t count, MIDI::byte array[] );
+
+	/**
+		Accepts a preceding count, and then a list of bytes
+	*/
+	MidiByteArray( size_t count, MIDI::byte first, ... );
+	
+	/// return smart pointer to a copy of the bytes
+	boost::shared_array<MIDI::byte> bytes() const;
+		
+	/// copy the given number of bytes from the given array
+	void copy( size_t count, MIDI::byte arr[] );
+};
+
+/// append the given byte to the end of the array
+MidiByteArray & operator << ( MidiByteArray & mba, const MIDI::byte & b );
+
+/// append the given array to the end of this array
+MidiByteArray & operator << ( MidiByteArray & mba, const MidiByteArray & barr );
+
+/// output the bytes as hex to the given stream
+std::ostream & operator << ( std::ostream & os, const MidiByteArray & mba );
+
+#endif
diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc
new file mode 100644
index 0000000000..b01b5e0cf5
--- /dev/null
+++ b/libs/surfaces/mackie/route_signal.cc
@@ -0,0 +1,96 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "route_signal.h"
+
+#include <ardour/route.h>
+#include <ardour/track.h>
+#include <ardour/panner.h>
+#include <ardour/types.h>
+
+#include "mackie_control_protocol.h"
+
+#include <stdexcept>
+
+using namespace Mackie;
+
+void RouteSignal::connect()
+{
+	if ( _strip.has_solo() )
+		_solo_changed_connection = _route.solo_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_solo_changed ), this ) );
+	
+	if ( _strip.has_mute() )
+		_mute_changed_connection = _route.mute_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_mute_changed ), this ) );
+	
+	if ( _strip.has_gain() )
+		_gain_changed_connection = _route.control(ARDOUR::GainAutomation)->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), this ) );
+		
+	_name_changed_connection = _route.NameChanged.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_name_changed ), this ) );
+	
+	if ( _route.panner().size() == 1 )
+	{
+		_panner_changed_connection = _route.panner()[0]->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_panner_changed ), this ) );
+	}
+	
+	try
+	{
+		_record_enable_changed_connection =
+			dynamic_cast<ARDOUR::Track&>( _route ).rec_enable_control()->Changed
+				.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_record_enable_changed ), this ) )
+		;
+	}
+	catch ( std::bad_cast & )
+	{
+		// this should catch the dynamic_cast to Track, if what we're working
+		// with can't be record-enabled
+	}
+
+	// TODO
+	// active_changed
+	// SelectedChanged
+	// RemoteControlIDChanged. Better handled at Session level.
+}
+
+void RouteSignal::disconnect()
+{
+	_solo_changed_connection.disconnect();
+	_mute_changed_connection.disconnect();
+	_gain_changed_connection.disconnect();
+	_name_changed_connection.disconnect();
+	_panner_changed_connection.disconnect();
+	_record_enable_changed_connection.disconnect();
+}
+
+void RouteSignal::notify_all()
+{
+	if ( _strip.has_solo() )
+		_mcp.notify_solo_changed( this );
+	
+	if ( _strip.has_mute() )
+		_mcp.notify_mute_changed( this );
+	
+	if ( _strip.has_gain() )
+		_mcp.notify_gain_changed( this );
+	
+	_mcp.notify_name_changed( this );
+	
+	if ( _strip.has_vpot() )
+		_mcp.notify_panner_changed( this );
+	
+	if ( _strip.has_recenable() )
+		_mcp.notify_record_enable_changed( this );
+}
diff --git a/libs/surfaces/mackie/route_signal.h b/libs/surfaces/mackie/route_signal.h
new file mode 100644
index 0000000000..0239980fd4
--- /dev/null
+++ b/libs/surfaces/mackie/route_signal.h
@@ -0,0 +1,81 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef route_signal_h
+#define route_signal_h
+
+#include <sigc++/sigc++.h>
+
+class MackieControlProtocol;
+
+namespace ARDOUR {
+	class Route;
+}
+	
+namespace Mackie
+{
+
+class Strip;
+class MackiePort;
+
+/**
+  This class is intended to easily create and destroy the set of
+  connections from a route to a control surface strip. Instantiating
+  it will connect the signals, and destructing it will disconnect
+  the signals.
+*/
+class RouteSignal
+{
+public:
+	RouteSignal( ARDOUR::Route & route, MackieControlProtocol & mcp, Strip & strip, MackiePort & port )
+	: _route( route ), _mcp( mcp ), _strip( strip ), _port( port )
+	{
+		connect();
+	}
+	
+	~RouteSignal()
+	{
+		disconnect();
+	}
+	
+	void connect();
+	void disconnect();
+	
+	// call all signal handlers manually
+	void notify_all();
+	
+	const ARDOUR::Route & route() const { return _route; }
+	Strip & strip() { return _strip; }
+	MackiePort & port() { return _port; }
+	
+private:
+	ARDOUR::Route & _route;
+	MackieControlProtocol & _mcp;
+	Strip & _strip;
+	MackiePort & _port;	
+
+	sigc::connection _solo_changed_connection;
+	sigc::connection _mute_changed_connection;
+	sigc::connection _record_enable_changed_connection;
+	sigc::connection _gain_changed_connection;
+	sigc::connection _name_changed_connection;
+	sigc::connection _panner_changed_connection;
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/scripts/bank.rb b/libs/surfaces/mackie/scripts/bank.rb
new file mode 100644
index 0000000000..e1482545ee
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/bank.rb
@@ -0,0 +1,32 @@
+#! /usr/bin/ruby
+
+class Bank
+	attr_accessor :routes, :strips, :current
+	
+	def initialize( routes = 17, strips = 8, current = 0 )
+		@routes = routes
+		@strips = strips
+		@current = current
+	end
+	
+	def left
+    new_initial = current - routes
+    if new_initial < 0
+      new_initial = 0
+    end
+    current = new_initial
+    self
+	end
+	
+	def right
+    delta = routes - ( strips + current ) - 1
+    puts "delta: #{delta}"
+    if delta > strips
+      delta = strips
+    end
+    @current += delta
+    self
+	end
+end
+
+b=Bank.new
diff --git a/libs/surfaces/mackie/scripts/bcf-controls.csv b/libs/surfaces/mackie/scripts/bcf-controls.csv
new file mode 100644
index 0000000000..e22965a906
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/bcf-controls.csv
@@ -0,0 +1,94 @@
+type,count,group,name,switch,led,id
+# faders
+fader,7,strip,gain,1,0,0x00
+fader,1,master,gain,1,0,0x07
+
+# pots
+pot,7,strip,vpot,1,1,0x10
+pot,1,,jog,1,0,0x17
+pot,1,,external,1,0,0x2e
+
+# strip buttons
+button,7,strip,recenable,1,1,0x18
+button,7,strip,solo,1,1,0x20
+button,7,strip,mute,1,1,0x10
+button,7,strip,select,1,1,0x0
+button,7,strip,vselect,1,0,0x08
+
+# overlay buttons
+button,1,assignment,io,1,1,0x28
+button,1,assignment,sends,1,1,0x5a
+button,1,assignment,pan,1,1,0x59
+button,1,assignment,plugin,1,1,0x57
+button,1,assignment,eq,1,1,0x58
+button,1,assignment,dyn,1,1,0x2d
+button,1,bank,left,1,0,0x2e
+button,1,bank,right,1,0,0x2f
+button,1,bank,channel_left,1,0,0x30
+button,1,bank,channel_right,1,0,0x31
+button,1,,flip,1,1,0x32
+button,1,,edit,1,1,0x56
+
+button,1,display,name_value,1,0,0x34
+button,1,display,smpte_beats,1,0,0x35
+button,1,,F1,1,0,0x36
+button,1,,F2,1,0,0x37
+button,1,,F3,1,0,0x38
+button,1,,F4,1,0,0x39
+button,1,,F5,1,0,0x3a
+button,1,,F6,1,0,0x3b
+button,1,,F7,1,0,0x3c
+button,1,,F8,1,0,0x3d
+button,1,,F9,1,0,0x3e
+button,1,,F10,1,0,0x3f
+button,1,,F11,1,0,0x40
+button,1,,F12,1,0,0x41
+button,1,,F13,1,0,0x42
+button,1,,F14,1,0,0x43
+button,1,,F15,1,0,0x44
+button,1,,F16,1,0,0x45
+# turn on/off all solos
+button,1,,global_solo,1,0,0x27
+button,1,modifiers,option,1,0,0x50
+button,1,modifiers,cmd_alt,1,0,0x49
+button,1,automation,on,1,1,0x4a
+button,1,automation,rec_ready,1,1,0x4b
+button,1,functions,undo,1,1,0x4c
+button,1,automation,snapshot,1,1,0x4d
+button,1,functions,redo,1,1,0x4f
+button,1,functions,marker,1,1,0x47
+button,1,functions,enter,1,1,0x51
+button,1,functions,cancel,1,0,0x52
+button,1,functions,mixer,1,0,0x53
+
+# transport buttons
+button,1,transport,frm_left,1,1,0x5b
+button,1,transport,frm_right,1,1,0x5c
+button,1,transport,loop,1,1,0x46
+button,1,transport,punch_in,1,1,0x48
+button,1,transport,punch_out,1,1,0x4e
+button,1,transport,home,1,1,0x2a
+button,1,transport,end,1,1,0x29
+button,1,transport,"rewind",1,1,0x2c
+button,1,transport,"ffwd",1,1,0x2b
+button,1,transport,"stop",1,1,0x5d
+button,1,transport,"play",1,1,0x5e
+button,1,transport,"record",1,1,0x1f
+button,1,cursor,"cursor_up",1,0,0x60
+button,1,cursor,"cursor_down",1,0,0x61
+button,1,cursor,"cursor_left",1,0,0x62
+button,1,cursor,"cursor_right",1,0,0x63
+button,1,,"zoom",1,1,0x64
+button,1,,"scrub",1,1,0x65
+button,1,user,"user_a",1,0,0x66
+button,1,user,"user_b",1,0,0x67
+
+button,7,strip,"fader_touch",1,0,0x68
+button,1,master,"fader_touch",1,0,0x6f
+button,1,master,mute,1,0,0x17
+button,1,,clicking,1,1,0x33
+
+button,1,,"smpte",0,1,0x71
+button,1,,"beats",0,1,0x72
+button,1,,"solo",0,1,0x73
+button,1,,"relay_click",0,1,0x76
diff --git a/libs/surfaces/mackie/scripts/controls.rb b/libs/surfaces/mackie/scripts/controls.rb
new file mode 100644
index 0000000000..b56fd6010d
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/controls.rb
@@ -0,0 +1,208 @@
+#! /usr/bin/ruby
+# Copyright (C) 2006,2007 John Anderson
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+require 'faster_csv'
+require 'mackie.rb'
+
+class Control
+  attr_accessor :id, :led, :group, :name, :ordinal, :switch
+  
+  def initialize( obj, group )
+    @id = obj.id
+    @name = obj.name
+    @ordinal = obj.ordinal
+    @switch = obj.switch
+    @group = group
+  end
+  
+  def ordinal_name
+  end
+end
+
+class Fader < Control
+  def self.midi_zero_byte
+    0xe0
+  end
+  
+  def self.mask_for_id( bytes )
+    bytes[0] & 0b00001111
+  end
+end
+
+class Button < Control
+  def self.midi_zero_byte
+    0x90
+  end
+  
+  def self.mask_for_id( bytes )
+    bytes[1]
+  end
+end
+
+class Led < Control
+end
+
+class LedRing < Led
+end
+
+class Pot < Control
+  def self.midi_zero_byte
+    0xb0
+  end
+  
+  def self.mask_for_id( bytes )
+    bytes[1] & 0b00011111
+  end
+
+  def led=( rhs )
+    @led = LedRing.new( rhs, group )
+  end
+end
+
+class Group < Array
+  attr_accessor :name, :controls
+  
+  def initialize( name )
+    @name = name
+  end
+  
+  def add_control( control )
+    @controls ||= Array.new
+    @controls << control
+  end
+end
+
+class Strip < Group
+  
+  attr_accessor :ordinal
+  def initialize( name, ordinal )
+    super( name )
+    @ordinal = ordinal
+  end
+  
+  def name
+    @name == 'master' ? @name : "#{@name}_#{@ordinal}"
+  end
+  
+  def is_master
+    name == 'master'
+  end
+  
+end
+
+types = { 0xe0 => Fader, 0x90 => Button, 0xb0 => Pot }
+
+# number of controls, name, switch, led, id
+# anything that doesn't have the correct number
+# of columns will be ignored
+# actually, 'switch' means it generates data
+# whereas 'led' means it receives data
+
+class Row
+  attr_accessor :count, :name, :switch, :led, :start_id, :type, :group
+  attr_accessor :id, :ordinal_name, :ordinal_group, :ordinal
+
+  def initialize( hash )
+    @count = hash['count'].to_i
+    @name = hash['name']
+    @switch = hash['switch'].to_b
+    @led = hash['led'].to_b
+    @start_id = hash['id'].hex
+    @type = hash['type']
+    @group = hash['group']
+    
+    @hash = hash
+  end
+  
+  def each_ordinal( &block )
+    for i in 0...count
+      @ordinal = i + 1
+      @ordinal_name = count > 1 ? "#{name}_#{ordinal}" : name
+      @ordinal_group = count > 1 ? "#{group}_#{ordinal}" : group
+      @id = start_id + i
+      
+      @hash['ordinal_name'] = @ordinal_name
+      @hash['ordinal_group'] = @ordinal_group
+      
+      yield( self )
+    end
+    self
+  end
+  
+  def to_hash
+    @hash
+  end
+end
+
+class Surface
+  attr_reader :groups, :controls_by_id, :types, :midis, :controls, :name
+  
+  def initialize( name = 'none' )
+    @name = name
+    @types = Hash.new
+    @groups = Hash.new
+    @controls = Array.new
+    @controls_by_id = Hash.new
+    @midis = Hash.new
+  end
+  
+  def add_or_create_group( name, ordinal = nil )
+    if name.nil?
+      @groups['none'] = Group.new('none')
+    else
+      group = name =~ /strip/ || name == 'master' ? Strip.new( name, ordinal ) : Group.new( name )
+      @groups[group.name] ||= group
+    end
+  end
+
+  def parse( control_data )
+    FasterCSV.parse( control_data, :headers => true ) do |csv_row|
+      next if csv_row.entries.size < 5 || csv_row[0] =~ /^\s*#/ || csv_row['id'].nil?
+      row = Row.new( csv_row )
+      
+      row.each_ordinal do |row|
+        group = add_or_create_group( row.group, row.ordinal )
+        if row.switch
+          # for controls
+          control = eval "#{row.type.capitalize}.new( row, group )"
+          
+          # for controls with leds
+          control.led = Led.new( row, group ) if row.led
+        else
+          # for LED-only entries
+          if row.led
+            control = Led.new( row, group )
+            control.led = control
+          end
+        end
+        
+        # add the new control to the various lookups
+        @controls_by_id[row.id] = control
+        @controls << control
+        group << control
+        
+        # add incoming midi bytes
+        if row.switch
+          types[control.class.midi_zero_byte] = control.class
+          midis[control.class.midi_zero_byte] ||= Hash.new
+          midis[control.class.midi_zero_byte][row.id] = control
+        end
+      end
+    end
+    self
+  end
+end
diff --git a/libs/surfaces/mackie/scripts/dump.rb b/libs/surfaces/mackie/scripts/dump.rb
new file mode 100755
index 0000000000..f1e341fb34
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/dump.rb
@@ -0,0 +1,11 @@
+#! /usr/bin/ruby
+
+while !File.exist? ARGV[0]
+  sleep 0.010
+end
+
+file = File.open ARGV[0], 'r'
+
+while bytes = file.sysread( 3 )
+  puts "%02x %02x %02x" % [ bytes[0], bytes[1], bytes[2] ]
+end
diff --git a/libs/surfaces/mackie/scripts/generate-button-handlers-cc.erb b/libs/surfaces/mackie/scripts/generate-button-handlers-cc.erb
new file mode 100644
index 0000000000..62bc65d0c3
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/generate-button-handlers-cc.erb
@@ -0,0 +1,59 @@
+<%#
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-%>
+<%-
+require 'controls.rb'
+
+sf = Surface.new
+sf.parse( File.open "mackie-controls.csv" )
+buttons = sf.controls.find_all{|x| x.class == Button && x.group.class != Strip}
+-%>
+/*
+	Generated by scripts/generate-button-handlers.erb
+*/
+#include "mackie_button_handler.h"
+#include "controls.h"
+
+#include <iostream>
+
+using namespace std;
+using namespace Mackie;
+
+LedState MackieButtonHandler::default_button_press( Button & button )
+{
+	cout << "press: " << button << endl;
+	return on;
+}
+LedState MackieButtonHandler::default_button_release( Button & button )
+{
+	cout << "release: " << button << endl;
+	return off;
+}
+
+<%-
+buttons.each do |button|
+%>
+LedState MackieButtonHandler::<%=button.name%>_press( Button & button )
+{
+	return default_button_press( button );
+}
+
+LedState MackieButtonHandler::<%=button.name%>_release( Button & button )
+{
+	return default_button_release( button );
+}
+<% end %>
diff --git a/libs/surfaces/mackie/scripts/generate-button-handlers-h.erb b/libs/surfaces/mackie/scripts/generate-button-handlers-h.erb
new file mode 100644
index 0000000000..605b6c29dc
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/generate-button-handlers-h.erb
@@ -0,0 +1,54 @@
+<%#
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-%>
+<%-
+require 'controls.rb'
+
+sf = Surface.new
+sf.parse( File.open "mackie-controls.csv" )
+buttons = sf.controls.find_all{|x| x.class == Button && x.group.class != Strip}
+-%>
+#ifndef mackie_button_handler_h
+#define mackie_button_handler_h
+/*
+	Generated by scripts/generate-button-handlers.erb
+*/
+
+#include "types.h"
+
+namespace Mackie
+{
+
+class MackieButtonHandler
+{
+public:
+	virtual ~MackieButtonHandler() {}
+	
+	virtual LedState default_button_press( Button & button );
+	virtual LedState default_button_release( Button & button );
+	
+	virtual void update_led( Button & button, LedState ls ) = 0;
+	
+<%- buttons.each do |button| %>
+	virtual LedState <%=button.name%>_press( Button & );
+	virtual LedState <%=button.name%>_release( Button & );
+<% end %>
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/scripts/generate-surface.rb b/libs/surfaces/mackie/scripts/generate-surface.rb
new file mode 100755
index 0000000000..c6a028804a
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/generate-surface.rb
@@ -0,0 +1,26 @@
+#! /usr/bin/ruby
+
+require 'erb'
+
+require File.dirname(__FILE__) + '/controls.rb'
+
+cc_template = ''
+File.open( File.dirname(__FILE__) + "/surface-cc-template.erb", "r" ) { |f| cc_template = f.read }
+
+h_template = ''
+File.open( File.dirname(__FILE__) + "/surface-h-template.erb", "r" ) { |f| h_template = f.read }
+
+sf = Surface.new( ARGV[0] )
+control_data = ''
+File.open( File.dirname(__FILE__) + "/#{sf.name.downcase}-controls.csv", "r") { |f| control_data = f.read }
+sf.parse control_data
+
+@result = ""
+erb = ERB.new( cc_template , 0, "%<>-", "@result" )
+erb.result
+File.open( "#{sf.name.downcase}_surface.cc", "w" ) { |f| f.write @result }
+
+erb = ERB.new( h_template , 0, "%<>-", "@result" )
+erb.result
+File.open( "#{sf.name.downcase}_surface.h", "w" ) { |f| f.write @result }
+
diff --git a/libs/surfaces/mackie/scripts/host.rb b/libs/surfaces/mackie/scripts/host.rb
new file mode 100755
index 0000000000..8972cba137
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/host.rb
@@ -0,0 +1,133 @@
+#! /usr/bin/ruby
+# Copyright (C) 2006,2007 John Anderson
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+require 'controls.rb'
+require 'mackie.rb'
+
+while !File.exist? ARGV[0]
+  sleep 0.010
+end
+
+#mapping_csv = ARGV[1] || "mackie-controls.csv"
+mapping_csv = ARGV[1]
+puts "mapping_csv: #{mapping_csv}"
+puts ""
+
+file = File.open ARGV[0], 'r+'
+mck = Mackie.new( file )
+
+# send device query
+response = mck.sysex( "\x00" )
+puts "response: #{response.to_hex}"
+
+# decode host connection query
+status = response[0]
+if status != 1
+  puts "expected 01, got " + response.to_hex.inspect
+  exit(1)
+end
+serial = response[1..7]
+challenge = response[8..11]
+puts <<EOF
+serial: #{serial.to_hex.inspect}
+challenge: #{challenge.to_hex.inspect}
+EOF
+
+# send host connection reply
+response = mck.sysex( "\x02" + serial.pack('C*') + challenge.pack('C*') )
+
+# decode host connection confirmation
+status = response[0]
+if status != 3
+  puts "expected 03, got " + response.to_hex.inspect
+  exit(1)
+end
+
+serial = response[1..7]
+puts <<EOF
+serial: #{serial.to_hex.inspect}
+EOF
+
+# faders to minimum. bcf2000 doesn't respond
+#file.write( hdr + "\x61\xf7" )
+
+# all leds off. bcf2000 doesn't respond
+#file.write( hdr + "\x62\xf7" )
+
+# get version. comes back as ASCII bytes
+version = mck.sysex( "\x13\x00" )
+puts "version: #{version.map{|x| x.chr}}"
+
+# write a welcome message. bcf2000 responds with exact
+# string but doesn't display anything
+# 0 offset,
+#~ file.write hdr + "\x12\x3fLCDE\xf7"
+#~ file.flush
+#~ answer = read_sysex file
+#~ puts "answer: #{answer[hdr.length..-1].map{|x| x.chr}}"
+
+# write to BBT display
+#~ file.write hdr + "\x10LCDE\xf7"
+#~ file.flush
+#~ bbt = []
+#~ while ( nc = file.read( 1 ) )[0] != 0xf7
+  #~ bbt << nc[0]
+#~ end
+#~ puts "bbt: #{bbt[hdr.length..-1].map{|x| x.chr}}"
+
+# write 7-segment display
+#~ file.write hdr + "\x11LCDE\xf7"
+#~ file.flush
+
+# go offline. bcf2000 doesn't respond
+#~ file.write( hdr + "\x0f\x7f\xf7" )
+#~ file.flush
+
+sf = Surface.new
+control_data = ""
+File.open( mapping_csv ) { |f| control_data = f.read }
+sf.parse( control_data )
+
+# send all faders to 0, but bounce them first
+# otherwise the bcf gets confused
+sf.midis[0xe0].values.find_all{|x| x.class == Fader}.each do |x|
+  bytes = Array.new
+  bytes[0] = 0xe0 + x.ordinal - 1
+  bytes[1] = 0x1
+  bytes[2] = 0x1
+  file.write bytes.pack( 'C*' )
+  bytes[0] = 0xe0 + x.ordinal - 1
+  bytes[1] = 0x0
+  bytes[2] = 0x0
+  file.write bytes.pack( 'C*' )
+end
+file.flush
+
+# respond to control movements
+while bytes = mck.file.read( 3 )
+  print "received: %02.x %02.x %02.x" % [ bytes[0], bytes[1], bytes[2] ]
+  midi_type = bytes[0] & 0b11110000
+
+  control_id = sf.types[midi_type].mask_for_id( bytes )
+  control = sf.midis[midi_type][control_id]
+  
+  print " Control Type: %-7s, " % sf.types[midi_type]
+  print "id: %4i" % control_id
+  print ", control: %15s" % ( control ? control.name : "nil control" )
+  print ", %15s" % ( control ? control.group.name : "nil group" )
+  print "\n"
+end
diff --git a/libs/surfaces/mackie/scripts/mackie-controls.csv b/libs/surfaces/mackie/scripts/mackie-controls.csv
new file mode 100644
index 0000000000..5dbb6297f8
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/mackie-controls.csv
@@ -0,0 +1,93 @@
+type,count,group,name,switch,led,id
+# faders
+fader,8,strip,gain,1,0,0x00
+fader,1,master,gain,1,0,0x08
+
+# pots
+pot,8,strip,vpot,1,1,0x10
+pot,1,,jog,1,0,0x3c
+pot,1,,external,1,0,0x2e
+
+# strip buttons
+button,8,strip,recenable,1,1,0x0
+button,8,strip,solo,1,1,0x08
+button,8,strip,mute,1,1,0x10
+button,8,strip,select,1,1,0x18
+button,8,strip,vselect,1,0,0x20
+
+# overlay buttons
+button,1,assignment,io,1,1,0x28
+button,1,assignment,sends,1,1,0x29
+button,1,assignment,pan,1,1,0x2a
+button,1,assignment,plugin,1,1,0x2b
+button,1,assignment,eq,1,1,0x2c
+button,1,assignment,dyn,1,1,0x2d
+button,1,bank,left,1,0,0x2e
+button,1,bank,right,1,0,0x2f
+button,1,bank,channel_left,1,0,0x30
+button,1,bank,channel_right,1,0,0x31
+button,1,,flip,1,1,0x32
+button,1,,edit,1,1,0x33
+
+button,1,display,name_value,1,0,0x34
+button,1,display,smpte_beats,1,0,0x35
+button,1,,F1,1,0,0x36
+button,1,,F2,1,0,0x37
+button,1,,F3,1,0,0x38
+button,1,,F4,1,0,0x39
+button,1,,F5,1,0,0x3a
+button,1,,F6,1,0,0x3b
+button,1,,F7,1,0,0x3c
+button,1,,F8,1,0,0x3d
+button,1,,F9,1,0,0x3e
+button,1,,F10,1,0,0x3f
+button,1,,F11,1,0,0x40
+button,1,,F12,1,0,0x41
+button,1,,F13,1,0,0x42
+button,1,,F14,1,0,0x43
+button,1,,F15,1,0,0x44
+button,1,,F16,1,0,0x45
+button,1,modifiers,shift,1,0,0x46
+button,1,modifiers,option,1,0,0x47
+button,1,modifiers,control,1,0,0x48
+button,1,modifiers,cmd_alt,1,0,0x49
+button,1,automation,on,1,1,0x4a
+button,1,automation,rec_ready,1,1,0x4b
+button,1,functions,undo,1,1,0x4c
+button,1,automation,snapshot,1,1,0x4d
+button,1,automation,touch,1,1,0x4e
+button,1,functions,redo,1,1,0x4f
+button,1,functions,marker,1,1,0x50
+button,1,functions,enter,1,1,0x51
+button,1,functions,cancel,1,0,0x52
+button,1,functions,mixer,1,0,0x53
+button,1,transport,frm_left,1,1,0x54
+button,1,transport,frm_right,1,1,0x55
+button,1,transport,loop,1,1,0x56
+button,1,transport,punch_in,1,1,0x57
+button,1,transport,punch_out,1,1,0x58
+button,1,transport,home,1,1,0x59
+button,1,transport,end,1,1,0x5a
+
+# transport buttons
+button,1,transport,"rewind",1,1,0x5b
+button,1,transport,"ffwd",1,1,0x5c
+button,1,transport,"stop",1,1,0x5d
+button,1,transport,"play",1,1,0x5e
+button,1,transport,"record",1,1,0x5f
+button,1,cursor,"cursor_up",1,0,0x60
+button,1,cursor,"cursor_down",1,0,0x61
+button,1,cursor,"cursor_left",1,0,0x62
+button,1,cursor,"cursor_right",1,0,0x63
+button,1,,"zoom",1,1,0x64
+button,1,,"scrub",1,1,0x65
+button,1,user,"user_a",1,0,0x66
+button,1,user,"user_b",1,0,0x67
+
+button,8,strip,"fader_touch",1,0,0x68
+button,1,master,"fader_touch",1,0,0x70
+
+button,1,,"smpte",0,1,0x71
+button,1,,"beats",0,1,0x72
+button,1,,"solo",0,1,0x73
+button,1,,"relay_click",0,1,0x76
diff --git a/libs/surfaces/mackie/scripts/mackie.rb b/libs/surfaces/mackie/scripts/mackie.rb
new file mode 100644
index 0000000000..4c4080ad10
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/mackie.rb
@@ -0,0 +1,119 @@
+class String
+  def to_bytes
+    arr = []
+    each_byte{|x| arr << x}
+    arr
+  end
+end
+
+class Array
+  def to_hex
+    map{|x| "%2.0x" % x}
+  end
+
+  alias as_hex to_hex
+end
+
+class String
+  def to_b
+    to_i != 0 || %w{true t yes y}.include?( self.downcase )
+  end
+end
+
+class Fixnum
+  def to_hex
+    "%02x" % self
+  end
+end
+
+class Mackie
+  attr_accessor :file
+  
+	def initialize( file )
+		@file = file
+	end
+	
+	# send and receive a sysex message
+  # after wrapping in the header and the eox byte
+	def sysex( msg )
+		puts "Mackie write: #{msg.unpack('C*').to_hex.inspect}"
+		write_sysex( msg )
+		response = read_sysex
+		puts "Mackie response: #{response.to_hex.inspect}"
+		response[5..-1]
+	end
+	
+	# returns an array of bytes
+	def read_sysex
+	  buf = []
+	  while ( nc = @file.read( 1 ) )[0] != 0xf7
+      buf << nc[0]
+	  end
+	  buf
+  end
+  
+	# send and flush a sysex message
+  # after wrapping in the header and the eox byte
+  def write_sysex( msg )
+    @file.write( hdrlc + msg + "\xf7" )
+    @file.flush
+  end
+  
+  def write( msg )
+    @file.write msg
+    @file.flush
+  end
+  
+  def translate_seven_segment( char )
+    case char
+      when 0x40..0x60
+        char - 0x40
+      when 0x21..0x3f
+        char
+      else
+        0x00
+    end
+  end
+  
+  # display the msg (which can be only 2 characters)
+  # append the number of stops. Options are '..', '. ', '. ', '  '
+  def two_char( msg, stops = '  ' )
+    two = Array.new
+    two << translate_seven_segment( msg.upcase[0] )
+    two << translate_seven_segment( msg.upcase[1] )
+    
+    two[0] += 0x40 if stops[0] == '.'[0]
+    two[1] += 0x40 if stops[1] == '.'[0]
+    
+    midi_msg = [0xb0, 0x4a, two[1], 0x4b, two[0] ]
+    write midi_msg.pack( 'C*' )
+  end
+  
+  # send and receive the device initialisation
+  def init
+    response = sysex( "\x00" )
+
+    # decode host connection query
+    status = response[0]
+    raise( "expected 01, got " + response.inspect ) if status != 1
+    
+    serial = response[1..7]
+    challenge = response[8..11]
+
+    # send host connection reply
+    reply = "\x02" + serial.pack('C*') + challenge.pack('C*')
+    response = sysex reply
+
+    # decode host connection confirmation
+    status = response[0]
+    raise ( "expected 03, got " + response.inspect ) if status != 3
+  end
+
+	def hdrlc
+		"\xf0\x00\x00\x66\x10"
+	end
+	
+	def hdrlcxt
+		"\xf0\x00\x00\x66\x11"
+	end
+end
diff --git a/libs/surfaces/mackie/scripts/parse.rb b/libs/surfaces/mackie/scripts/parse.rb
new file mode 100644
index 0000000000..3a225a5756
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/parse.rb
@@ -0,0 +1,61 @@
+#! /usr/bin/ruby
+# Copyright (C) 2006,2007 John Anderson
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+require "rexml/document"
+file = File.new( ARGV[0] )
+doc = REXML::Document.new file
+
+# fetch the node containing the controls
+controls = XPath.first( doc, 'Session/ControlProtocols/Protocol[@name="Generic MIDI"]/controls' )
+
+channel = 1
+
+# A Control is a button or slider. It has an internal ID
+# an incoming MIDI message, and an outgoing midi message
+class Control
+	
+end
+
+# Strips have solo,rec,mute,pan,fader
+# Strips have midi input
+# Strips have midi output
+# Strips have an XML representation, or something like that
+class Strip
+	def initialize( node )
+		@solo = node.elements['solo']
+		@mute = node.elements['mute']
+		@rec = node.elements['recenable']
+		@fader = node.elements['IO/gaincontrol']
+		@panner = node.elements['IO/Panner/StreamPanner/panner']
+	end
+end
+
+# This knows how to extract a set of controls from a Route
+
+doc.elements.each( 'Session/Routes/Route' ) do |node|
+	strip = Strip.new( node )
+	
+   controls.add_element( 'mute',
+		'id' => mute.attribute('id').value,
+		'event' => "0xb0",
+		'channel' => channel.to_s,
+		'additional' => "0x41"
+	)
+
+end
+
+pp controls.elements
diff --git a/libs/surfaces/mackie/scripts/signals.rb b/libs/surfaces/mackie/scripts/signals.rb
new file mode 100644
index 0000000000..8182e562a3
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/signals.rb
@@ -0,0 +1,137 @@
+#~ /usr/bin/ruby
+# Copyright (C) 2006,2007 John Anderson
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+require 'erb'
+
+signals = %w{
+solo_changed
+mute_changed
+record_enable_changed
+gain_changed
+name_changed
+panner_changed
+}
+
+@signal_calls = { 'panner_changed' => 'panner()[0]->Changed' }
+
+def connection_call( x )
+  if @signal_calls.include? x
+    @signal_calls[x]
+  else
+    x
+  end
+end
+
+signals.each do |x|
+	puts <<EOF
+void MackieControlProtocol::notify_#{x}( void *, ARDOUR::Route * route )
+{
+	try
+	{
+		strip_from_route( route ).#{x.gsub( /_changed/, '' )}();
+	}
+	catch( exception & e )
+	{
+		cout << e.what() << endl;
+	}
+}
+
+EOF
+end
+
+class_def = <<EOF
+#ifndef route_signal_h
+#define route_signal_h
+
+#include <sigc++/sigc++.h>
+
+class MackieControlProtocol;
+
+namespace ARDOUR {
+	class Route;
+}
+	
+namespace Mackie
+{
+
+class Strip;
+
+/**
+  This class is intended to easily create and destroy the set of
+  connections from a route to a control surface strip. Instanting
+  it will connect the signals, and destructing it will disconnect
+  the signals.
+*/
+class RouteSignal
+{
+public:
+	RouteSignal( ARDOUR::Route & route, MackieControlProtocol & mcp, Strip & strip )
+	: _route( route ), _mcp( mcp ), _strip( strip )
+	{
+		connect();
+	}
+	
+	~RouteSignal()
+	{
+		disconnect();
+	}
+	
+private:
+	ARDOUR::Route & _route;
+	MackieControlProtocol & _mcp;
+	Strip & _strip;
+	
+<% signals.each do |x| -%>
+	sigc::connection _<%= x %>_connection;
+<% end -%>
+};
+
+}
+
+#endif
+EOF
+
+erb = ERB.new( class_def, 0, ">-" )
+erb.run
+
+impl_def = <<EOF
+#include "route_signal.h"
+
+#include <ardour/route.h>
+#include <ardour/panner.h>
+
+#include "mackie_control_protocol.h"
+
+using namespace Mackie;
+
+void RouteSignal::connect()
+{
+<% signals.each do |x| -%>
+	_<%=x%>_connection = _route.<%=connection_call(x)%>.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_<%=x%> ), &_route ) );
+<% end -%>
+}
+
+void RouteSignal::disconnect()
+{
+<% signals.each do |x| -%>
+  _<%= x %>_connection.disconnect();
+<% end -%>
+}
+EOF
+
+erb = ERB.new( impl_def, 0, ">-" )
+erb.run
diff --git a/libs/surfaces/mackie/scripts/simple_host.rb b/libs/surfaces/mackie/scripts/simple_host.rb
new file mode 100644
index 0000000000..a5c07f2abb
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/simple_host.rb
@@ -0,0 +1,137 @@
+#! /usr/bin/ruby
+# Copyright (C) 2006,2007 John Anderson
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+require 'mackie'
+
+buttons = {}
+pots = {}
+
+while !File.exist? ARGV[0]
+  sleep 0.010
+end
+
+file = File.open( ARGV[0], 'r+' )
+mck = Mackie.new( file )
+
+# faders to minimum. bcf2000 doesn't respond
+mck.write_sysex "\x61"
+
+# all leds off. bcf2000 doesn't respond
+mck.write_sysex "\x62"
+
+# get version. comes back as ASCII bytes
+version = mck.sysex "\x13\x00"
+puts "version: #{version.map{|x| x.chr}}"
+
+# respond to control movements
+while bytes = file.read( 3 )
+  puts "received: %02.x %02.x %02.x" % [ bytes[0], bytes[1], bytes[2] ]
+  output = nil
+  case bytes[0] & 0b11110000
+  when 0xe0
+    # fader moved, so respond if move is OK
+    output = bytes
+  when 0x90
+    # button pressed
+    case bytes[1]
+    when 0x68..0x6f
+      # do nothing - touch detection
+      puts "touch detect: %02.x" % bytes[2]
+    else
+      # treat all buttons as toggles
+      button_id = bytes[1]
+      
+      # only toggle on release. Not working. All buttons send press
+      # and then release signals
+      if bytes[2] == 0
+        if buttons.include?( button_id )
+          # toggle button state
+          puts "button id #{buttons[button_id]} to #{!buttons[button_id]}"
+          buttons[button_id] = !buttons[button_id]
+        else
+          # create a new button as on
+          puts "adding button id #{button_id}"
+          buttons[button_id] = true
+        end
+        bytes[2] = buttons[button_id] ? 0x7f : 0
+        output = bytes
+      end
+    end
+  when 0xb0
+    # pots, jog wheel, external
+    case bytes[1]
+    when 0x10..0x17
+      #pot turned
+      pot_id = bytes[1] & 0b00000111
+      direction = bytes[2] & 0b01000000
+      delta = bytes[2] & 0b00111111
+      sign = direction == 0 ? 1 : -1
+      
+      if pots.include? pot_id
+        current_led_pos = pots[pot_id]
+      else
+        current_led_pos = pots[pot_id] = 6
+      end
+      new_led_pos = current_led_pos + sign
+      new_led_pos = case
+        when new_led_pos <= 0
+          0
+        when new_led_pos >= 11
+          11
+        else
+          new_led_pos
+      end
+        
+      pots[pot_id] = new_led_pos
+      
+      puts "pot #{pot_id} turned #{sign} #{direction == 0 ? 'clockwise' : 'widdershins'}: %02.x to #{new_led_pos}" % delta
+      
+      output = bytes
+      output[1] += 0x20
+      output[2] = 0b01000000
+      #~ modes:
+      #~ 0 - single dot
+      #~ 1 - boost/cut
+      #~ 2 - wrap
+      #~ 3 - spread
+      mode = pot_id < 4 ? pot_id : 0
+      output[2] |= ( mode << 4 )
+      output[2] += ( new_led_pos ) & 0b00001111
+    when 0x2e
+      # external controller
+    when 0x3c
+      # jog wheel
+    end
+  else
+    puts "don't know what this means"
+  end
+  
+  # output bytes
+  if output
+    #sleep 0.1
+    puts "sending: %02.x %02.x %02.x" % [ output[0], output[1], output[2] ]
+    begin
+      res = file.write output
+      puts "res: #{res}"
+      file.flush
+    rescue => e
+      puts "oops #{e}"
+      file.close
+      file = File.open ARGV[0], 'r+'
+    end
+  end
+end
diff --git a/libs/surfaces/mackie/scripts/surface-cc-template.erb b/libs/surfaces/mackie/scripts/surface-cc-template.erb
new file mode 100644
index 0000000000..3b29be3249
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/surface-cc-template.erb
@@ -0,0 +1,95 @@
+<%#
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-%>
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "<%= sf.name.downcase %>_surface.h"
+
+#include "controls.h"
+#include "mackie_button_handler.h"
+
+using namespace Mackie;
+
+void Mackie::<%= sf.name %>Surface::init_controls()
+{
+	// intialise groups and strips
+	Group * group = 0;
+	
+	// make sure there are enough strips
+	strips.resize( <%= sf.groups.values.find_all{|x| x.name =~ /strip/}.size %> );
+	
+% sf.groups.values.each do |group|
+	<%- if group.class == Strip -%>
+		<%- if group.name == 'master' -%>
+	group = new MasterStrip ( "<%=group.name%>", 0 );
+		<%- else -%>
+	group = new <%= group.class.name %> ( "<%=group.name%>", <%=group.ordinal - 1%> );
+		<%- end -%>
+	<%- else -%>
+	group = new <%= group.class.name %> ( "<%=group.name%>" );
+	<%- end -%>
+	groups["<%=group.name%>"] = group;
+	<%- if group.class == Strip -%>
+	strips[<%=group.ordinal - 1%>] = dynamic_cast<Strip*>( group );
+	<%- end -%>
+	
+% end
+
+	// initialise controls
+	Control * control = 0;
+
+% sf.controls.each do |control|
+	group = groups["<%=control.group.name%>"];
+	control = new <%= control.class.name %> ( <%= control.id %>, <%= control.ordinal %>, "<%=control.name%>", *group );
+	<%=control.class.name.downcase%>s[0x<%=control.id.to_hex %>] = control;
+	controls.push_back( control );
+	<%- if control.group.class != Strip -%>
+	controls_by_name["<%= control.name %>"] = control;
+	<%- end -%>
+	group->add( *control );
+
+% end
+}
+
+void Mackie::<%= sf.name %>Surface::handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button )
+{
+	if ( bs != press && bs != release )
+	{
+		mbh.update_led( button, none );
+		return;
+	}
+	
+	LedState ls;
+	switch ( button.id() )
+	{
+<%-
+buttons = sf.controls.find_all{|x| x.class == Button && x.group.class != Strip}
+buttons.each do |button|
+%>
+		case 0x<%= button.id.to_hex %>: // <%= button.name %>
+			switch ( bs ) {
+				case press: ls = mbh.<%= button.name %>_press( button ); break;
+				case release: ls = mbh.<%= button.name %>_release( button ); break;
+				case neither: break;
+			}
+			break;
+<% end %>
+	}
+	mbh.update_led( button, ls );
+}
diff --git a/libs/surfaces/mackie/scripts/surface-h-template.erb b/libs/surfaces/mackie/scripts/surface-h-template.erb
new file mode 100644
index 0000000000..2f54f66c47
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/surface-h-template.erb
@@ -0,0 +1,27 @@
+#ifndef mackie_surface_<%= sf.name.downcase %>_h
+#define mackie_surface_<%= sf.name.downcase %>_h
+/*
+	Generated by scripts/generate-surface.rb
+*/
+
+#include "surface.h"
+
+namespace Mackie
+{
+
+class MackieButtonHandler;
+
+class <%= sf.name %>Surface : public Surface
+{
+public:
+	<%= sf.name %>Surface( uint32_t max_strips ) : Surface( max_strips )
+	{
+	}
+	
+	virtual void handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button );
+	virtual void init_controls();
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/scripts/test_controls.rb b/libs/surfaces/mackie/scripts/test_controls.rb
new file mode 100755
index 0000000000..782b0d427c
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/test_controls.rb
@@ -0,0 +1,9 @@
+#! /usr/bin/ruby
+
+require 'controls.rb'
+require 'pp'
+
+sf = Surface.new
+sf.parse
+sf.types.each{|k,v| puts "%02.x #{v}" % k}
+
diff --git a/libs/surfaces/mackie/scripts/transform.rb b/libs/surfaces/mackie/scripts/transform.rb
new file mode 100644
index 0000000000..e0221e188b
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/transform.rb
@@ -0,0 +1,26 @@
+class ElementHandler
+
+	def apply( anElement )
+		anElement.each {|e| handle(e)} if anElement
+	end
+
+	def handle( aNode )
+		if aNode.kind_of? REXML::Text
+			handleTextNode(aNode) 
+		elsif aNode.kind_of? REXML::Element
+			handle_element aNode  
+		else
+			return #ignore comments and processing instructions
+		end
+	end
+  
+	def handle_element( anElement )
+		handler_method = "handle_" + anElement.name.tr("-","_")
+		if self.respond_to? handler_method
+			self.send(handler_method, anElement)
+		else
+			default_handler(anElement)  
+		end
+	end
+
+end
diff --git a/libs/surfaces/mackie/scripts/write.rb b/libs/surfaces/mackie/scripts/write.rb
new file mode 100644
index 0000000000..20b72477e8
--- /dev/null
+++ b/libs/surfaces/mackie/scripts/write.rb
@@ -0,0 +1,10 @@
+#! /usr/bin/ruby
+
+require 'mackie.rb'
+
+@file = File.open '/dev/snd/midiC2D0', 'r+'
+
+@led_8_on = [ 0x90, 0x18, 0x7f ]
+@hci = [ 0, 0xf7 ]
+@version_req = [ 0x13, 0, 0xf7 ]
+
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
new file mode 100644
index 0000000000..01be2c60c2
--- /dev/null
+++ b/libs/surfaces/mackie/surface.cc
@@ -0,0 +1,142 @@
+#include "surface.h"
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+
+using namespace std;
+using namespace Mackie;
+
+Surface::Surface( uint32_t max_strips, uint32_t unit_strips )
+: _max_strips( max_strips ), _unit_strips( unit_strips )
+{
+}
+
+void Surface::init()
+{
+	init_controls();
+	init_strips( _max_strips, _unit_strips );
+}
+
+Surface::~Surface()
+{
+	// delete groups
+	for( Groups::iterator it = groups.begin(); it != groups.end(); ++it )
+	{
+		delete it->second;
+	}
+	
+	// delete controls
+	for( Controls::iterator it = controls.begin(); it != controls.end(); ++it )
+	{
+		delete *it;
+	}
+}
+
+// Mackie-specific, because of multiple devices on separate ports
+// add the strips from 9..max_strips
+// unit_strips is the number of strips for additional units.
+void Surface::init_strips( uint32_t max_strips, uint32_t unit_strips )
+{
+	if ( strips.size() < max_strips )
+	{
+		strips.resize( max_strips );
+		for ( uint32_t i = strips.size(); i < max_strips; ++i )
+		{
+			// because I can't find itoa
+			ostringstream os;
+			os << "strip_" << i + 1;
+			string name = os.str();
+			
+			// shallow copy existing strip
+			// which works because the controls
+			// have the same ids across units
+			Strip * strip = new Strip( *strips[i % unit_strips] );
+			
+			// update the relevant values
+			strip->index( i );
+			strip->name( name );
+			
+			// add to data structures
+			groups[name] = strip;
+			strips[i] = strip;
+		}
+	}
+}
+
+ostream & Mackie::operator << ( ostream & os, const Mackie::Control & control )
+{
+	os << typeid( control ).name();
+	os << " { ";
+	os << "name: " << control.name();
+	os << ", ";
+	os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' ');
+	os << ", ";
+	os << "ordinal: " << dec << control.ordinal();
+	os << ", ";
+	os << "group: " << control.group().name();
+	os << " }";
+	
+	return os;
+}
+
+/**
+	TODO could optimise this to use enum, but it's only
+	called during the protocol class instantiation.
+
+	generated using
+
+	irb -r controls.rb
+	sf=Surface.new
+	sf.parse
+	controls = sf.groups.find{|x| x[0] =~ /strip/}.each{|x| puts x[1]}
+	controls[1].each {|x| puts "\telse if ( control.name() == \"#{x.name}\" )\n\t{\n\t\t_#{x.name} = reinterpret_cast<#{x.class.name}*>(&control);\n\t}\n"}
+*/
+void Strip::add( Control & control )
+{
+	Group::add( control );
+	if ( control.name() == "gain" )
+	{
+		_gain = reinterpret_cast<Fader*>(&control);
+	}
+	else if ( control.name() == "vpot" )
+	{
+		_vpot = reinterpret_cast<Pot*>(&control);
+	}
+	else if ( control.name() == "recenable" )
+	{
+		_recenable = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.name() == "solo" )
+	{
+		_solo = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.name() == "mute" )
+	{
+		_mute = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.name() == "select" )
+	{
+		_select = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.name() == "vselect" )
+	{
+		_vselect = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.name() == "fader_touch" )
+	{
+		_fader_touch = reinterpret_cast<Button*>(&control);
+	}
+	else if ( control.type() == Control::type_led || control.type() == Control::type_led_ring )
+	{
+		// do nothing
+		cout << "Strip::add not adding " << control << endl;
+	}
+	else
+	{
+		ostringstream os;
+		os << "Strip::add: unknown control type " << control;
+		throw MackieControlException( os.str() );
+	}
+}
+
diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
new file mode 100644
index 0000000000..0ccde75537
--- /dev/null
+++ b/libs/surfaces/mackie/surface.h
@@ -0,0 +1,94 @@
+#ifndef mackie_surface_h
+#define mackie_surface_h
+
+#include "controls.h"
+#include "types.h"
+#include <stdint.h>
+
+namespace Mackie
+{
+
+class MackieButtonHandler;
+
+/**
+	This represents an entire control surface, made up of Groups,
+	Strips and Controls. There are several collections for
+	ease of addressing in different ways, but only one collection
+	has definitive ownership.
+
+	It handles mapping button ids to press_ and release_ calls.
+
+	There are various emulations of the Mackie around, so specific
+	emulations will inherit from this to change button mapping, or 
+	have 7 fader channels instead of 8, or whatever.
+
+	Currently there are BcfSurface and MackieSurface.
+
+	TODO maybe make Group inherit from Control, for ease of ownership.
+*/
+class Surface
+{
+public:
+	/**
+		A Surface can be made up of multiple units. eg one Mackie MCU plus
+		one or more Mackie MCU extenders.
+		
+		\param max_strips is the number of strips for the entire surface.
+		\param unit_strips is the number of strips per unit.
+	*/
+	Surface( uint32_t max_strips, uint32_t unit_strips = 8 );
+	virtual ~Surface();
+
+	/// Calls the virtual initialisation methods. This *must* be called after
+	/// construction, because c++ is too dumb to call virtual methods from
+	/// inside a constructor
+	void init();
+
+	typedef std::vector<Control*> Controls;
+	
+	/// This collection has ownership of all the controls
+	Controls controls;
+
+	/**
+		These are alternative addressing schemes
+		They use maps because the indices aren't always
+		0-based.
+	*/
+	std::map<int,Control*> faders;
+	std::map<int,Control*> pots;
+	std::map<int,Control*> buttons;
+	std::map<int,Control*> leds;
+
+	/// no strip controls in here because they usually
+	/// have the same names.
+	std::map<std::string,Control*> controls_by_name;
+
+	/// The collection of all numbered strips. No master
+	/// strip in here.
+	typedef std::vector<Strip*> Strips;
+	Strips strips;
+
+	/// This collection owns the groups
+	typedef std::map<std::string,Group*> Groups;
+	Groups groups;
+
+	uint32_t max_strips() const
+	{
+		return _max_strips;
+	}
+	
+	/// map button ids to calls to press_ and release_ in mbh
+	virtual void handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button ) = 0;
+	
+protected:
+	virtual void init_controls() = 0;
+	virtual void init_strips( uint32_t max_strips, uint32_t unit_strips );
+
+private:
+	uint32_t _max_strips;
+	uint32_t _unit_strips;
+};
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
new file mode 100644
index 0000000000..cc5c5cf134
--- /dev/null
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -0,0 +1,175 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "surface_port.h"
+
+#include "mackie_control_exception.h"
+#include "controls.h"
+
+#include <midi++/types.h>
+#include <midi++/port.h>
+#include <sigc++/sigc++.h>
+#include <boost/shared_array.hpp>
+
+#include "i18n.h"
+
+#include <sstream>
+
+#include <cstring>
+#include <cerrno>
+
+using namespace std;
+using namespace Mackie;
+
+SurfacePort::SurfacePort( MIDI::Port & port, int number )
+: _port( port ), _number( number ), _active( false )
+{
+}
+
+SurfacePort::~SurfacePort()
+{
+	//cout << "~SurfacePort::SurfacePort()" << endl;
+	// make sure another thread isn't reading or writing as we close the port
+	Glib::RecMutex::Lock lock( _rwlock );
+	_active = false;
+	//cout << "~SurfacePort::SurfacePort() finished" << endl;
+}
+
+// wrapper for one day when strerror_r is working properly
+string fetch_errmsg( int error_number )
+{
+	char * msg = strerror( error_number );
+	return msg;
+}
+	
+MidiByteArray SurfacePort::read()
+{
+	const int max_buf_size = 512;
+	MIDI::byte buf[max_buf_size];
+	MidiByteArray retval;
+
+	// check active. Mainly so that the destructor
+	// doesn't destroy the mutex while it's still locked
+	if ( !active() ) return retval;
+	
+	// return nothing read if the lock isn't acquired
+	Glib::RecMutex::Lock lock( _rwlock, Glib::TRY_LOCK );
+		
+	if ( !lock.locked() )
+	{
+		//cout << "SurfacePort::read not locked" << endl;
+		return retval;
+	}
+	
+	// check active again - destructor sequence
+	if ( !active() ) return retval;
+	
+	// read port and copy to return value
+	int nread = port().read (buf, sizeof (buf));
+
+	if (nread >= 0) {
+		retval.copy( nread, buf );
+		if ((size_t) nread == sizeof (buf))
+		{
+			retval << read();
+		}
+	}
+	else
+	{
+		if ( errno != EAGAIN )
+		{
+			ostringstream os;
+			os << "Surface: error reading from port: " << port().name();
+			os << ": " << errno << fetch_errmsg( errno );
+
+			cout << os.str() << endl;
+			inactive_event();
+			throw MackieControlException( os.str() );
+		}
+	}
+	return retval;
+}
+
+void SurfacePort::write( const MidiByteArray & mba )
+{
+	//if ( mba[0] == 0xf0 ) cout << "SurfacePort::write: " << mba << endl;
+	//cout << "SurfacePort::write: " << mba << endl;
+	
+	// check active before and after lock - to make sure
+	// that the destructor doesn't destroy the mutex while
+	// it's still in use
+	if ( !active() ) return;
+	Glib::RecMutex::Lock lock( _rwlock );
+	if ( !active() ) return;
+
+	int count = port().write( mba.bytes().get(), mba.size(), 0 );
+	if ( count != (int)mba.size() )
+	{
+		if ( errno != EAGAIN )
+		{
+			ostringstream os;
+			os << "Surface: couldn't write to port " << port().name();
+			os << ": " << errno << fetch_errmsg( errno );
+			
+			cout << os.str();
+			inactive_event();
+			throw MackieControlException( os.str() );
+		}
+	}
+	//if ( mba[0] == 0xf0 ) cout << "SurfacePort::write " << count << endl;
+}
+
+void SurfacePort::write_sysex( const MidiByteArray & mba )
+{
+	MidiByteArray buf;
+	buf << sysex_hdr() << mba << MIDI::eox;
+	write( buf );
+}
+
+void SurfacePort::write_sysex( MIDI::byte msg )
+{
+	MidiByteArray buf;
+	buf << sysex_hdr() << msg << MIDI::eox;
+	write( buf );
+}
+
+// This should be moved to midi++ at some point
+ostream & operator << ( ostream & os, const MIDI::Port & port )
+{
+	os << "device: " << port.device();
+	os << "; ";
+	os << "name: " << port.name();
+	os << "; ";
+	os << "type: " << port.type();
+	os << "; ";
+	os << "mode: " << port.mode();
+	os << "; ";
+	os << "ok: " << port.ok();
+	os << "; ";
+	return os;
+}
+
+ostream & Mackie::operator << ( ostream & os, const SurfacePort & port )
+{
+	os << "{ ";
+	os << "device: " << port.port().device();
+	os << "; ";
+	os << "name: " << port.port().name();
+	os << "; ";
+	os << " }";
+	return os;
+}
diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
new file mode 100644
index 0000000000..87419f1bcd
--- /dev/null
+++ b/libs/surfaces/mackie/surface_port.h
@@ -0,0 +1,100 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef surface_port_h
+#define surface_port_h
+
+#include <sigc++/signal.h>
+#include <glibmm/thread.h>
+
+#include "midi_byte_array.h"
+#include "types.h"
+
+namespace MIDI {
+	class Port;
+}
+
+namespace Mackie
+{
+
+/**
+	Make a relationship between a midi port and a Mackie device.
+*/
+class SurfacePort : public sigc::trackable
+{
+public:
+	SurfacePort( MIDI::Port & port, int number );
+	virtual ~SurfacePort();
+	
+	// when this is successful, active() should return true
+	virtual void open() = 0;
+	
+	// subclasses should call this before doing their own close
+	virtual void close() = 0;
+
+	/// read bytes from the port. They'll either end up in the
+	/// parser, or if that's not active they'll be returned
+	MidiByteArray read();
+	
+	/// an easier way to output bytes via midi
+	void write( const MidiByteArray & );
+	
+	/// write a sysex message
+	void write_sysex( const MidiByteArray & mba );
+	void write_sysex( MIDI::byte msg );
+
+	// return the correct sysex header for this port
+	virtual const MidiByteArray & sysex_hdr() const = 0;
+
+	MIDI::Port & port() { return _port; }
+	const MIDI::Port & port() const { return _port; }
+	
+	// all control notofications are sent from here
+	sigc::signal<void, SurfacePort &, Control &, const ControlState &> control_event;
+	
+	// emitted just before the port goes into initialisation
+	// where it tries to establish that its device is connected
+	sigc::signal<void> init_event;
+	
+	// emitted when the port completes initialisation successfully
+	sigc::signal<void> active_event;
+
+	// emitted when the port goes inactive (ie a read or write failed)
+	sigc::signal<void> inactive_event;
+	
+	// the port number - master is 0, extenders are 1,2,3,4
+	virtual int number() const { return _number; }
+	
+	// number of strips handled by this port. Usually 8.
+	virtual int strips() const = 0;
+
+	virtual bool active() const { return _active; }
+	virtual void active( bool yn ) { _active = yn; }
+	
+private:
+	MIDI::Port & _port;
+	int _number;
+	bool _active;
+
+	Glib::RecMutex _rwlock;
+};	
+
+std::ostream & operator << ( std::ostream & , const SurfacePort & port );
+
+}
+
+#endif
diff --git a/libs/surfaces/mackie/test.cc b/libs/surfaces/mackie/test.cc
new file mode 100644
index 0000000000..351058523f
--- /dev/null
+++ b/libs/surfaces/mackie/test.cc
@@ -0,0 +1,25 @@
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <algorithm>
+#include <cstdarg>
+#include <iomanip>
+
+#include "midi_byte_array.h"
+
+using namespace std;
+
+namespace MIDI {
+	typedef unsigned char byte;
+	byte sysex = 0xf0;
+	byte eox = 0xf7;
+}
+
+int main()
+{
+	MidiByteArray bytes( 4, 0xf0, 0x01, 0x03, 0x7f );
+	cout << bytes << endl;
+	return 0;
+}
+
diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc
new file mode 100644
index 0000000000..d2818d7340
--- /dev/null
+++ b/libs/surfaces/mackie/types.cc
@@ -0,0 +1,9 @@
+#include "types.h"
+
+namespace Mackie
+{
+	LedState on( LedState::on );
+	LedState off( LedState::off );
+	LedState flashing( LedState::flashing );
+	LedState none( LedState::none );
+}
diff --git a/libs/surfaces/mackie/types.h b/libs/surfaces/mackie/types.h
new file mode 100644
index 0000000000..2b47e15640
--- /dev/null
+++ b/libs/surfaces/mackie/types.h
@@ -0,0 +1,93 @@
+/*
+	Copyright (C) 2006,2007 John Anderson
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef mackie_types_h
+#define mackie_types_h
+
+namespace Mackie
+{
+
+/**
+	This started off as an enum, but it got really annoying
+	typing ? on : off
+*/
+class LedState
+{
+public:
+	enum state_t { none, off, flashing, on };
+	LedState()  : _state( none ) {}
+	LedState( bool yn ): _state( yn ? on : off ) {}
+	LedState( state_t state ): _state( state ) {}
+
+	bool operator == ( const LedState & other ) const
+	{
+		return state() == other.state();
+	}
+	
+	bool operator != ( const LedState & other ) const
+	{
+		return state() != other.state();
+	}
+	
+	state_t state() const { return _state; }
+	
+private:
+	state_t _state;
+};
+
+extern LedState on;
+extern LedState off;
+extern LedState flashing;
+extern LedState none;
+
+enum ButtonState { neither = -1, release = 0, press = 1 };
+
+/**
+	Contains the state for a control, with some convenience
+	constructors
+*/
+struct ControlState
+{
+	ControlState(): pos(0.0), delta(0.0), button_state(neither) {}
+	
+	ControlState( LedState ls ): pos(0.0), delta(0.0), led_state(ls), button_state(neither) {}
+	
+	// Note that this sets both pos and delta to the flt value
+	ControlState( LedState ls, float flt ): pos(flt), delta(flt), ticks(0), led_state(ls), button_state(neither) {}
+	ControlState( float flt ): pos(flt), delta(flt), ticks(0), led_state(none), button_state(neither) {}
+	ControlState( float flt, int tcks ): pos(flt), delta(flt), ticks(tcks), led_state(none), button_state(neither) {}
+	ControlState( ButtonState bs ): pos(0.0), delta(0.0), ticks(0), led_state(none), button_state(bs) {}
+	
+	float pos;
+	float delta;
+	int ticks;
+	LedState led_state;
+	ButtonState button_state;
+};
+
+class Control;
+class Fader;
+class Button;
+class Strip;
+class Group;
+class Pot;
+class Led;
+class LedRing;
+
+}
+
+#endif
diff --git a/libs/surfaces/powermate/README b/libs/surfaces/powermate/README
new file mode 100644
index 0000000000..d786b1d898
--- /dev/null
+++ b/libs/surfaces/powermate/README
@@ -0,0 +1,21 @@
+
+This module works with the Griffin Powermate and allows some basic transport control.
+
+It autodetects the Powermate on any input device of the form "/dev/input/event*".  This means you must have the powermate module in your kernel.  It works out-of-the-box with 64Studio and presumably lots of other modern distributions.
+
+Turning the wheel left and right will act as a "Shuttle" wheel, adjusting playback speed up and down
+Pushing the knob will switch between play and stop
+Pushing the knob while turning will jump to the next or previous markers
+
+
+In order for the powermate to work, you have to have permission to open the input device for reading.
+In debian, I changed /etc/udev/rules.d/0_permissions.rules to have the line:
+KERNEL=="event[0-9]*", 		MODE="0666"
+but there are other ways to achieve this
+
+
+Feedback, tweaks, bug fixes and feature ideas are encouraged
+
+-Ben Loftis, ben@benloftis.com
+
+ 
\ No newline at end of file
diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript
new file mode 100644
index 0000000000..504edc6031
--- /dev/null
+++ b/libs/surfaces/powermate/SConscript
@@ -0,0 +1,59 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+powermate = env.Copy()
+
+#
+# this defines the version number of powermate
+# 
+
+domain = 'ardour_powermate'
+
+powermate.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+powermate.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+powermate.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+powermate.Append(PACKAGE = domain)
+powermate.Append(POTFILE = domain + '.pot')
+
+powermate_files=Split("""
+interface.cc
+powermate.cc
+""")
+
+powermate.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+powermate.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+powermate.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+powermate.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+
+powermate.Merge ([
+    libraries['ardour'],
+    libraries['ardour_cp'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
+    ])
+
+libardour_powermate = powermate.SharedLibrary('ardour_powermate', powermate_files)
+
+if env['POWERMATE']:
+	Default(libardour_powermate)
+
+	if env['NLS']:
+		i18n (powermate, powermate_files, env)
+	      
+	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_powermate))
+
+	env.Alias('tarball', env.Distribute (env['DISTTREE'],
+					     [ 'SConscript' ] +
+					     powermate_files + 
+					     glob.glob('po/*.po') + glob.glob('*.h')))
+
diff --git a/libs/surfaces/powermate/interface.cc b/libs/surfaces/powermate/interface.cc
new file mode 100644
index 0000000000..6012c064d8
--- /dev/null
+++ b/libs/surfaces/powermate/interface.cc
@@ -0,0 +1,57 @@
+/*
+	Ardour9pin interface file
+	Ben Loftis
+	Created: 05/18/06 11:07:56
+	Copyright Harrison Audio, LLC, 2007
+*/
+
+#include "powermate.h"
+
+using namespace ARDOUR;
+
+ControlProtocol*
+new_powermate_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+{
+	PowermateControlProtocol* pcp = new PowermateControlProtocol (*s);
+
+	if (pcp->set_active (true)) {
+		delete pcp;
+		return 0;
+	}
+
+	return pcp;
+	
+}
+
+void
+delete_powermate_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+{
+	delete cp;
+}
+
+bool
+probe_powermate_protocol (ControlProtocolDescriptor* descriptor)
+{
+	return PowermateControlProtocol::probe ();
+}
+
+static ControlProtocolDescriptor powermate_descriptor = {
+	name : "powermate",
+	id : "uri://ardour.org/ardour/powermate:0",
+	ptr : 0,
+	module : 0,
+	mandatory : 0,
+	supports_feedback : false,
+	probe : probe_powermate_protocol,
+	initialize : new_powermate_protocol,
+	destroy : delete_powermate_protocol
+};
+	
+
+extern "C" {
+ControlProtocolDescriptor* 
+protocol_descriptor () {
+	return &powermate_descriptor;
+}
+}
+
diff --git a/libs/surfaces/powermate/powermate.cc b/libs/surfaces/powermate/powermate.cc
new file mode 100644
index 0000000000..8b3051af20
--- /dev/null
+++ b/libs/surfaces/powermate/powermate.cc
@@ -0,0 +1,243 @@
+/*
+	powermate.cc
+	Ben Loftis
+	Created: 03/26/07 20:07:56
+*/
+
+
+#include <linux/input.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <i18n.h>
+#include <pbd/xml++.h>
+#include <pbd/error.h>
+#include <glibmm.h>
+
+#include "powermate.h"
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#define NUM_VALID_PREFIXES 2
+
+static const char *valid_prefix[NUM_VALID_PREFIXES] = {
+  "Griffin PowerMate",
+  "Griffin SoundKnob"
+};
+
+#define NUM_EVENT_DEVICES 16
+
+int open_powermate(const char *dev, int mode)
+{
+	if (!Glib::file_test (dev, Glib::FILE_TEST_EXISTS)) {
+		return -1;
+	}
+	int fd = open(dev, mode);
+	int i;
+	char name[255];
+	
+	if(fd < 0){
+		if (errno != EACCES) {
+			error << string_compose ("Unable to open \"%1\": %2", dev, strerror(errno)) << endmsg;
+		}
+		return -1;
+	}
+
+  if(ioctl(fd, EVIOCGNAME(sizeof(name)), name) < 0){
+    error << string_compose ("\"%1\": EVIOCGNAME failed: %2", dev, strerror(errno)) << endmsg;
+    close(fd);
+    return -1;
+  }
+
+  // it's the correct device if the prefix matches what we expect it to be:
+  for(i=0; i<NUM_VALID_PREFIXES; i++)
+    if(!strncasecmp(name, valid_prefix[i], strlen(valid_prefix[i])))
+      return fd;
+
+  close(fd);
+  return -1;
+}
+
+int find_powermate(int mode)
+{
+  char devname[256];
+  int i, r;
+
+  for(i=0; i<NUM_EVENT_DEVICES; i++){
+    sprintf(devname, "/dev/input/event%d", i);
+    r = open_powermate(devname, mode);
+    if(r >= 0)
+      return r;
+  }
+
+  return -1;
+}
+
+PowermateControlProtocol::PowermateControlProtocol (Session& s)
+	: ControlProtocol  (s, "powermate")
+{
+}
+
+PowermateControlProtocol::~PowermateControlProtocol ()
+{
+	set_active (false);
+}
+
+bool
+PowermateControlProtocol::probe ()
+{
+	int port = find_powermate( O_RDONLY ); 
+
+	if (port < 0) {
+ 		printf ("powermate: Opening of powermate failed - %s\n", strerror(errno));
+		close (port);
+		return false;
+	}
+
+	close (port);
+	return true;
+}
+
+int
+PowermateControlProtocol::set_active (bool inActivate)
+{
+	if (inActivate != _active) {
+
+		if (inActivate) {
+
+			mPort = find_powermate(O_RDONLY);
+			
+			if ( mPort < 0 ) {
+				return -1;
+			}
+			
+			if (pthread_create (&mThread, 0, SerialThreadEntry, this) == 0) {
+				_active = true;
+			} else {
+				return -1;
+			}
+
+			printf("Powermate Control Protocol activated\n");
+
+		} else {
+			pthread_cancel (mThread);
+			close (mPort);
+			_active = false;
+			printf("Powermate Control Protocol deactivated\n");
+		} 
+	}
+
+	return 0;
+}
+
+XMLNode&
+PowermateControlProtocol::get_state () 
+{
+	XMLNode* node = new XMLNode (X_("Protocol"));
+	node->add_property (X_("name"), _name);
+	return *node;
+}
+
+int
+PowermateControlProtocol::set_state (const XMLNode& node)
+{
+	return 0;
+}
+
+
+void*
+PowermateControlProtocol::SerialThreadEntry (void* arg)
+{
+	return static_cast<PowermateControlProtocol*>(arg)->SerialThread ();
+}
+
+#define BUFFER_SIZE 32
+
+bool held = false;
+bool skippingMarkers = false;
+
+void
+PowermateControlProtocol::ProcessEvent(struct input_event *ev)
+{
+#ifdef VERBOSE
+  fprintf(stderr, "type=0x%04x, code=0x%04x, value=%d\n",
+	  ev->type, ev->code, (int)ev->value);
+#endif
+
+  switch(ev->type){
+  case EV_MSC:
+    printf("The LED pulse settings were changed; code=0x%04x, value=0x%08x\n", ev->code, ev->value);
+    break;
+  case EV_REL:
+    if(ev->code != REL_DIAL)
+      fprintf(stderr, "Warning: unexpected rotation event; ev->code = 0x%04x\n", ev->code);
+    else{
+    	if (held) {
+		//click and hold to skip forward and back by markers
+    		skippingMarkers = true;;
+		if (ev->value > 0)
+    			next_marker();
+		else
+			prev_marker();
+    	} else {
+		//scale the range so that we can go from +/-8x within 180 degrees, with less precision at the higher speeds 
+    		float speed = get_transport_speed();
+    	 	speed += (float)ev->value * 0.05;
+		if (speed > 1.5 || speed < -1.5 )
+			speed += ev->value;
+		set_transport_speed( speed );
+    	}
+    }
+    break;
+  case EV_KEY:
+    if(ev->code != BTN_0)
+      fprintf(stderr, "Warning: unexpected key event; ev->code = 0x%04x\n", ev->code);
+    else
+      if (ev->value)
+		held = true;
+      else {
+		held = false;
+		if (skippingMarkers) {
+			skippingMarkers = false;
+		} else {
+			if (get_transport_speed() == 0.0) {
+				set_transport_speed(1.0);
+			} else {
+				set_transport_speed(0.0);
+			}
+		}
+	}
+    break;
+  }
+
+  fflush(stdout);
+}
+
+void*
+PowermateControlProtocol::SerialThread ()
+{
+  struct input_event ibuffer[BUFFER_SIZE];
+  int r, events, i;
+
+  while(1){
+    r = read(mPort, ibuffer, sizeof(struct input_event) * BUFFER_SIZE);
+    if( r > 0 ){
+		events = r / sizeof(struct input_event);
+      for(i=0; i<events; i++)
+		ProcessEvent(&ibuffer[i]);
+    }else{
+      fprintf(stderr, "read() failed: %s\n", strerror(errno));
+      return (void*) 0;
+    }
+  }
+
+	return (void*) 0;
+}
+
+
diff --git a/libs/surfaces/powermate/powermate.h b/libs/surfaces/powermate/powermate.h
new file mode 100644
index 0000000000..6b0a2fbbc3
--- /dev/null
+++ b/libs/surfaces/powermate/powermate.h
@@ -0,0 +1,34 @@
+#ifndef ardour_powermate_h
+#define ardour_powermate_h
+
+#include <sys/time.h>
+#include <pthread.h>
+
+#include "control_protocol/control_protocol.h"
+
+class PowermateControlProtocol : public ARDOUR::ControlProtocol
+{
+  public:
+	PowermateControlProtocol (ARDOUR::Session&);
+	virtual ~PowermateControlProtocol();
+
+	int set_active (bool yn);
+	static bool probe ();
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&);
+
+  private:
+	
+	static void* SerialThreadEntry (void* arg);
+	void* SerialThread ();
+	
+	void	ProcessEvent(struct input_event *ev);
+	
+	int			mPort;
+	pthread_t		mThread;
+
+};
+
+
+#endif
diff --git a/libs/surfaces/tranzport/.cvsignore b/libs/surfaces/tranzport/.cvsignore
new file mode 100644
index 0000000000..50700f873e
--- /dev/null
+++ b/libs/surfaces/tranzport/.cvsignore
@@ -0,0 +1,2 @@
+*.os
+*.dylib
diff --git a/libs/surfaces/tranzport/README b/libs/surfaces/tranzport/README
new file mode 100644
index 0000000000..e2d37c84bf
--- /dev/null
+++ b/libs/surfaces/tranzport/README
@@ -0,0 +1,90 @@
+
+I'm putting this here because I don't really have a place to put it, unless I create a web page and have a place to keep the code.
+
+While doing some exaustive testing of my latest code (read - playing a ton of music) I have done some thinking about the ui, and decided that under apparent simplicity should lie complexity.
+
+The "flash" screen idea I am going to drop, and replace it with the idea of a notify area being declared on each screen.
+
+When the unit is idle, these messages will appear in that area statically. When the transport is running, these messages will still appear in that space, which is usually where the meter is. It's actually possible to rapidly flash the area between the competing writers and get a nifty faded effect. (I came across this idea accidentally when I had a pointer overrun)
+
+Also certain things will update on top of each other, whatever was updated 
+last will stay on the screen. This is Pan/Gain primarily.
+
+I need a way to get messages back into the tranzport. Example - I hit Undo, what was undone? Redo, same problem.
+
+I've already found many uses for being able to control more than 1 track at a time, so I think that although I'm *usually* controlling one track at a time, being able to quickly access all tracks would be good.
+
+Example - want to have meters for all tracks running and be able to control the
+db/pan settings of the track I'm on....
+
+What I am going to go with is multifold - but first my design goal: I want to do everything required for a solo musician wielding an instrument to NOT have to touch a keyboard or look at a big screen. When you are wrapped behind a bass, it's difficult to cope with that - but the tranzport is a great alternative.
+
+Most screens will have *4* items on them.
+
+There will be "display views" - which are more informational and bling oriented.
+
+There will be "Track based views"- which basically do track specific things
+
+There will be "interactive views",which basically allow for more input than output. They will do something to highlight the current selection.
+Scroll wheel will select between values for a field. Track Next/Prev will move between fields. I would like to have a "No/Yes" option (hit record for yes? Stop for no?) but I'm still a little vague on that.
+
+Things to do:
+
+A) Hitting "Shift->Spacebar" will switch "views". There are ultimately going to be dozens of views. At present, there are only the "Normal" and "Big Meter" views.
+
+Each view will change somewhat based on the state of the transport. Holding down shift for a second will switch to the "underlying display"....
+
+Here's how the "normal" view looks today in my tree:
+
+VIEW: NORMAL
+
+Play Mode: Stopped
+[Trackname[16]] [gain/pan[4]]
+[Modes[9]] long smpte/bar counter]
+
+Play Mode: Playing > 1.0 speed
+[Trackname[16]] [gain/pan[4]]
+[meter[16]] short smpte/bar counter]
+
+Play Mode: Playing < 1.0
+[Trackname[16]] [gain/pan[4]]
+[meter[9]] long smpte/bar counter]
+
+Play Mode: Recording
+[Trackname[16]] [gain/pan[4]]
+[meter[16]] short smpte/bar counter]
+
+Other views (in order of development priority)
+
+Marker Mode: Edit markers, setup loops and punch in points.
+Config Mode: Load/Save settings, Load/Save project. Set wheel SnapTo
+Loop Mode: Show track, raise layers to top for playback, editing, deletion, loop on and off, etc
+
+It's possible that config mode will have a "MORE" field, or ways to move around the configuration (ffw/Play?)
+
+(the first two are the two modes I most need personally. If you have a suggestion...)
+
+Mastering Mode - display master and current track with meters and panner/db
+Automation Mode - I really don't think I have the pixels for this
+
+(I've already abstracted out the code to do most of these, but it's bling, I'm not going to bother much with it soon)
+
+Quad Meter Mode
+Inverted Meter mode (draws meters backwards)
+Quad Inverted Meter mode (bling, but my car stereo has it, and it's cool)
+10 8 bar meter mode
+5 8 bar meter mode
+
+I haven't written the panner yet, doing the stereo meter killed me.
+
+From a development perspective I'm going to keep revising the code to make it more stable and merely tie the new mode modes to the "bling mode"s until they are ready for prime time. I should be able to put out releases once a week for a while.
+
+A big help would be moving these items into a higher level of abstraction (revising the baseUI class).
+
+In particular, I'd really like "slave" mode. Snapto increment is really important....
+
+Here's an example of something that should be fairly easy to export to the Base::UI subclasses - the current state of the main keyboard's shift key.
+
+That way, when shift is held down for a few seconds on the regular keyboard, I can see what's underneath the current tranzport display mode (I do like big meters) (Also, it's somewhat easier to hit shift on the main keyboard and play on the tranzport or the shuttle wheel, if that's what you are doing).
+
+Should be fairly easy to tap into the gdk event for this but the "right way" to propagate this event into the class is beyond me.
diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
new file mode 100644
index 0000000000..5e14be31d3
--- /dev/null
+++ b/libs/surfaces/tranzport/SConscript
@@ -0,0 +1,82 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+Import('env final_prefix install_prefix final_config_prefix libraries i18n')
+
+tranzport = env.Copy()
+
+#
+# this defines the version number of libardour_tranzport
+# 
+
+domain = 'ardour_tranzport'
+
+tranzport.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
+tranzport.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
+tranzport.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+tranzport.Append(PACKAGE = domain)
+tranzport.Append(POTFILE = domain + '.pot')
+
+tranzport_files=Split("""
+interface.cc
+buttons.cc
+io.cc
+io_usb.cc
+panner.cc
+lights.cc
+screen.cc
+state.cc
+wheel_modes.cc
+button_events.cc
+general.cc
+lcd.cc
+mode.cc
+show.cc
+init.cc
+wheel.cc
+""")
+
+#figure out when to do
+#io_usb.cc
+#io_midi.cc
+#io_kernel.cc
+
+tranzport.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
+tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
+tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+#if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
+#    tranzport.Append(CXXFLAGS="-DHAVE_TRANZPORT_KERNEL_DRIVER=1")
+
+#merge more into tranzport files for the right io lib
+
+tranzport.Merge ([
+    libraries['ardour'],
+    libraries['ardour_cp'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['glib2'],
+    libraries['glibmm2'],
+    libraries['usb'],
+    libraries['sndfile-ardour']
+    ])
+
+libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
+
+if tranzport['TRANZPORT']:
+    Default(libardour_tranzport)
+    if env['NLS']:
+        i18n (tranzport, tranzport_files, env)
+#    if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
+#        tranzport.Merge([ libraries['usb'] ])
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+                     [ 'SConscript' ] +
+                     tranzport_files + 
+                     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/tranzport/TODO b/libs/surfaces/tranzport/TODO
new file mode 100644
index 0000000000..216a5bc9d0
--- /dev/null
+++ b/libs/surfaces/tranzport/TODO
@@ -0,0 +1,6 @@
+BREAK APART DRIVER INTO SIMPLER CHUNKS - done
+GET KERNEL DRIVER WORKING
+GET TRIPLE THREADED DRIVER WORKING
+STABLIZE THE API
+ADOPT SOME CONVENTIONS FROM THE MACKIE
+GET SAVING STATE WORKING
diff --git a/libs/surfaces/tranzport/bling.cc b/libs/surfaces/tranzport/bling.cc
new file mode 100644
index 0000000000..c60b699f3d
--- /dev/null
+++ b/libs/surfaces/tranzport/bling.cc
@@ -0,0 +1,115 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* The Bling class theoretically knows nothing about the device it's blinging 
+   and depends on the overlying implementation to tell it about the format of the
+   device. Maybe this will become a template or people will inherit from it */
+
+/* Bling is where all the bad, bad, marketing driven ideas go */
+
+class bling {
+public:
+	enum BlingMode {
+	        BlingOff = 0,
+	        BlingOn = 1,
+		BlingEnter = 2,
+		BlingExit = 4,
+		// Light Specific Stuff
+	        BlingKit = 8,
+	        BlingRotating = 16,
+	        BlingPairs = 32,
+	        BlingRows = 64,
+		BlingColumns = 128,
+	        BlingFlashAllLights = 256,
+		// Screen Specific Stuff
+		// Slider Specific Stuff
+		BlingSliderMax,
+		BlingSliderMid,
+		BlingSliderMin,
+		// Random stuff
+		BlingRandomLight,
+		BlingRandomSlider,
+		BlingRandomScreen,
+		BlingAllSliders
+	};
+	bling();
+	~bling();
+	set(BlingMode);
+	unset(BlingMode);
+	run();
+	next();
+	prev();
+	msg(string&);
+	scrollmsg(string&);
+
+protected:
+// The as yet undefined "advanced_ui" class provides methods to find out at run time
+// what the heck is what
+	BlingMode blingmode;
+	advancedUI *intf;
+	int last_light;
+// I don't think these actually need to be part of the public definition of the class
+	enter();
+	exit();
+	rotate();
+// etc
+};
+
+// make absolutely sure we have the pointer to the interface
+// something like this
+
+#define BLING_INTFA(a) (intf)? 0:intf->a  
+#define BLING_INTF(a) { if (intf) { intf->a; } else { return 0; } }  
+
+// Should any of these bother to return a status code?
+
+bling::rotate() {
+	BLING_INTF(light(last_light,off));
+	last_light = BLING_INTFA(next_light(last_light));
+	BLING_INTF(light(last_light,on));
+}
+
+bling::enter() {
+}
+
+bling::exit() {
+}
+
+bling::flashall() {
+}
+
+bling::rows() {
+}
+
+bling::columns() {
+}
+
+bling::msg() {
+}
+
+bling::scrollmsg() {
+}
+
+// Based on the current bling mode, do whatever it is you are going to do
+bling::run() {
+	
+}
+
+// etc
diff --git a/libs/surfaces/tranzport/button_events.cc b/libs/surfaces/tranzport/button_events.cc
new file mode 100644
index 0000000000..37c62a6ab7
--- /dev/null
+++ b/libs/surfaces/tranzport/button_events.cc
@@ -0,0 +1,380 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_common.h>
+#include <tranzport_control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+
+
+void
+TranzportControlProtocol::button_event_battery_press (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_battery_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_backlight_press (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_backlight_release (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("backlight released, redrawing (and possibly crashing) display\n");
+#endif
+	if (shifted) {
+		lcd_damage();
+		lcd_clear();
+		last_where += 1; /* force time redisplay */
+		last_track_gain = FLT_MAX;
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackleft_press (bool shifted)
+{
+	prev_track ();
+	// not really the right layer for this
+	if(display_mode == DisplayBigMeter) { 
+		if (route_table[0] != 0) {
+			notify(route_get_name (0).substr (0, 15).c_str());
+		}
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackleft_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackright_press (bool shifted)
+{
+	next_track (); 
+	// not really the right layer for this
+	if(display_mode == DisplayBigMeter) { 
+		if (route_table[0] != 0) {
+			notify(route_get_name (0).substr (0, 15).c_str());
+		}
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackright_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackrec_press (bool shifted)
+{
+	if (shifted) {
+		toggle_all_rec_enables ();
+	} else {
+		route_set_rec_enable (0, !route_get_rec_enable (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackrec_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_trackmute_press (bool shifted)
+{
+	if (shifted) {
+		// Mute ALL? Something useful when a phone call comes in. Mute master?
+	} else {
+		route_set_muted (0, !route_get_muted (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_trackmute_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_tracksolo_press (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("solo pressed\n");
+#endif
+	if (display_mode == DisplayBigMeter) {
+		light_off (LightAnysolo);
+		return;
+	}
+
+	if (shifted) {
+		session->set_all_solo (!session->soloing());
+	} else {
+		route_set_soloed (0, !route_get_soloed (0));
+	}
+}
+
+void
+TranzportControlProtocol::button_event_tracksolo_release (bool shifted)
+{
+#if DEBUG_TRANZPORT
+	printf("solo released\n");
+#endif
+}
+
+void
+TranzportControlProtocol::button_event_undo_press (bool shifted)
+{
+// undohistory->get_state(1);
+//XMLNode&
+//UndoHistory::get_state (uint32_t depth)
+
+	if (shifted) {
+		redo (); // someday flash the screen with what was redone
+		notify("Redone!!");
+	} else {
+		undo (); // someday flash the screen with what was undone
+		notify("Undone!!");
+	}
+}
+
+void
+TranzportControlProtocol::button_event_undo_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_in_press (bool shifted)
+{
+	if (shifted) {
+		toggle_punch_in ();
+	} else {
+		ControlProtocol::ZoomIn (); /* EMIT SIGNAL */
+	}
+}
+
+void
+TranzportControlProtocol::button_event_in_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_out_press (bool shifted)
+{
+	if (shifted) {
+		toggle_punch_out ();
+	} else {
+		ControlProtocol::ZoomOut (); /* EMIT SIGNAL */
+	}
+}
+
+void
+TranzportControlProtocol::button_event_out_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_punch_press (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_punch_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_loop_press (bool shifted)
+{
+	if (shifted) {
+		next_wheel_shift_mode ();
+	} else {
+		loop_toggle ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_loop_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_prev_press (bool shifted)
+{
+	if (shifted) {
+		ControlProtocol::ZoomToSession (); /* EMIT SIGNAL */
+	} else {
+		prev_marker ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_prev_release (bool shifted)
+{
+}
+
+// Note - add_marker should adhere to the snap to setting
+// maybe session->audible_frame does that
+
+void
+TranzportControlProtocol::button_event_add_press (bool shifted)
+{
+	add_marker ();
+}
+
+void
+TranzportControlProtocol::button_event_add_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_next_press (bool shifted)
+{
+	if (shifted) {
+		next_wheel_mode ();
+	} else {
+		next_marker ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_next_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_rewind_press (bool shifted)
+{
+	if (shifted) {
+		goto_start ();
+	} else {
+		rewind ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_rewind_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_fastforward_press (bool shifted)
+{
+	if (shifted) {
+		goto_end ();
+	} else {
+		ffwd ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_fastforward_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_stop_press (bool shifted)
+{
+	if (shifted) {
+		next_display_mode ();
+	} else {
+		transport_stop ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_stop_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_play_press (bool shifted)
+{
+	if (shifted) {
+		set_transport_speed (1.0f);
+	} else {
+		transport_play ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_play_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_record_press (bool shifted)
+{
+	if (shifted) {
+		save_state ();
+	} else {
+		rec_enable_toggle ();
+	}
+}
+
+void
+TranzportControlProtocol::button_event_record_release (bool shifted)
+{
+}
+
+void
+TranzportControlProtocol::button_event_footswitch_press (bool shifted)
+{
+	if (shifted) {
+		next_marker (); // think this through, we could also do punch in
+	} else {
+		prev_marker (); // think this through, we could also do punch in
+	}
+}
+
+void
+TranzportControlProtocol::button_event_footswitch_release (bool shifted)
+{
+	if(session->transport_speed() == 0.0)
+	{
+		transport_play ();
+	}
+}
+
+// Possible new api example
+// tries harder to do the right thing if we somehow missed a button down event
+// which currently happens... a lot.
+
+void button_event_mute (bool pressed, bool shifted)
+{
+	static int was_pressed = 0;
+	if((!pressed && !was_pressed) || pressed) { 
+		was_pressed = 1;
+	} 
+
+	was_pressed = 0;
+}
diff --git a/libs/surfaces/tranzport/button_yn.cc b/libs/surfaces/tranzport/button_yn.cc
new file mode 100644
index 0000000000..04b6ab5668
--- /dev/null
+++ b/libs/surfaces/tranzport/button_yn.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* placeholder for button definitions for user edits like yes/no */
diff --git a/libs/surfaces/tranzport/buttons.cc b/libs/surfaces/tranzport/buttons.cc
new file mode 100644
index 0000000000..df5a88e6d9
--- /dev/null
+++ b/libs/surfaces/tranzport/buttons.cc
@@ -0,0 +1,113 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include "tranzport_control_protocol.h"
+
+#define TRANZPORT_BUTTON_HANDLER(callback, button_arg) if (button_changes & button_arg) { \
+		if (buttonmask & button_arg) {				\
+			callback##_press (buttonmask&ButtonShift); } else { callback##_release (buttonmask&ButtonShift); } }
+
+int
+TranzportControlProtocol::process (uint8_t* buf)
+{
+
+	uint32_t this_button_mask;
+	uint32_t button_changes;
+
+	_device_status = buf[1];
+
+#if DEBUG_TRANZPORT > 10 
+	// Perhaps the device can go offline due to flow control, print command bits to see if we have anything interesting
+	if(_device_status == STATUS_ONLINE) {
+		printf("ONLINE   : %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+		       buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); 
+	}
+	if(_device_status == STATUS_OFFLINE) {
+		printf("OFFLINE  : %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+		       buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); 
+	}
+
+	if(_device_status != STATUS_OK) { return 1; }
+
+#endif
+
+
+	this_button_mask = 0;
+	this_button_mask |= buf[2] << 24;
+	this_button_mask |= buf[3] << 16;
+	this_button_mask |= buf[4] << 8;
+	this_button_mask |= buf[5];
+	_datawheel = buf[6];
+	
+#if DEBUG_TRANZPORT_STATE > 1
+	// Is the state machine incomplete?
+	const unsigned int knownstates = 0x00004000|0x00008000|
+		0x04000000|    0x40000000|    0x00040000|    0x00400000|
+		0x00000400|    0x80000000|    0x02000000|    0x20000000|
+		0x00800000|    0x00080000|    0x00020000|    0x00200000|
+		0x00000200|    0x01000000|    0x10000000|    0x00010000|
+		0x00100000|    0x00000100|    0x08000000|    0x00001000;
+
+	std::bitset<32> bi(knownstates);
+	std::bitset<32> vi(this_button_mask);
+
+	//  if an bi & vi == vi the same - it's a valid set
+
+	if(vi != (bi & vi)) {
+		printf("UNKNOWN STATE: %s also, datawheel= %d\n", vi.to_string().c_str(), _datawheel);
+	}
+#endif
+
+	button_changes = (this_button_mask ^ buttonmask);
+	buttonmask = this_button_mask;
+
+	if (_datawheel) {
+		datawheel ();
+	}
+
+	// SHIFT + STOP + PLAY for bling mode?
+	// if (button_changes & ButtonPlay & ButtonStop) {
+	// bling_mode_toggle();  
+	// } or something like that
+
+	TRANZPORT_BUTTON_HANDLER(button_event_battery,ButtonBattery);
+	TRANZPORT_BUTTON_HANDLER(button_event_backlight,ButtonBacklight);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackleft,ButtonTrackLeft);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackright,ButtonTrackRight);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackrec,ButtonTrackRec);
+	TRANZPORT_BUTTON_HANDLER(button_event_trackmute,ButtonTrackMute);
+	TRANZPORT_BUTTON_HANDLER(button_event_tracksolo,ButtonTrackSolo);
+	TRANZPORT_BUTTON_HANDLER(button_event_undo,ButtonUndo);
+	TRANZPORT_BUTTON_HANDLER(button_event_in,ButtonIn);
+	TRANZPORT_BUTTON_HANDLER(button_event_out,ButtonOut);
+	TRANZPORT_BUTTON_HANDLER(button_event_punch,ButtonPunch);
+	TRANZPORT_BUTTON_HANDLER(button_event_loop,ButtonLoop);
+	TRANZPORT_BUTTON_HANDLER(button_event_prev,ButtonPrev);
+	TRANZPORT_BUTTON_HANDLER(button_event_add,ButtonAdd);
+	TRANZPORT_BUTTON_HANDLER(button_event_next,ButtonNext);
+	TRANZPORT_BUTTON_HANDLER(button_event_rewind,ButtonRewind);
+	TRANZPORT_BUTTON_HANDLER(button_event_fastforward,ButtonFastForward);
+	TRANZPORT_BUTTON_HANDLER(button_event_stop,ButtonStop);
+	TRANZPORT_BUTTON_HANDLER(button_event_play,ButtonPlay);
+	TRANZPORT_BUTTON_HANDLER(button_event_record,ButtonRecord);
+	TRANZPORT_BUTTON_HANDLER(button_event_footswitch,ButtonFootswitch);
+	return 0;
+}
+
diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc
new file mode 100644
index 0000000000..103a3b7681
--- /dev/null
+++ b/libs/surfaces/tranzport/general.cc
@@ -0,0 +1,333 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_common.h>
+#include <tranzport_control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+// HA, I don't need this anymore
+#include <slider_gain.h>
+
+//   FIXME, flash recording light when recording and transport is moving
+int TranzportControlProtocol::lights_show_recording() 
+{
+	return     lights_show_normal();
+}
+
+void TranzportControlProtocol::show_bling() {
+	lights_show_bling();
+	screen_show_bling();
+}
+
+void TranzportControlProtocol::notify(const char *msg) {
+	last_notify=100;
+	if(strlen(msg) < 21) {
+		strcpy(last_notify_msg,msg);
+	} else {
+		strncpy(last_notify_msg,msg,16);
+		last_notify_msg[16] = '\n';
+	}
+}
+
+void TranzportControlProtocol::show_notify() {
+// FIXME: Get width of the notify area somehow
+	if(last_notify==0) {
+		print(1,0,"                ");
+		last_notify=-1;
+	}
+	if(last_notify > 0) {
+		print(1,0,last_notify_msg);
+		--last_notify;
+	}
+}
+
+// Need more bling!
+
+int TranzportControlProtocol::lights_show_bling() 
+{
+	switch (bling_mode) {
+	case BlingOff: break;
+	case BlingKit: break; // rotate rec/mute/solo/any solo back and forth
+	case BlingRotating: break; // switch between lights
+	case BlingPairs: break; // Show pairs of lights
+	case BlingRows: break; // light each row in sequence
+	case BlingFlashAll: break; // Flash everything randomly
+	case BlingEnter: lights_on(); // Show intro 	
+	case BlingExit: 
+		lights_off();
+		break;
+	}
+	return 0;
+}
+
+int TranzportControlProtocol::screen_show_bling() 
+{
+	switch (bling_mode) {
+	case BlingOff: break;
+	case BlingKit: break; // rotate rec/mute/solo/any solo back and forth
+	case BlingRotating: break; // switch between lights
+	case BlingPairs: break; // Show pairs of lights
+	case BlingRows: break; // light each row in sequence
+	case BlingFlashAll: break; // Flash everything randomly
+	case BlingEnter: // Show intro 	
+		print(0,0,"!!Welcome to Ardour!");
+		print(1,0,"Peace through Music!");
+		break;
+	case BlingExit: 
+		break;
+	}
+	return 0;
+}
+
+int TranzportControlProtocol::lights_show_normal() 
+{
+	/* Track only */
+
+	if (route_table[0]) {
+		boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (route_table[0]);
+		lights_pending[LightTrackrec]  = at && at->record_enabled();
+		lights_pending[LightTrackmute] = route_get_muted(0); 
+		lights_pending[LightTracksolo] = route_get_soloed(0);
+	} else {
+		lights_pending[LightTrackrec]  = false;
+		lights_pending[LightTracksolo] = false;
+		lights_pending[LightTrackmute] = false;
+	}
+
+	/* Global settings */
+
+	lights_pending[LightLoop]        = session->get_play_loop(); 
+	lights_pending[LightPunch]       = Config->get_punch_in() || Config->get_punch_out();
+	lights_pending[LightRecord]      = session->get_record_enabled();
+	lights_pending[LightAnysolo]     = session->soloing();
+
+	return 0;
+}
+
+int TranzportControlProtocol::lights_show_tempo() 
+{
+	// someday soon fiddle with the lights more sanely based on the tempo 
+	return     lights_show_normal();
+}
+
+int
+TranzportControlProtocol::update_state ()
+{
+	/* do the text and light updates */
+
+	switch (display_mode) {
+	case DisplayBigMeter:
+		lights_show_tempo();
+		show_meter ();
+		break;
+
+	case DisplayNormal:
+		lights_show_normal();
+		normal_update();
+		break;
+
+	case DisplayConfig:
+		break;
+
+	case DisplayRecording:
+		lights_show_recording();
+		normal_update();
+		break;
+
+	case DisplayRecordingMeter:
+		lights_show_recording();
+		show_meter(); 
+		break;
+
+	case DisplayBling:
+		show_bling();
+		break;
+
+	case DisplayBlingMeter:
+		lights_show_bling();
+		show_meter();
+		break;
+	}
+	show_notify();
+
+	return 0;
+
+}
+
+void
+TranzportControlProtocol::prev_marker ()
+{
+	Location *location = session->locations()->first_location_before (session->transport_frame());
+	
+	if (location) {
+		session->request_locate (location->start(), session->transport_rolling());
+		notify(location->name().c_str());
+	} else {
+		session->goto_start ();
+		notify("START");
+	}
+     
+}
+
+void
+TranzportControlProtocol::next_marker ()
+{
+	Location *location = session->locations()->first_location_after (session->transport_frame());
+
+	if (location) {
+		session->request_locate (location->start(), session->transport_rolling());
+		notify(location->name().c_str());
+	} else {
+		session->request_locate (session->current_end_frame());
+		notify("END ");
+	}
+}
+
+
+void
+TranzportControlProtocol::show_current_track ()
+{
+	char pad[COLUMNS];
+	char *v;
+	int len;
+	if (route_table[0] == 0) {
+		print (0, 0, "---------------");
+		last_track_gain = FLT_MAX;
+	} else {
+		strcpy(pad,"               ");
+		v =  (char *)route_get_name (0).substr (0, 14).c_str();
+		if((len = strlen(v)) > 0) {
+			strncpy(pad,(char *)v,len);
+		}
+		print (0, 0, pad);
+	}
+}
+
+
+#if 0
+void
+TranzportControlProtocol::step_gain (float increment)
+{
+// FIXME: buttonstop is used elsewhere
+	if (buttonmask & ButtonStop) {
+		gain_fraction += 0.001*increment;
+	} else {
+		gain_fraction += 0.01*increment;
+	}
+
+	if (fabsf(gain_fraction) > 2.0) {
+		gain_fraction = 2.0*sign(gain_fraction);
+	}
+	
+	route_set_gain (0, slider_position_to_gain (gain_fraction));
+}
+#endif
+
+void
+TranzportControlProtocol::step_gain_up ()
+{
+	if (buttonmask & ButtonStop) {
+		gain_fraction += 0.001;
+	} else {
+		gain_fraction += 0.01;
+	}
+
+	if (gain_fraction > 2.0) {
+		gain_fraction = 2.0;
+	}
+	
+	route_set_gain (0, slider_position_to_gain (gain_fraction));
+}
+
+void
+TranzportControlProtocol::step_gain_down ()
+{
+	if (buttonmask & ButtonStop) {
+		gain_fraction -= 0.001;
+	} else {
+		gain_fraction -= 0.01;
+	}
+
+	if (gain_fraction < 0.0) {
+		gain_fraction = 0.0;
+	}
+	
+	route_set_gain (0, slider_position_to_gain (gain_fraction));
+}
+
+
+void
+TranzportControlProtocol::next_track ()
+{
+	ControlProtocol::next_track (current_track_id);
+	gain_fraction = gain_to_slider_position (route_get_effective_gain (0));
+//	notify("NextTrak"); // not needed til we have more modes
+}
+
+void
+TranzportControlProtocol::prev_track ()
+{
+	ControlProtocol::prev_track (current_track_id);
+	gain_fraction = gain_to_slider_position (route_get_effective_gain (0));
+//	notify("PrevTrak");
+}
+
+// This should kind of switch to using notify
+
+// Was going to keep state around saying to retry or not
+// haven't got to it yet, still not sure it's a good idea
+
+void
+TranzportControlProtocol::print (int row, int col, const char *text) {
+	print_noretry(row,col,text);
+}
+
+// -1 on failure
+// 0 on no damage
+// count of bit set on damage?
+
+void
+TranzportControlProtocol::print_noretry (int row, int col, const char *text)
+{
+	uint32_t length = strlen (text);
+	if (row*COLUMNS+col+length > (ROWS*COLUMNS)) {
+		return;
+	}
+	// FIXME - be able to print the whole screen at a go.
+	uint32_t t,r,c;
+	std::bitset<ROWS*COLUMNS> mask(screen_invalid);
+	for(r = row, c = col, t = 0 ; t < length; c++,t++) {
+		screen_pending[r][c] = text[t];
+		mask[r*COLUMNS+c] = (screen_current[r][c] != screen_pending[r][c]);
+	}
+	screen_invalid = mask;
+}
+
+void TranzportControlProtocol::invalidate() 
+{
+	lcd_damage(); lights_invalidate(); screen_invalidate(); // one of these days lcds can be fine but screens not
+}
diff --git a/libs/surfaces/tranzport/init.cc b/libs/surfaces/tranzport/init.cc
new file mode 100644
index 0000000000..94f85bdc56
--- /dev/null
+++ b/libs/surfaces/tranzport/init.cc
@@ -0,0 +1,314 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ */
+
+#include <tranzport_common.h>
+#include <tranzport_control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+void*
+TranzportControlProtocol::_monitor_work (void* arg)
+{
+	return static_cast<TranzportControlProtocol*>(arg)->monitor_work ();
+}
+
+TranzportControlProtocol::~TranzportControlProtocol ()
+{
+	set_active (false);
+}
+
+int TranzportControlProtocol::rtpriority_set(int priority) 
+{
+	struct sched_param rtparam;
+	int err;
+	char *a = (char*) alloca(4096*2); a[0] = 'a'; a[4096] = 'b';
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = priority; /* XXX should be relative to audio (JACK) thread */
+	// Note - try SCHED_RR with a low limit 
+	// - we don't care if we can't write everything this ms
+	// and it will help if we lose the device
+	if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) {
+		PBD::info << string_compose (_("%1: thread not running with realtime scheduling (%2)"), name(), strerror (errno)) << endmsg;
+		return 1;
+	} 
+	return 0;
+}
+
+// Running with realtime privs is bad when you have problems
+
+int TranzportControlProtocol::rtpriority_unset(int priority) 
+{
+	struct sched_param rtparam;
+	int err;
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = priority; 	
+	if ((err = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) {
+		PBD::info << string_compose (_("%1: can't stop realtime scheduling (%2)"), name(), strerror (errno)) << endmsg;
+		return 1;
+	} 
+	PBD::info << string_compose (_("%1: realtime scheduling stopped (%2)"), name(), strerror (errno)) << endmsg;
+	return 0;
+}
+
+
+int
+TranzportControlProtocol::set_active (bool yn)
+{
+	if (yn != _active) {
+
+		if (yn) {
+
+			if (open ()) {
+				return -1;
+			}
+
+			if (pthread_create_and_store (X_("tranzport monitor"), &thread, 0, _monitor_work, this) == 0) {
+				_active = true;
+#if TRANZPORT_THREADS                      
+			if (pthread_create_and_store (X_("tranzport read"), &thread_read, 0, _read_work, this) == 0) {
+				_active_read = true;
+			if (pthread_create_and_store (X_("tranzport write"), &thread_write, 0, _write_work, this) == 0) {
+				_active_write = true;
+			if (pthread_create_and_store (X_("tranzport process"), &thread_process, 0, _process_work, this) == 0) {
+				_active_process = true;
+			if (pthread_create_and_store (X_("tranzport timer"), &thread_timer, 0, _process_timer, this) == 0) {
+				_active_process = true;
+#endif
+			} else {
+				return -1;
+			}
+
+		} else {
+			cerr << "Begin tranzport shutdown\n";
+//                      if we got here due to an error, prettifying things will only make it worse
+//                      And with threads involved, oh boy...
+			if(!(last_write_error || last_read_error)) {
+				bling_mode   = BlingExit;
+				enter_bling_mode();
+// thread FIXME - wait til all writes are done
+				for(int x = 0; (x < 20/MAX_TRANZPORT_INFLIGHT) && flush(); x++) { usleep(100); }
+			}
+#if TRANZPORT_THREADS                      
+			pthread_cancel_one (_thread_timer);
+			pthread_cancel_one (_thread_process);
+			pthread_cancel_one (_thread_read);
+			pthread_cancel_one (_thread_write);
+#endif
+			pthread_cancel_one (thread);
+
+			cerr << "Tranzport Thread dead\n";
+			close ();
+			_active = false;
+			cerr << "End tranzport shutdown\n";
+		} 
+	}
+
+	return 0;
+}
+
+TranzportControlProtocol::TranzportControlProtocol (Session& s)
+	: ControlProtocol  (s, X_("Tranzport"))
+{
+	/* tranzport controls one track at a time */
+
+	set_route_table_size (1);
+	timeout = 6000; // what is this for?
+	buttonmask = 0;
+	_datawheel = 0;
+	_device_status = STATUS_OFFLINE;
+	udev = 0;
+	current_track_id = 0;
+	last_where = max_frames;
+	wheel_mode = WheelTimeline;
+	wheel_shift_mode = WheelShiftGain;
+	wheel_increment = WheelIncrScreen;
+	bling_mode = BlingEnter;
+	last_notify_msg[0] = '\0';
+	last_notify = 0;
+	timerclear (&last_wheel_motion);
+	last_wheel_dir = 1;
+	last_track_gain = FLT_MAX;
+	last_write_error = 0;
+	last_read_error = 0;
+	display_mode = DisplayBling;
+	gain_fraction = 0.0;
+	invalidate();
+	screen_init();
+	lights_init();
+// FIXME: Wait til device comes online somewhere
+// About 3 reads is enough
+// enter_bling_mode();
+
+}
+
+void*
+TranzportControlProtocol::monitor_work ()
+{
+	uint8_t buf[8]; //  = { 0,0,0,0,0,0,0,0 };
+	int val = 0, pending = 0;
+	bool first_time = true;
+	uint8_t offline = 0;
+
+	PBD::ThreadCreated (pthread_self(), X_("Tranzport"));
+	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
+	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
+	rtpriority_set();
+	inflight=0;
+	//int intro = 20;
+
+	// wait for the device to come online
+	invalidate();
+	screen_init();
+	lights_init();
+	update_state();
+//      There has to be some specific command to enable the device!!
+// 	while((val = read(buf,DEFAULT_USB_TIMEOUT*5)) == -110 && pending !=0) {
+// 		pending = lights_flush(); // poke the device for a while
+// 	}
+
+// 	pending = 1;
+// 	while(intro-- > 0 && pending != 0) {
+// 		usleep(1000);
+// 		pending = screen_flush(); // kinder, gentler init
+// 	}
+// 	usleep(1000);
+// 	lights_on();
+// 	while(flush()!=0) ;
+// 	lights_off();
+	display_mode = DisplayNormal;
+
+	while (true) {
+
+		/* bInterval for this beastie is 10ms */
+
+		if (_device_status == STATUS_OFFLINE) {
+			first_time = true; offline++; 
+#if TRANZPORT_DEBUG > 3
+			if(offline == 1) { 
+				cerr << "Transport has gone offline\n";
+			}
+#endif
+		} else { 
+			offline = 0; // hate writing this
+		}
+		unsigned int s = (last_write_error == 0) | ((last_read_error == 0) << 1);
+		switch (s) {
+		case 0: val = read(buf,DEFAULT_USB_TIMEOUT); break;
+		case 1: val = read(buf,DEFAULT_USB_TIMEOUT); break;
+		case 2: val = read(buf,DEFAULT_USB_TIMEOUT); break;
+		case 3: val = read(buf,DEFAULT_USB_TIMEOUT*2); break; // Hoo, boy, we're in trouble
+		default: break; // not reached
+		}
+	
+#if DEBUG_TRANZPORT_BITS > 9
+		if(_device_status != STATUS_OFFLINE && _device_status != STATUS_ONLINE && _device_status != STATUS_OK) {
+			printf("The device has more status bits than off or online: %d\n",_device_status);
+		}
+#endif
+
+#if DEBUG_TRANZPORT_BITS > 99
+		if (val != 8) {
+			printf("val = %d errno = %d\n",val,errno);
+			buf[0] = buf[1] = buf[2] = buf[3] = 
+				buf[4] = buf[5] = buf[6] = buf[7] = 
+				buf[8] = 0;
+		}
+#endif
+
+		if(val == 8) {
+			last_write_error = 0;
+			process (buf);
+		}
+
+#if DEBUG_TRANZPORT > 9
+		if(inflight > 1) printf("Inflight: %d\n", inflight);
+#endif
+
+		if (_device_status == STATUS_ONLINE) {
+			if (first_time) {
+				invalidate();
+				lcd_clear ();
+				lights_off ();
+				first_time = false;
+				last_write_error = 0;
+				offline = 0;
+				pending = 3; // Give some time for the device to recover
+			}
+#if DEBUG_TRANZPORT_BITS > 10
+			// Perhaps an online message indicates something
+
+			if(_device_status != buf[1]) { 
+				printf("WTF- val: %d, device status != buf! %d != %d \n",val,_device_status,buf[1]); _device_status = buf[1]; 
+			}
+#endif
+    
+		}
+    
+#if DEBUG_TRANZPORT_BITS > 10
+
+		if(val == 8) {
+
+			if(_device_status == STATUS_ONLINE) {
+				printf("ONLINE   : %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+				       buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); 
+			}
+			if(_device_status == STATUS_OFFLINE) {
+				printf("OFFLINE  : %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+				       buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); 
+			}
+ 	
+			if(_device_status == STATUS_OK) {
+				printf("OK       : %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+				       buf[0],buf[1],buf[2], buf[3], buf[4], buf[5],buf[6],buf[7]); 
+			}
+      
+		}
+    
+#endif
+    
+		/* update whatever needs updating */
+		if(last_write_error == 0 && (_device_status == STATUS_ONLINE || _device_status == STATUS_OK)) { 
+			update_state ();
+      
+			/* still struggling with a good means of exerting flow control without having to create threads */
+			// pending = flush();
+      
+			if(pending == 0) {
+				pending = flush(); 
+			} else {
+				if(inflight > 0) {
+					pending = --inflight; // we just did a whole bunch of writes so wait
+				} else {
+					pending = 0;
+				}
+			}
+		}
+		// pending = 0;
+	} 
+	return (void*) 0;
+}
+
diff --git a/libs/surfaces/tranzport/interface.cc b/libs/surfaces/tranzport/interface.cc
new file mode 100644
index 0000000000..f9b82fa651
--- /dev/null
+++ b/libs/surfaces/tranzport/interface.cc
@@ -0,0 +1,71 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <control_protocol/control_protocol.h>
+#include "tranzport_control_protocol.h"
+
+using namespace ARDOUR;
+
+ControlProtocol*
+new_tranzport_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+{
+	TranzportControlProtocol* tcp = new TranzportControlProtocol (*s);
+
+	if (tcp->set_active (true)) {
+		delete tcp;
+		return 0;
+	}
+
+	return tcp;
+	
+}
+
+void
+delete_tranzport_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+{
+	delete cp;
+}
+
+bool
+probe_tranzport_protocol (ControlProtocolDescriptor* descriptor)
+{
+	return TranzportControlProtocol::probe();
+}
+
+static ControlProtocolDescriptor tranzport_descriptor = {
+	name : "Tranzport",
+	id : "uri://ardour.org/surfaces/tranzport:0",
+	ptr : 0,
+	module : 0,
+	mandatory : 0,
+	supports_feedback : false,
+	probe : probe_tranzport_protocol,
+	initialize : new_tranzport_protocol,
+	destroy : delete_tranzport_protocol
+};
+	
+
+extern "C" {
+ControlProtocolDescriptor* 
+protocol_descriptor () {
+	return &tranzport_descriptor;
+}
+}
+
diff --git a/libs/surfaces/tranzport/io.cc b/libs/surfaces/tranzport/io.cc
new file mode 100644
index 0000000000..14242ea0ec
--- /dev/null
+++ b/libs/surfaces/tranzport/io.cc
@@ -0,0 +1,95 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* The routines in here should know absolutely nothing about how io is actually done */
+
+#include <tranzport_control_protocol.h>
+
+int
+TranzportControlProtocol::flush ()
+{
+	int pending = 0;
+
+// Always write the lights first
+	if(!(pending = lights_flush())) {
+		pending = screen_flush();
+	}
+
+#if DEBUG_TRANZPORT_BITS > 9
+	int s;
+	if(s = (screen_invalid.count())) { //  + lights_invalid.count())) {
+		printf("VALID  : %s %s\n",
+		       screen_invalid.to_string().c_str(),
+		       lights_invalid.to_string().c_str());
+		printf("CURR   : %s %s\n",
+		       screen_invalid.to_string().c_str(),
+		       lights_current.to_string().c_str());
+		printf("PENDING  : %s %s\n",
+		       screen_invalid.to_string().c_str(),
+		       lights_pending.to_string().c_str());
+#if DEBUG_TRANZPORT_BITS > 10
+		printf("invalid bits: %d\n",s);
+#endif
+	}
+#endif
+	return pending;
+}
+
+
+int
+TranzportControlProtocol::lights_flush ()
+{
+	std::bitset<LIGHTS> light_state;
+	light_state = lights_pending ^ lights_current;
+	if ( (light_state.none() || lights_invalid.none()))
+	{ 
+		return (0); 
+	}
+
+#if DEBUG_TRANZPORT_LIGHTS
+	printf("LPEND   : %s\n", lights_pending.to_string().c_str());
+	printf("LCURR   : %s\n", lights_current.to_string().c_str());
+#endif
+		
+	// if ever we thread reads/writes STATUS_OK will have to move into the loop
+	int i;
+		
+	if ( _device_status == STATUS_OK || _device_status == STATUS_ONLINE) {
+		for (i = 0; i<LIGHTS; i++) {
+			if(light_state[i]) { 
+				if(light_set ((LightID)i,lights_pending[i])) {
+#if DEBUG_TRANZPORT_LIGHTS > 2
+					printf("Did %d light writes\n",i);
+#endif
+					return light_state.count();
+				} else {
+					light_state[i] = 0;
+				}
+
+			}
+		}
+	}
+	light_state = lights_pending ^ lights_current;
+#if DEBUG_TRANZPORT_LIGHTS > 2
+	printf("Did %d light writes, left: %d\n",i, light_state.count());
+#endif
+		
+	return light_state.count();
+}
diff --git a/libs/surfaces/tranzport/io_kernel.cc b/libs/surfaces/tranzport/io_kernel.cc
new file mode 100644
index 0000000000..5e29e9ac7b
--- /dev/null
+++ b/libs/surfaces/tranzport/io_kernel.cc
@@ -0,0 +1,144 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#if HAVE_TRANZPORT_KERNEL_DRIVER
+#include <fcntl.h>
+#include <errno.h>
+#include <poll.h>
+#include "tranzport_control_protocol.h"
+
+// Something like open(/dev/surface/tranzport/event) for reading and raw for writing) would be better in the long run
+// Also support for multiple tranzports needs to be figured out
+// And bulk reads/writes in general
+
+bool
+TranzportControlProtocol::probe ()
+{
+	if((udev = ::open(TRANZPORT_DEVICE,O_RDWR))> 0) {
+		::close(udev);
+		return true; 
+	} 
+	error << _("Tranzport: Can't open device for Read/Write: ") << endmsg;
+	return false;
+}
+
+int
+TranzportControlProtocol::open ()
+{
+	if((udev=::open(TRANZPORT_DEVICE,O_RDWR))> 0) {
+		return(udev);
+	} 
+	error << _("Tranzport: no device detected") << endmsg;
+	return udev;
+}
+
+int
+TranzportControlProtocol::close ()
+{
+	int ret = 0;
+
+	if (udev < 1) {
+		return 0;
+	}
+
+	if ((ret = ::close (udev)) != 0) {
+		error << _("Tranzport: cannot close device") << endmsg;
+	}
+
+	return ret;
+}
+
+// someday do buffered reads, presently this does blocking reads, which is bad...
+
+int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) 
+{
+	last_read_error = ::read (udev, (char *) buf, 8);
+	switch(errno) {
+	case -ENOENT:
+	case -ENXIO:
+	case -ECONNRESET:
+	case -ESHUTDOWN: 
+	case -ENODEV: 
+		cerr << "Tranzport disconnected, errno: " << last_read_error;
+		set_active(false);
+		break;
+	case -ETIMEDOUT: // This is not normal, but lets see what happened
+		cerr << "Tranzport read timed out, errno: " << last_read_error;
+		break;
+	default: 
+#if DEBUG_TRANZPORT
+		cerr << "Got an unknown error on read:" << last_read_error "\n";
+#endif
+		break;
+	}
+
+	return last_read_error;
+} 
+
+	
+int
+TranzportControlProtocol::write_noretry (uint8_t* cmd, uint32_t timeout_override)
+{
+	// inflight is now taken care of by the driver, but...
+	if(inflight > MAX_TRANZPORT_INFLIGHT) { return (-1); }
+	int val = ::write (udev, (char*) cmd, 8);
+
+	if (val < 0 && val !=8) {
+#if DEBUG_TRANZPORT
+		printf("write failed: %d\n", val);
+#endif
+		last_write_error = errno;
+		switch(last_write_error) {
+		case -ENOENT:
+		case -ENXIO:
+		case -ECONNRESET:
+		case -ESHUTDOWN: 
+		case -ENODEV: 
+			cerr << "Tranzport disconnected, errno: " << last_write_error;
+			set_active(false);
+			break;
+		case -ETIMEDOUT: // This is not normal but
+			cerr << "Tranzport disconnected, errno: " << last_write_error;
+			break;
+		default: 
+#if DEBUG_TRANZPORT
+			cerr << "Got an unknown error on read:" << last_write_error "\n";
+#endif
+			break;
+		}
+		return last_write_error;
+	}
+
+	last_write_error = 0;
+	++inflight;
+
+	return 0;
+
+}	
+
+int
+TranzportControlProtocol::write (uint8_t* cmd, uint32_t timeout_override)
+{
+	return (write_noretry(cmd,timeout_override));
+}	
+
+// FIXME - install poll semantics
+#endif /* HAVE_TRANZPORT_KERNEL_DRIVER */
+
diff --git a/libs/surfaces/tranzport/io_midi.cc b/libs/surfaces/tranzport/io_midi.cc
new file mode 100644
index 0000000000..0fd10cfbf3
--- /dev/null
+++ b/libs/surfaces/tranzport/io_midi.cc
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* io_midi: Implements reading and writing tranzport events via the normal
+   tranzport midi specification */
+
+/* One day 
+#include <tranzport_control_protocol.h>
+*/
diff --git a/libs/surfaces/tranzport/io_usb.cc b/libs/surfaces/tranzport/io_usb.cc
new file mode 100644
index 0000000000..c4a004a160
--- /dev/null
+++ b/libs/surfaces/tranzport/io_usb.cc
@@ -0,0 +1,232 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <iostream>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <tranzport_control_protocol.h>
+
+#if !HAVE_TRANZPORT_KERNEL_DRIVER
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+// I note that these usb specific open, close, probe, read routines are basically 
+// pure boilerplate and could easily be abstracted elsewhere
+
+bool
+TranzportControlProtocol::probe ()
+{
+	struct usb_bus *bus;
+	struct usb_device *dev;
+
+	usb_init();
+	usb_find_busses();
+	usb_find_devices();
+
+	for (bus = usb_busses; bus; bus = bus->next) {
+
+		for(dev = bus->devices; dev; dev = dev->next) {
+			if (dev->descriptor.idVendor == VENDORID && dev->descriptor.idProduct == PRODUCTID) {
+				return true; 
+			}
+		}
+	}
+
+	return false;
+}
+
+int
+TranzportControlProtocol::open ()
+{
+	struct usb_bus *bus;
+	struct usb_device *dev;
+
+	usb_init();
+	usb_find_busses();
+	usb_find_devices();
+
+	for (bus = usb_busses; bus; bus = bus->next) {
+
+		for(dev = bus->devices; dev; dev = dev->next) {
+			if (dev->descriptor.idVendor != VENDORID)
+				continue;
+			if (dev->descriptor.idProduct != PRODUCTID)
+				continue;
+			return open_core (dev);
+		}
+	}
+
+	cerr << _("Tranzport: no device detected") << endmsg;
+	return -1;
+}
+
+int
+TranzportControlProtocol::open_core (struct usb_device* dev)
+{
+	if (!(udev = usb_open (dev))) {
+		cerr << _("Tranzport: cannot open USB transport") << endmsg;
+		return -1;
+	}
+	 
+	if (usb_claim_interface (udev, 0) < 0) {
+		cerr << _("Tranzport: cannot claim USB interface") << endmsg;
+		usb_close (udev);
+		udev = 0;
+		return -1;
+	}
+
+	if (usb_set_configuration (udev, 1) < 0) {
+		cerr << _("Tranzport: cannot configure USB interface") << endmsg;
+	}
+
+	return 0;
+}
+
+int
+TranzportControlProtocol::close ()
+{
+	int ret = 0;
+
+	if (udev == 0) {
+		return 0;
+	}
+
+	if (usb_release_interface (udev, 0) < 0) {
+		cerr << _("Tranzport: cannot release interface") << endmsg;
+		ret = -1;
+	}
+
+	if (usb_close (udev)) {
+		cerr << _("Tranzport: cannot close device") << endmsg;
+		udev = 0;
+		ret = 0;
+	}
+
+	return ret;
+}
+
+int TranzportControlProtocol::read(uint8_t *buf, uint32_t timeout_override) 
+{
+	last_read_error = usb_interrupt_read (udev, READ_ENDPOINT, (char *) buf, 8, timeout_override);
+	switch(last_read_error) {
+	case -ENOENT:
+	case -ENXIO:
+	case -ECONNRESET:
+	case -ESHUTDOWN: 
+	case -ENODEV: 
+		cerr << "Tranzport disconnected, errno: " << last_read_error;
+		set_active(false);
+	case -ETIMEDOUT: // This is normal
+		break;
+	default: 
+#if DEBUG_TRANZPORT
+		cerr << "Got an unknown error on read:" << last_read_error "\n";
+#endif
+		break;
+	}
+
+	return last_read_error;
+} 
+
+	
+int
+TranzportControlProtocol::write_noretry (uint8_t* cmd, uint32_t timeout_override)
+{
+	int val;
+	if(inflight > MAX_TRANZPORT_INFLIGHT) { return (-1); }
+	val = usb_interrupt_write (udev, WRITE_ENDPOINT, (char*) cmd, 8, timeout_override ? timeout_override : timeout);
+
+	if (val < 0 && val !=8) {
+#if DEBUG_TRANZPORT
+		printf("usb_interrupt_write failed: %d\n", val);
+#endif
+		last_write_error = val;
+		switch(last_write_error) {
+		case -ENOENT:
+		case -ENXIO:
+		case -ECONNRESET:
+		case -ESHUTDOWN: 
+		case -ENODEV: 
+			cerr << "Tranzport disconnected, errno: " << last_write_error;
+			set_active(false);
+		case -ETIMEDOUT: // This is normal
+			break;
+		default: 
+#if DEBUG_TRANZPORT
+			cerr << "Got an unknown error on read:" << last_write_error "\n";
+#endif
+			break;
+		}
+		return val;
+	}
+
+	last_write_error = 0;
+	++inflight;
+
+	return 0;
+
+}	
+
+int
+TranzportControlProtocol::write (uint8_t* cmd, uint32_t timeout_override)
+{
+#if MAX_RETRY > 1
+	int val;
+	int retry = 0;
+	if(inflight > MAX_TRANZPORT_INFLIGHT) { return (-1); }
+	
+	while((val = usb_interrupt_write (udev, WRITE_ENDPOINT, (char*) cmd, 8, timeout_override ? timeout_override : timeout))!=8 && retry++ < MAX_RETRY) {
+		printf("usb_interrupt_write failed, retrying: %d\n", val);
+	}
+
+	if (retry == MAX_RETRY) {
+		printf("Too many retries on a tranzport write, aborting\n");
+	}
+
+	if (val < 0) {
+		printf("usb_interrupt_write failed: %d\n", val);
+		return val;
+	}
+	if (val != 8) {
+		printf("usb_interrupt_write failed: %d\n", val);
+		return -1;
+	}
+	++inflight;
+	return 0;
+#else
+	return (write_noretry(cmd,timeout_override));
+#endif
+
+}	
+
+#endif
diff --git a/libs/surfaces/tranzport/lcd.cc b/libs/surfaces/tranzport/lcd.cc
new file mode 100644
index 0000000000..88f9ea36d6
--- /dev/null
+++ b/libs/surfaces/tranzport/lcd.cc
@@ -0,0 +1,120 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_control_protocol.h>
+
+// doing these functions made me realize that screen_invalid should be lcd_isdamaged FIXME soon
+
+bool TranzportControlProtocol::lcd_damage() 
+{
+	screen_invalidate();
+	return true;
+}
+
+bool TranzportControlProtocol::lcd_damage (int row, int col, int length)
+{
+	std::bitset<ROWS*COLUMNS> mask1(0);
+	// there's an intrinsic to do this fast, darn it, or I'm just sleepy
+	for (int i = 0; i < length; i++) { mask1[i] = 1; }
+	std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col));
+	screen_invalid |= mask;
+	return true;
+}
+
+// Still working on the layering, arguably screen_invalid should be lcd_invalid
+// or vice versa
+
+bool TranzportControlProtocol::lcd_isdamaged () 
+{
+	if(screen_invalid.any()) {
+#if DEBUG_TRANZPORT > 5	
+		printf("LCD is damaged somewhere, should redraw it\n");
+#endif
+		return true;
+	}
+	return false;
+}
+
+bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length)
+{
+	// there's an intrinsic to do this fast, darn it
+	std::bitset<ROWS*COLUMNS> mask1(0);
+	for (int i = 0; i < length; i++) { mask1[i] = 1; }
+	std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col));
+	mask &= screen_invalid;
+	if(mask.any()) {
+#if DEBUG_TRANZPORT > 5	
+		printf("row: %d,col: %d is damaged, should redraw it\n", row,col);
+#endif
+		return true;
+	}
+	return false; 
+}
+
+// lcd_clear would be a separate function for a smart display
+// here it does nothing, but for the sake of completeness it should
+// probably write the lcd, and while I'm on the topic it should probably
+// take a row, col, length argument....
+
+void
+TranzportControlProtocol::lcd_clear ()
+{
+
+}
+
+// These lcd commands are not universally used yet and may drop out of the api
+
+int
+TranzportControlProtocol::lcd_flush ()
+{
+	return 0; 
+}
+
+int 
+TranzportControlProtocol::lcd_write(uint8_t* cmd, uint32_t timeout_override)
+{
+	int result;
+#if (DEBUG_TRANZPORT_SCREEN > 0)
+	printf("VALID  : %s\n", (screen_invalid.to_string()).c_str()); 
+#endif
+	if ((result = write(cmd,timeout_override))) {
+#if DEBUG_TRANZPORT > 4
+		printf("usb screen update failed for some reason... why? \nresult, cmd and data were %d %02x %02x %02x %02x %02x %02x %02x %02x\n", 
+		       result, cmd[0],cmd[1],cmd[2], cmd[3], cmd[4], cmd[5],cmd[6],cmd[7]); 
+#endif
+	}
+	return result;
+}
+
+void 
+TranzportControlProtocol::lcd_fill (uint8_t fill_char) 
+{
+}
+
+void 
+TranzportControlProtocol::lcd_print (int row, int col, const char* text) 
+{
+	print(row,col,text);
+}
+
+void TranzportControlProtocol::lcd_print_noretry (int row, int col, const char* text)
+{
+	print(row,col,text);
+}
diff --git a/libs/surfaces/tranzport/lights.cc b/libs/surfaces/tranzport/lights.cc
new file mode 100644
index 0000000000..c0e8092f45
--- /dev/null
+++ b/libs/surfaces/tranzport/lights.cc
@@ -0,0 +1,95 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_control_protocol.h>
+
+// Lights are buffered, and arguably these functions should be eliminated or inlined
+
+void
+TranzportControlProtocol::lights_on ()
+{
+	lights_pending.set();
+}
+
+void
+TranzportControlProtocol::lights_off ()
+{
+	lights_pending.reset();
+}
+
+int
+TranzportControlProtocol::light_on (LightID light)
+{
+	lights_pending.set(light);
+	return 0;
+}
+
+int
+TranzportControlProtocol::light_off (LightID light)
+{
+	lights_pending.reset(light);
+	return 0;
+}
+
+void TranzportControlProtocol::lights_init()
+{
+	lights_invalid.set();
+	lights_flash = lights_pending = lights_current.reset(); 
+}
+
+
+// Now that all this is bitsets, I don't see much 
+// need for these 4 to remain in the API
+
+void TranzportControlProtocol::light_validate (LightID light) 
+{
+	lights_invalid.reset(light);
+}
+
+void TranzportControlProtocol::light_invalidate (LightID light) 
+{
+	lights_invalid.set(light);
+}
+
+void TranzportControlProtocol::lights_validate () 
+{
+	lights_invalid.reset();
+}
+
+void TranzportControlProtocol::lights_invalidate () 
+{
+	lights_invalid.set();
+}
+
+int
+TranzportControlProtocol::light_set (LightID light, bool offon)
+{
+	uint8_t cmd[8];
+	cmd[0] = 0x00;  cmd[1] = 0x00;  cmd[2] = light;  cmd[3] = offon;
+	cmd[4] = 0x00;  cmd[5] = 0x00;  cmd[6] = 0x00;  cmd[7] = 0x00;
+
+	if (write (cmd) == 0) {
+		lights_current[light] = offon;
+		lights_invalid.reset(light);
+		return 0;
+	} else {
+		return 1;
+	}
+}
diff --git a/libs/surfaces/tranzport/meter.cc b/libs/surfaces/tranzport/meter.cc
new file mode 100644
index 0000000000..cc57846058
--- /dev/null
+++ b/libs/surfaces/tranzport/meter.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* Generic support for character based metering on a track */
diff --git a/libs/surfaces/tranzport/mode.cc b/libs/surfaces/tranzport/mode.cc
new file mode 100644
index 0000000000..03d715e66f
--- /dev/null
+++ b/libs/surfaces/tranzport/mode.cc
@@ -0,0 +1,107 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_control_protocol.h>
+
+void
+TranzportControlProtocol::normal_update ()
+{
+	show_current_track ();
+	show_transport_time ();
+	show_track_gain ();
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::next_display_mode ()
+{
+	switch (display_mode) {
+
+	case DisplayNormal:
+		enter_big_meter_mode();
+		break;
+
+	case DisplayBigMeter:
+		enter_normal_display_mode();
+		break;
+
+	case DisplayRecording:
+		enter_normal_display_mode();
+		break;
+
+	case DisplayRecordingMeter:
+		enter_big_meter_mode();
+		break;
+
+	case DisplayConfig: 
+	case DisplayBling:
+	case DisplayBlingMeter:
+		enter_normal_display_mode();
+		break;
+	}
+}
+
+// FIXME: There should be both enter and exits
+// EXIT would erase the portions of the screen being written
+// to.
+/* not sure going macro crazy is a good idea
+#define DECLARE_ENTER_MODE(mode,modename) void TranzportControlProtocol::enter_##mode##_mode() \{\screen_clear(); lights_off(); display_mode=Display##modename;\;
+*/
+void
+TranzportControlProtocol::enter_recording_mode ()
+{
+	screen_clear ();
+	lights_off ();
+	display_mode = DisplayRecording;
+}
+
+void
+TranzportControlProtocol::enter_bling_mode ()
+{
+	screen_clear ();
+	lights_off ();
+	display_mode = DisplayBling;
+}
+
+void
+TranzportControlProtocol::enter_config_mode ()
+{
+	lights_off ();
+	screen_clear ();
+	display_mode = DisplayConfig;
+}
+
+
+void
+TranzportControlProtocol::enter_big_meter_mode ()
+{
+	lights_off (); // it will clear the screen for you
+	last_meter_fill = 0;
+	display_mode = DisplayBigMeter;
+}
+
+void
+TranzportControlProtocol::enter_normal_display_mode ()
+{
+	lights_off ();
+	screen_clear ();
+	display_mode = DisplayNormal;
+}
+
diff --git a/libs/surfaces/tranzport/mode_loop.cc b/libs/surfaces/tranzport/mode_loop.cc
new file mode 100644
index 0000000000..b9ea9f239e
--- /dev/null
+++ b/libs/surfaces/tranzport/mode_loop.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* placeholder for Marker Mode: Edit Markers, Setup Loops, and Punch in points */
diff --git a/libs/surfaces/tranzport/mode_tuner.cc b/libs/surfaces/tranzport/mode_tuner.cc
new file mode 100644
index 0000000000..a686f81be1
--- /dev/null
+++ b/libs/surfaces/tranzport/mode_tuner.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* Placeholder for a tuner mode at some point */
diff --git a/libs/surfaces/tranzport/panner.cc b/libs/surfaces/tranzport/panner.cc
new file mode 100644
index 0000000000..4a177db9a7
--- /dev/null
+++ b/libs/surfaces/tranzport/panner.cc
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ */
+
+#include <tranzport_common.h>
+#include <tranzport_control_protocol.h>
+
+void
+TranzportControlProtocol::step_pan_right ()
+{
+}
+
+void
+TranzportControlProtocol::step_pan_left ()
+{
+}
+
+
diff --git a/libs/surfaces/tranzport/screen.cc b/libs/surfaces/tranzport/screen.cc
new file mode 100644
index 0000000000..51062de3ad
--- /dev/null
+++ b/libs/surfaces/tranzport/screen.cc
@@ -0,0 +1,93 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <tranzport_control_protocol.h>
+
+void
+TranzportControlProtocol::screen_clear ()
+{
+	const char *blank = "                    ";
+	print(0,0,blank); 
+	print(1,0,blank);
+}
+
+void TranzportControlProtocol::screen_invalidate ()
+{
+	screen_invalid.set();
+	for(int row = 0; row < ROWS; row++) {
+		for(int col = 0; col < COLUMNS; col++) {
+			screen_current[row][col] = 0x7f;
+			screen_pending[row][col] = ' ';
+			screen_flash[row][col] = ' ';
+		}
+	}
+}
+
+void TranzportControlProtocol::screen_validate ()
+{
+}
+
+void TranzportControlProtocol::screen_init ()
+{
+	screen_invalidate();
+}
+
+// FIXME: Switch to a column oriented flush to make the redraw of the 
+// meters look better
+
+int
+TranzportControlProtocol::screen_flush ()
+{
+	int cell = 0, row=0, col_base, pending = 0;
+	const unsigned long CELL_BITS = 0x0F;
+	if ( _device_status == STATUS_OFFLINE) { return (-1); }
+
+	std::bitset<ROWS*COLUMNS> mask(CELL_BITS);
+	std::bitset<ROWS*COLUMNS> imask(CELL_BITS);
+	for(cell = 0; cell < 10 && pending == 0; cell++) {
+		mask = imask << (cell*4);
+		if((screen_invalid & mask).any()) {
+			/* something in this cell is different, so dump the cell to the device. */
+#if DEBUG_TRANZPORT_SCREEN
+			printf("MASK   : %s\n", mask.to_string().c_str());
+#endif
+			if(cell > 4) { row = 1; } else { row = 0; }
+			col_base = (cell*4)%COLUMNS;
+        
+			uint8_t cmd[8]; 
+			cmd[0] = 0x00; 
+			cmd[1] = 0x01; 
+			cmd[2] = cell; 
+			cmd[3] = screen_pending[row][col_base]; 
+			cmd[4] = screen_pending[row][col_base+1];
+			cmd[5] = screen_pending[row][col_base+2]; 
+			cmd[6] = screen_pending[row][col_base+3];
+			cmd[7] = 0x00;
+
+			if((pending = lcd_write(cmd)) == 0) {
+				/* successful write: copy to current cached display */
+				screen_invalid &= mask.flip(); 
+				memcpy (&screen_current[row][col_base], &screen_pending[row][col_base], 4);
+			}
+		}
+	}
+	return pending;
+}
+
diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc
new file mode 100644
index 0000000000..30c8fbffa9
--- /dev/null
+++ b/libs/surfaces/tranzport/show.cc
@@ -0,0 +1,400 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include <pbd/pthread_utils.h>
+
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/tempo.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+#include <tranzport_control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+float
+log_meter (float db)
+{
+	float def = 0.0f; /* Meter deflection %age */
+
+	if (db < -70.0f) return 0.0f;
+	if (db > 6.0f) return 1.0f;
+
+	if (db < -60.0f) {
+		def = (db + 70.0f) * 0.25f;
+	} else if (db < -50.0f) {
+		def = (db + 60.0f) * 0.5f + 2.5f;
+	} else if (db < -40.0f) {
+		def = (db + 50.0f) * 0.75f + 7.5f;
+	} else if (db < -30.0f) {
+		def = (db + 40.0f) * 1.5f + 15.0f;
+	} else if (db < -20.0f) {
+		def = (db + 30.0f) * 2.0f + 30.0f;
+	} else if (db < 6.0f) {
+		def = (db + 20.0f) * 2.5f + 50.0f;
+	}
+
+	/* 115 is the deflection %age that would be 
+	   when db=6.0. this is an arbitrary
+	   endpoint for our scaling.
+	*/
+
+	return def/115.0f;
+}
+
+#define TRANZ_U  0x1 /* upper */
+#define TRANZ_BL 0x2 /* lower left */ 
+#define TRANZ_Q2 0x3 /* 2 quadrant block */
+#define TRANZ_ULB 0x4 /* Upper + lower left */ 
+#define TRANZ_L 0x5  /* lower  */ 
+#define TRANZ_UBL 0x6 /* upper left + bottom all */ 
+#define TRANZ_Q4 0x7 /* 4 quadrant block */ 
+#define TRANZ_UL 0x08 /* upper left */
+
+// Shift Space - switches your "view"
+// Currently defined views are:
+// BigMeter
+// 
+// Shift Record - SAVE SNAPSHOT
+// Somewhere I was rewriting this
+// Other meters
+// Inverted - show meters "inside out" For example 4 meters covering 2 cells each, and the
+// 
+// each 4 character cell could be an 8 bar meter = 10 meters!
+// Dual Meter mode - master and current track
+// We have 16 rows of pixels so we COULD do a vertical meter
+// BEAT BLOCKS - For each beat, flash a 8 block (could use the center for vertical meters) 
+// Could have something generic that could handle up to /20 time
+// Odd times could flash the whole top bar for the first beat
+
+
+// Vertical Meter _ .colon - + ucolon A P R I H FULLBLACK 
+// MV@$%&*()-
+
+// 3 char block  rotating beat `\'/
+// 1 char rotating beat {/\}
+// 4 char in block rotating beat {/\}
+//                               {\/)
+ 
+void TranzportControlProtocol::show_mini_meter()
+{
+	// FIXME - show the current marker in passing
+	const int meter_buf_size = 41; 
+	static uint32_t last_meter_fill_l = 0;
+	static uint32_t last_meter_fill_r = 0;
+	uint32_t meter_size;
+
+	float speed = fabsf(session->transport_speed());
+	char buf[meter_buf_size];
+
+	if (speed == 1.0)  { 
+		meter_size = 32; 
+	}
+  
+	if (speed == 0.0) { 
+		meter_size = 20;  // not actually reached
+	}
+  
+	if (speed > 0.0 && (speed < 1.0)) { 
+		meter_size = 20; // may shrink more one day
+	}
+
+	if (speed > 1.0 && (speed < 2.0)) { 
+		meter_size = 20;
+	}
+  
+	if (speed >= 2.0) {
+		meter_size = 24; 
+	} 
+
+
+	// you only seem to get a route_table[0] == 0 on moving forward - bug in next_track?
+
+	if (route_table[0] == 0) {
+		// Principle of least surprise
+		print (1, 0, "NoAUDIO  ");
+		return;
+	}
+
+	float level_l = route_get_peak_input_power (0, 0);
+	float fraction_l = log_meter (level_l);
+
+	// how to figure out if we are mono?
+
+	float level_r = route_get_peak_input_power (0, 1);
+	float fraction_r = log_meter (level_r);
+
+	uint32_t fill_left  = (uint32_t) floor (fraction_l * ((int) meter_size));
+	uint32_t fill_right  = (uint32_t) floor (fraction_r * ((int) meter_size));
+
+	if (fill_left == last_meter_fill_l && fill_right == last_meter_fill_r && !lcd_isdamaged(1,0,meter_size/2)) {
+		/* nothing to do */
+		return;
+	}
+
+	last_meter_fill_l = fill_left;	last_meter_fill_r = fill_right;
+	
+	// give some feedback when overdriving - override yellow and red lights
+
+	if (fraction_l > 0.96 || fraction_r > 0.96) {
+		light_on (LightLoop);
+	}
+
+	if (fraction_l == 1.0 || fraction_r == 1.0) {
+		light_on (LightTrackrec);
+	}
+	
+	const uint8_t char_map[16] = { ' ', TRANZ_UL, 
+				       TRANZ_U, TRANZ_U,
+				       TRANZ_BL, TRANZ_Q2, 
+				       TRANZ_Q2, TRANZ_ULB,
+				       TRANZ_L, TRANZ_UBL, 
+				       ' ',' ',
+				       TRANZ_L, TRANZ_UBL,
+				       TRANZ_Q4,TRANZ_Q4
+	};  
+	unsigned int val,j,i;
+
+	for(j = 1, i = 0; i < meter_size/2; i++, j+=2) {
+		val = (fill_left >= j) | ((fill_left >= j+1) << 1) | 
+			((fill_right >=j) << 2) | ((fill_right >= j+1) << 3);
+		buf[i] = char_map[val];
+	}
+		
+	/* print() requires this */
+
+	buf[meter_size/2] = '\0';
+
+	print (1, 0, buf);
+
+	/* Add a peak bar, someday do falloff */
+		
+	//		char peak[2]; peak[0] = ' '; peak[1] = '\0';
+	//		if(fraction_l == 1.0 || fraction_r == 1.0) peak[0] = 'P';
+	//		print (1,8,peak); // Put a peak meter - P in if we peaked. 
+		
+}
+
+void
+TranzportControlProtocol::show_meter ()
+{
+	// you only seem to get a route_table[0] on moving forward - bug elsewhere
+	if (route_table[0] == 0) {
+		// Principle of least surprise
+		print (0, 0, "No audio to meter!!!");
+		print (1, 0, "Select another track"); 
+		return;
+	}
+
+	float level = route_get_peak_input_power (0, 0);
+	float fraction = log_meter (level);
+
+	/* Someday add a peak bar*/
+
+	/* we draw using a choice of a sort of double colon-like character ("::") or a single, left-aligned ":".
+	   the screen is 20 chars wide, so we can display 40 different levels. compute the level,
+	   then figure out how many "::" to fill. if the answer is odd, make the last one a ":"
+	*/
+
+	uint32_t fill  = (uint32_t) floor (fraction * 40);
+	char buf[21];
+	uint32_t i;
+
+	if (fill == last_meter_fill) {
+		/* nothing to do */
+		return;
+	}
+
+	last_meter_fill = fill;
+
+	bool add_single_level = (fill % 2 != 0);
+	fill /= 2;
+
+	if (fraction > 0.96) {
+		light_on (LightLoop);
+	}
+
+
+	if (fraction == 1.0) {
+		light_on (LightTrackrec);
+	}
+
+
+	/* add all full steps */
+
+	for (i = 0; i < fill; ++i) {
+		buf[i] = 0x07; /* tranzport special code for 4 quadrant LCD block */
+	} 
+	
+	/* add a possible half-step */
+
+	if (i < 20 && add_single_level) {
+		buf[i] = 0x03; /* tranzport special code for 2 left quadrant LCD block */
+		++i;
+	}
+
+	/* fill rest with space */
+
+	for (; i < 20; ++i) {
+		buf[i] = ' ';
+	}
+
+	/* print() requires this */
+
+	buf[21] = '\0';
+
+	print (0, 0, buf);
+	print (1, 0, buf);
+}
+
+void
+TranzportControlProtocol::show_bbt (nframes_t where)
+{ 
+	if (where != last_where) {
+		char buf[16];
+		BBT_Time bbt;
+
+		// When recording or playing back < 1.0 speed do 1 or 2
+		// FIXME - clean up state machine & break up logic
+		// this has to co-operate with the mini-meter and
+		// this is NOT the right way.
+
+		session->tempo_map().bbt_time (where, bbt);
+		last_bars = bbt.bars;
+		last_beats = bbt.beats;
+		last_ticks = bbt.ticks;
+		last_where = where;
+
+		float speed = fabsf(session->transport_speed());
+
+		if (speed == 1.0)  { 
+			sprintf (buf, "%03" PRIu32 "%1" PRIu32, bbt.bars,bbt.beats); // switch to hex one day
+			print (1, 16, buf); 
+		}
+
+		if (speed == 0.0) { 
+			sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks);
+			print (1, 10, buf); 
+		}
+
+		if (speed > 0.0 && (speed < 1.0)) { 
+			sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks);
+			print (1, 10, buf); 
+		}
+
+		if (speed > 1.0 && (speed < 2.0)) { 
+			sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks);
+			print (1, 10, buf); 
+		}
+
+		if (speed >= 2.0) {
+			sprintf (buf, "%03" PRIu32 "|%1" PRIu32 "|%02" PRIu32, bbt.bars,bbt.beats,bbt.ticks); 
+			print (1, 12, buf); 
+		} 
+
+		TempoMap::Metric m (session->tempo_map().metric_at (where));
+    
+		// the lights stop working well at above 100 bpm so don't bother
+		if(m.tempo().beats_per_minute() < 101.0 && (speed > 0.0)) {
+
+			// something else can reset these, so we need to
+
+			lights_pending[LightRecord] = false;
+			lights_pending[LightAnysolo] = false;
+			switch(last_beats) {
+			case 1: if(last_ticks < 250 || last_ticks >= 0) lights_pending[LightRecord] = true; break;
+			default: if(last_ticks < 250) lights_pending[LightAnysolo] = true;
+			}
+		}
+	}
+}
+
+void
+TranzportControlProtocol::show_transport_time ()
+{
+	nframes_t where = session->transport_frame();
+	show_bbt(where);
+}	
+
+void
+TranzportControlProtocol::show_smpte (nframes_t where)
+{
+	if ((where != last_where) || lcd_isdamaged(1,9,10)) {
+
+		char buf[5];
+		SMPTE::Time smpte;
+
+		session->smpte_time (where, smpte);
+
+		if (smpte.negative) {
+			sprintf (buf, "-%02" PRIu32 ":", smpte.hours);
+		} else {
+			sprintf (buf, " %02" PRIu32 ":", smpte.hours);
+		}
+		print (1, 8, buf);
+
+		sprintf (buf, "%02" PRIu32 ":", smpte.minutes);
+		print (1, 12, buf);
+
+		sprintf (buf, "%02" PRIu32 ":", smpte.seconds);
+		print (1, 15, buf);
+
+		sprintf (buf, "%02" PRIu32, smpte.frames);
+		print_noretry (1, 18, buf); 
+
+		last_where = where;
+	}
+}
+
+void
+TranzportControlProtocol::show_track_gain ()
+{
+// FIXME last_track gain has to become meter/track specific
+	if (route_table[0]) {
+		gain_t g = route_get_gain (0);
+		if ((g != last_track_gain) || lcd_isdamaged(0,12,8)) {
+			char buf[16]; 
+			snprintf (buf, sizeof (buf), "%6.1fdB", coefficient_to_dB (route_get_effective_gain (0)));
+			print (0, 12, buf); 
+			last_track_gain = g;
+		}
+	} else {
+		print (0, 9, "        "); 
+	}
+}
diff --git a/libs/surfaces/tranzport/slider_gain.h b/libs/surfaces/tranzport/slider_gain.h
new file mode 100644
index 0000000000..1bb497178f
--- /dev/null
+++ b/libs/surfaces/tranzport/slider_gain.h
@@ -0,0 +1,40 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#ifndef ardour_slider_gain
+#define ardour_slider_gain
+
+static inline double 
+gain_to_slider_position (ARDOUR::gain_t g)
+{
+	if (g == 0) return 0;
+	return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0);
+
+}
+
+static inline ARDOUR::gain_t 
+slider_position_to_gain (double pos)
+{
+	/* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */
+	if (pos == 0.0) return 0;
+	return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
+}
+
+#endif
diff --git a/libs/surfaces/tranzport/state.cc b/libs/surfaces/tranzport/state.cc
new file mode 100644
index 0000000000..1cb55b4fc3
--- /dev/null
+++ b/libs/surfaces/tranzport/state.cc
@@ -0,0 +1,148 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ */
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+#include "tranzport_control_protocol.h"
+
+
+// FIXME: How to handle multiple tranzports in a system?
+
+XMLNode&
+TranzportControlProtocol::get_state () 
+{
+	XMLNode* node = new XMLNode (X_("Protocol"));
+	node->add_property (X_("name"), _name);
+	return *node;
+}
+
+int
+TranzportControlProtocol::set_state (const XMLNode& node)
+{
+	cout << "TranzportControlProtocol::set_state: active " << _active << endl;
+	int retval = 0;
+
+// I think I want to make these strings rather than numbers
+#if 0		
+	// fetch current display mode
+	if ( node.property( X_("display_mode") ) != 0 )
+	{
+		string display = node.property( X_("display_mode") )->value();
+		try
+		{
+			set_active( true );
+			int32_t new_display = atoi( display.c_str() );
+			if ( display_mode != new_display ) display_mode = (DisplayMode)new_display;
+		}
+		catch ( exception & e )
+		{
+			cout << "exception in TranzportControlProtocol::set_state: " << e.what() << endl;
+			return -1;
+		}
+	}
+
+	if ( node.property( X_("wheel_mode") ) != 0 )
+	{
+		string wheel = node.property( X_("wheel_mode") )->value();
+		try
+		{
+			int32_t new_wheel = atoi( wheel.c_str() );
+			if ( wheel_mode != new_wheel ) wheel_mode = (WheelMode) new_wheel;
+		}
+		catch ( exception & e )
+		{
+			cout << "exception in TranzportControlProtocol::set_state: " << e.what() << endl;
+			return -1;
+		}
+	}
+
+	// fetch current bling mode
+	if ( node.property( X_("bling") ) != 0 )
+	{
+		string bling = node.property( X_("bling_mode") )->value();
+		try
+		{
+			int32_t new_bling = atoi( bling.c_str() );
+			if ( bling_mode != new_bling ) bling_mode = (BlingMode) new_bling;
+		}
+		catch ( exception & e )
+		{
+			cout << "exception in TranzportControlProtocol::set_state: " << e.what() << endl;
+			return -1;
+		}
+	}
+#endif 
+
+	return retval;
+
+}
+
+// These are intended for the day we have more options for tranzport modes
+// And perhaps we could load up sessions this way, too
+
+int
+TranzportControlProtocol::save (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
+
+int
+TranzportControlProtocol::load (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
+
+int
+TranzportControlProtocol::save_config (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
+
+int
+TranzportControlProtocol::load_config (char *name) 
+{
+	// Presently unimplemented
+	return 0;
+}
diff --git a/libs/surfaces/tranzport/tranzport_base.h b/libs/surfaces/tranzport/tranzport_base.h
new file mode 100644
index 0000000000..510f24fdfe
--- /dev/null
+++ b/libs/surfaces/tranzport/tranzport_base.h
@@ -0,0 +1,78 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* This header file is basically where all the tranzport debuggable options go.
+   Try to only check it in with minimal debugging enabled so production
+   systems don't have to fiddle with it. */
+
+/* Design notes: The tranzport is a unique device, basically a 
+   20x2 character lcd gui with (almost) 22 shift keys and 8 blinking lights. 
+
+   As such it has several unique constraints. In the libusb driver,
+   the device exerts flow control
+   by having a usb write fail. It is pointless to retry madly at that point,
+   the device is busy, and it's not going to become unbusy very quickly. 
+
+   So writes need to be either "mandatory" or "unreliable", and therein 
+   lies the rub, as the kernel can also drop writes, and missing an
+   interrupt in userspace is also generally bad. 
+
+   However, the kernel driver retries writes for you and also buffers and 
+   compresses incoming wheel events - it will rarely, if ever, drop data.
+
+   A more complex surface might have hundreds of lights and several displays.
+
+   mike@taht.net
+*/
+
+#ifndef ardour_tranzport_base
+#define ardour_tranzport_base
+
+#define DEFAULT_USB_TIMEOUT 10
+#define MAX_RETRY 1
+#define MAX_TRANZPORT_INFLIGHT 4
+#define DEBUG_TRANZPORT 0
+#define TRANZPORT_THREADS 0
+
+#ifndef HAVE_TRANZPORT_KERNEL_DRIVER
+#define HAVE_TRANZPORT_KERNEL_DRIVER 0
+#endif
+
+#ifndef HAVE_TRANZPORT_MIDI_DRIVER
+#define HAVE_TRANZPORT_MIDI_DRIVER 0
+#endif
+
+// for now, this is what the device is called
+#define TRANZPORT_DEVICE "/dev/tranzport0"
+
+#if DEBUG_TRANZPORT > 0 
+#define DEBUG_TRANZPORT_SCREEN 10
+#define DEBUG_TRANZPORT_BITS 10
+#define DEBUG_TRANZPORT_LIGHTS 10
+#define DEBUG_TRANZPORT_STATE 10
+#else
+#define DEBUG_TRANZPORT 0
+#define DEBUG_TRANZPORT_BITS 0
+#define DEBUG_TRANZPORT_SCREEN 0
+#define DEBUG_TRANZPORT_LIGHTS 0
+#define DEBUG_TRANZPORT_STATE 0
+#endif
+#endif /* ardour_tranzport_base */
+
diff --git a/libs/surfaces/tranzport/tranzport_common.h b/libs/surfaces/tranzport/tranzport_common.h
new file mode 100644
index 0000000000..06b07bd62a
--- /dev/null
+++ b/libs/surfaces/tranzport/tranzport_common.h
@@ -0,0 +1,44 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* The most common header files that the tranzport uses */
+
+#ifndef ardour_tranzport_common
+#define ardour_tranzport_common 
+#include <iostream>
+#include <algorithm>    
+#include <cmath>        
+  
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include <pbd/pthread_utils.h>
+
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/tempo.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+#endif /* ardour_tranzport_common */
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
new file mode 100644
index 0000000000..929cca3e2b
--- /dev/null
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -0,0 +1,386 @@
+/*
+  Copyright (C) 2006 Paul Davis 
+  Copyright (C) 2007 Mike Taht
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+
+#ifndef ardour_tranzport_control_protocol_h
+#define ardour_tranzport_control_protocol_h
+
+#include "tranzport_base.h"
+
+#include <vector>
+#include <bitset>
+#include <sys/time.h>
+#include <pthread.h>
+
+#if !HAVE_TRANZPORT_KERNEL_DRIVER
+#include <usb.h>
+#endif
+
+#include <glibmm/thread.h>
+#include <ardour/types.h>
+
+#include <control_protocol/control_protocol.h>
+
+class TranzportControlProtocol : public ARDOUR::ControlProtocol
+{
+public:
+	TranzportControlProtocol (ARDOUR::Session&);
+	virtual ~TranzportControlProtocol();
+
+	int set_active (bool yn);
+
+	static bool probe ();
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&);
+
+private:
+	static const int VENDORID = 0x165b;
+	static const int PRODUCTID = 0x8101;
+	static const int READ_ENDPOINT  = 0x81;
+	static const int WRITE_ENDPOINT = 0x02;
+	const static int STATUS_OFFLINE  = 0xff;
+	const static int STATUS_ONLINE = 0x01;
+	const static int STATUS_OK = 0x00;
+  
+        const static int LIGHTS = 7;
+        const static int ROWS = 2;
+        const static int COLUMNS = 20;
+	const static uint8_t WheelDirectionThreshold = 0x7f;
+
+	enum LightID {
+		LightRecord = 0,
+		LightTrackrec,
+		LightTrackmute,
+		LightTracksolo,
+		LightAnysolo,
+		LightLoop,
+		LightPunch
+	};
+
+	enum ButtonID {
+		ButtonBattery = 0x00004000,
+		ButtonBacklight = 0x00008000,
+		ButtonTrackLeft = 0x04000000,
+		ButtonTrackRight = 0x40000000,
+		ButtonTrackRec = 0x00040000,
+		ButtonTrackMute = 0x00400000,
+		ButtonTrackSolo = 0x00000400,
+		ButtonUndo = 0x80000000,
+		ButtonIn = 0x02000000,
+		ButtonOut = 0x20000000,
+		ButtonPunch = 0x00800000,
+		ButtonLoop = 0x00080000,
+		ButtonPrev = 0x00020000,
+		ButtonAdd = 0x00200000,
+		ButtonNext = 0x00000200,
+		ButtonRewind = 0x01000000,
+		ButtonFastForward = 0x10000000,
+		ButtonStop = 0x00010000,
+		ButtonPlay = 0x00100000,
+		ButtonRecord = 0x00000100,
+		ButtonShift = 0x08000000,
+		ButtonFootswitch = 0x00001000 
+	};
+
+	enum WheelShiftMode {
+		WheelShiftGain,
+		WheelShiftPan,
+		WheelShiftMaster,
+		WheelShiftMarker
+	};
+		
+	enum WheelMode {
+		WheelTimeline,
+		WheelScrub,
+		WheelShuttle
+	};
+
+	// FIXME - look at gtk2_ardour for snap settings
+
+	enum WheelIncrement {
+		WheelIncrSlave,
+		WheelIncrScreen,
+		WheelIncrSample,
+		WheelIncrBeat,
+		WheelIncrBar,
+		WheelIncrSecond,
+		WheelIncrMinute
+	};
+	  
+	enum DisplayMode {
+		DisplayNormal,
+		DisplayRecording,
+		DisplayRecordingMeter,
+		DisplayBigMeter,
+		DisplayConfig,
+		DisplayBling,
+		DisplayBlingMeter
+	};
+
+	enum BlingMode {
+	        BlingOff,
+	        BlingKit,
+	        BlingRotating,
+	        BlingPairs,
+	        BlingRows,
+	        BlingFlashAll,
+		BlingEnter,
+		BlingExit
+	};
+	
+	pthread_t       thread;
+#if HAVE_TRANZPORT_KERNEL_DRIVER
+	int udev;
+#else
+	usb_dev_handle* udev;
+#endif
+
+#if TRANZPORT_THREADS
+	pthread_t       thread_read;
+#endif
+	int             last_read_error;
+
+	uint32_t        buttonmask;
+	uint32_t        timeout;
+	uint32_t        inflight;
+	uint32_t        current_track_id;
+#if TRANZPORT_THREADS
+	pthread_t       thread_write;
+#endif
+	int             last_write_error;
+	uint8_t        _datawheel;
+	uint8_t        _device_status;
+	WheelMode       wheel_mode;
+	WheelShiftMode  wheel_shift_mode;
+	DisplayMode     display_mode;
+	BlingMode       bling_mode;
+	WheelIncrement  wheel_increment;
+
+	ARDOUR::gain_t  gain_fraction;
+
+	Glib::Mutex update_lock;
+
+        std::bitset<ROWS*COLUMNS> screen_invalid;
+	char screen_current[ROWS][COLUMNS];
+	char screen_pending[ROWS][COLUMNS];
+	char screen_flash[ROWS][COLUMNS];
+
+        std::bitset<LIGHTS> lights_invalid;
+        std::bitset<LIGHTS> lights_current;
+        std::bitset<LIGHTS> lights_pending;
+        std::bitset<LIGHTS> lights_flash;
+
+	int32_t       last_notify;
+	char           last_notify_msg[COLUMNS+1]; 
+	uint32_t       last_bars;
+	uint32_t       last_beats;
+	uint32_t       last_ticks;
+
+	bool           last_negative;
+	uint32_t       last_hrs;
+	uint32_t       last_mins;
+	uint32_t       last_secs;
+	uint32_t       last_frames;
+	nframes_t      last_where;
+	ARDOUR::gain_t last_track_gain;
+	uint32_t       last_meter_fill;
+	struct timeval last_wheel_motion;
+	int            last_wheel_dir;
+
+	Glib::Mutex io_lock;
+
+	int open ();
+	int read (uint8_t *buf,uint32_t timeout_override = 0);
+	int write (uint8_t* cmd, uint32_t timeout_override = 0);
+	int write_noretry (uint8_t* cmd, uint32_t timeout_override = 0);
+	int close ();
+	int save_config(char *name = "default");
+	int load_config(char *name = "default");
+	int save(char *name);
+	int load(char *name);
+        void print (int row, int col, const char* text);
+	void print_noretry (int row, int col, const char* text);
+	void notify(const char *msg);
+
+#if HAVE_TRANZPORT_KERNEL_DRIVER
+	int rtpriority_set(int priority = 3); // we don't need serious rt privs anymore
+#else
+	int rtpriority_set(int priority = 52);
+#endif
+	int rtpriority_unset(int priority = 0);
+
+	// I hate changing the api to do either but until I have clean io class what can you do?
+#if !HAVE_TRANZPORT_KERNEL_DRIVER
+	int open_core (struct usb_device*);
+#endif
+	static void* _monitor_work (void* arg);
+	void* monitor_work ();
+
+	int process (uint8_t *);
+	int update_state();
+	void invalidate();
+	int flush();
+	// bool isuptodate(); // think on this. It seems futile to update more than 30/sec
+
+	// A screen is a cache of what should be on the lcd
+
+	void screen_init();
+	void screen_validate();
+	void screen_invalidate();
+	int  screen_flush();
+	void screen_clear();
+	// bool screen_isuptodate(); // think on this - 
+	int  screen_show_bling();
+
+	// Commands to write to the lcd 
+
+	int  lcd_init();
+        bool lcd_damage();
+	bool lcd_isdamaged();
+
+        bool lcd_damage(int row, int col = 0, int length = COLUMNS);
+	bool lcd_isdamaged(int row, int col = 0, int length = COLUMNS);
+
+	int  lcd_flush();
+	int  lcd_write(uint8_t* cmd, uint32_t timeout_override = 0); // pedantic alias for write
+	void lcd_fill (uint8_t fill_char);
+	void lcd_clear ();
+	void lcd_print (int row, int col, const char* text);
+	void lcd_print_noretry (int row, int col, const char* text);
+
+	// Commands to write to the lights
+	// FIXME - on some devices lights can have intensity and colors
+
+	void lights_init();
+	void lights_validate();
+	void lights_invalidate();
+	void light_validate(LightID light);
+	void light_invalidate(LightID light);
+	int  lights_flush();
+	int  lights_write(uint8_t* cmd,uint32_t timeout_override = 0); // pedantic alias to write
+
+	// a cache of what should be lit
+
+	void lights_off ();
+	void lights_on ();
+	int  light_set(LightID, bool offon = true);
+	int  light_on (LightID);
+	int  light_off (LightID);
+
+	// some modes for the lights, should probably be renamed
+
+	int  lights_show_normal();
+	int  lights_show_recording();
+	int  lights_show_tempo();
+	int  lights_show_bling();
+
+	void enter_big_meter_mode ();
+	void enter_normal_display_mode ();
+	void enter_config_mode();
+	void enter_recording_mode();
+	void enter_bling_mode();
+
+	void next_marker (); // basicui doesn't give me enough info
+	void prev_marker (); 
+
+	void next_display_mode ();
+	void normal_update ();
+
+	void show_current_track ();
+	void show_track_gain ();
+	void show_transport_time ();
+	void show_bbt (nframes_t where);	
+	void show_smpte (nframes_t where);
+	void show_wheel_mode ();
+	void show_gain ();
+	void show_pan ();
+	void show_meter ();
+	void show_mini_meter ();
+	void show_bling();
+	void show_notify();
+
+	void datawheel ();
+	void scrub ();
+	void scroll ();
+	void shuttle ();
+	void config ();
+
+	void next_wheel_mode ();
+	void next_wheel_shift_mode ();
+
+	void set_current_track (ARDOUR::Route*);
+	void next_track ();
+	void prev_track ();
+	void step_gain_up ();
+	void step_gain_down ();
+	void step_pan_right ();
+	void step_pan_left ();
+
+
+	void button_event_battery_press (bool shifted);
+	void button_event_battery_release (bool shifted);
+	void button_event_backlight_press (bool shifted);
+	void button_event_backlight_release (bool shifted);
+	void button_event_trackleft_press (bool shifted);
+	void button_event_trackleft_release (bool shifted);
+	void button_event_trackright_press (bool shifted);
+	void button_event_trackright_release (bool shifted);
+	void button_event_trackrec_press (bool shifted);
+	void button_event_trackrec_release (bool shifted);
+	void button_event_trackmute_press (bool shifted);
+	void button_event_trackmute_release (bool shifted);
+	void button_event_tracksolo_press (bool shifted);
+	void button_event_tracksolo_release (bool shifted);
+	void button_event_undo_press (bool shifted);
+	void button_event_undo_release (bool shifted);
+	void button_event_in_press (bool shifted);
+	void button_event_in_release (bool shifted);
+	void button_event_out_press (bool shifted);
+	void button_event_out_release (bool shifted);
+	void button_event_punch_press (bool shifted);
+	void button_event_punch_release (bool shifted);
+	void button_event_loop_press (bool shifted);
+	void button_event_loop_release (bool shifted);
+	void button_event_prev_press (bool shifted);
+	void button_event_prev_release (bool shifted);
+	void button_event_add_press (bool shifted);
+	void button_event_add_release (bool shifted);
+	void button_event_next_press (bool shifted);
+	void button_event_next_release (bool shifted);
+	void button_event_rewind_press (bool shifted);
+	void button_event_rewind_release (bool shifted);
+	void button_event_fastforward_press (bool shifted);
+	void button_event_fastforward_release (bool shifted);
+	void button_event_stop_press (bool shifted);
+	void button_event_stop_release (bool shifted);
+	void button_event_play_press (bool shifted);
+	void button_event_play_release (bool shifted);
+	void button_event_record_press (bool shifted);
+	void button_event_record_release (bool shifted);
+	void button_event_footswitch_press(bool shifted);
+	void button_event_footswitch_release (bool shifted);
+
+	// new api - still thinking about it
+	void button_event_mute (bool pressed, bool shifted);
+};
+
+
+#endif // ardour_tranzport_control_protocol_h
diff --git a/libs/surfaces/tranzport/view_automation.cc b/libs/surfaces/tranzport/view_automation.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_automation.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_bigmeter.cc b/libs/surfaces/tranzport/view_bigmeter.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_bigmeter.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_bling.cc b/libs/surfaces/tranzport/view_bling.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_bling.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_bus.cc b/libs/surfaces/tranzport/view_bus.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_bus.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_config.cc b/libs/surfaces/tranzport/view_config.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_config.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_layer.cc b/libs/surfaces/tranzport/view_layer.cc
new file mode 100644
index 0000000000..8de9e3ad14
--- /dev/null
+++ b/libs/surfaces/tranzport/view_layer.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+/* ultimately this view will let you: rotate layers (takes) on the currently selected track/region, do cross fades, and the like */
diff --git a/libs/surfaces/tranzport/view_loop.cc b/libs/surfaces/tranzport/view_loop.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_loop.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_manymeter.cc b/libs/surfaces/tranzport/view_manymeter.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_manymeter.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_marker.cc b/libs/surfaces/tranzport/view_marker.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_marker.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_master.cc b/libs/surfaces/tranzport/view_master.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_master.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_plugins.cc b/libs/surfaces/tranzport/view_plugins.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_plugins.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_std.cc b/libs/surfaces/tranzport/view_std.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_std.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_tempo.cc b/libs/surfaces/tranzport/view_tempo.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_tempo.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/view_tuner.cc b/libs/surfaces/tranzport/view_tuner.cc
new file mode 100644
index 0000000000..4c0b18acf0
--- /dev/null
+++ b/libs/surfaces/tranzport/view_tuner.cc
@@ -0,0 +1,21 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+
diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc
new file mode 100644
index 0000000000..bc9683e6d7
--- /dev/null
+++ b/libs/surfaces/tranzport/wheel.cc
@@ -0,0 +1,206 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ *   */
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
+BaseUI::RequestType Print = BaseUI::new_request_type ();
+BaseUI::RequestType SetCurrentTrack = BaseUI::new_request_type ();
+
+
+#include <tranzport_control_protocol.h>
+
+void
+TranzportControlProtocol::datawheel ()
+{
+	if ((buttonmask & ButtonTrackRight) || (buttonmask & ButtonTrackLeft)) {
+
+		/* track scrolling */
+		
+		if (_datawheel < WheelDirectionThreshold) {
+			next_track ();
+		} else {
+			prev_track ();
+		}
+
+		timerclear (&last_wheel_motion);
+		
+	} else if ((buttonmask & ButtonPrev) || (buttonmask & ButtonNext)) {
+
+		if (_datawheel < WheelDirectionThreshold) {
+			next_marker ();
+		} else {
+			prev_marker ();
+		}
+		
+		timerclear (&last_wheel_motion);
+		
+	} else if (buttonmask & ButtonShift) {
+		
+		/* parameter control */
+		
+		if (route_table[0]) {
+			switch (wheel_shift_mode) {
+			case WheelShiftGain:
+				if (_datawheel < WheelDirectionThreshold) {
+					step_gain_up ();
+				} else {
+					step_gain_down ();
+				}
+				break;
+			case WheelShiftPan:
+				if (_datawheel < WheelDirectionThreshold) {
+					step_pan_right ();
+				} else {
+					step_pan_left ();
+				}
+				break;
+				
+			case WheelShiftMarker:
+				break;
+				
+			case WheelShiftMaster:
+				break;
+				
+			}
+		}
+		
+		timerclear (&last_wheel_motion);
+		
+	} else {
+		
+		switch (wheel_mode) {
+		case WheelTimeline:
+			scroll ();
+			break;
+			
+		case WheelScrub:
+			scrub ();
+			break;
+			
+		case WheelShuttle:
+			shuttle ();
+			break;
+		}
+	}
+}
+
+void
+TranzportControlProtocol::scroll ()
+{
+	float m = 1.0;
+	if (_datawheel < WheelDirectionThreshold) {
+		m = 1.0;
+	} else {
+		m = -1.0;
+	}
+	switch(wheel_increment) {
+	case WheelIncrScreen: ScrollTimeline (0.2*m); break;
+	case WheelIncrSlave:
+	case WheelIncrSample:
+	case WheelIncrBeat:
+	case WheelIncrBar:
+	case WheelIncrSecond:
+	case WheelIncrMinute:
+	default: break; // other modes unimplemented as yet
+	}
+}
+
+void
+TranzportControlProtocol::scrub ()
+{
+	float speed;
+	struct timeval now;
+	struct timeval delta;
+	int dir;
+	
+	gettimeofday (&now, 0);
+	
+	if (_datawheel < WheelDirectionThreshold) {
+		dir = 1;
+	} else {
+		dir = -1;
+	}
+	
+	if (dir != last_wheel_dir) {
+		/* changed direction, start over */
+		speed = 0.1f;
+	} else {
+		if (timerisset (&last_wheel_motion)) {
+
+			timersub (&now, &last_wheel_motion, &delta);
+			
+			/* 10 clicks per second => speed == 1.0 */
+			
+			speed = 100000.0f / (delta.tv_sec * 1000000 + delta.tv_usec);
+			
+		} else {
+			
+			/* start at half-speed and see where we go from there */
+			
+			speed = 0.5f;
+		}
+	}
+	
+	last_wheel_motion = now;
+	last_wheel_dir = dir;
+	
+	set_transport_speed (speed * dir);
+}
+
+void
+TranzportControlProtocol::shuttle ()
+{
+	if (_datawheel < WheelDirectionThreshold) {
+		if (session->transport_speed() < 0) {
+			session->request_transport_speed (1.0);
+		} else {
+			session->request_transport_speed (session->transport_speed() + 0.1);
+		}
+	} else {
+		if (session->transport_speed() > 0) {
+			session->request_transport_speed (-1.0);
+		} else {
+			session->request_transport_speed (session->transport_speed() - 0.1);
+		}
+	}
+}
diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc
new file mode 100644
index 0000000000..06b3ae03b3
--- /dev/null
+++ b/libs/surfaces/tranzport/wheel_modes.cc
@@ -0,0 +1,139 @@
+/*
+ *   Copyright (C) 2006 Paul Davis 
+ *   Copyright (C) 2007 Michael Taht
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ */
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <float.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#if HAVE_TRANZPORT_KERNEL_DRIVER
+#include <fcntl.h>
+#include <poll.h>
+#endif
+
+#include <pbd/pthread_utils.h>
+
+#include <ardour/route.h>
+#include <ardour/audio_track.h>
+#include <ardour/session.h>
+#include <ardour/tempo.h>
+#include <ardour/location.h>
+#include <ardour/dB.h>
+
+#include <tranzport_control_protocol.h>
+
+using namespace ARDOUR;
+using namespace std;
+using namespace sigc;
+using namespace PBD;
+
+#include "i18n.h"
+
+#include <pbd/abstract_ui.cc>
+
+void
+TranzportControlProtocol::next_wheel_shift_mode ()
+{
+switch (wheel_shift_mode) {
+	case WheelShiftGain:
+		wheel_shift_mode = WheelShiftPan;
+		break;
+	case WheelShiftPan:
+		wheel_shift_mode = WheelShiftMaster;
+		break;
+	case WheelShiftMaster:
+		wheel_shift_mode = WheelShiftGain;
+		break;
+	case WheelShiftMarker: // Not done yet, disabled
+		wheel_shift_mode = WheelShiftGain;
+		break;
+	}
+
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::next_wheel_mode ()
+{
+	switch (wheel_mode) {
+	case WheelTimeline:
+		wheel_mode = WheelScrub;
+		break;
+	case WheelScrub:
+		wheel_mode = WheelShuttle;
+		break;
+	case WheelShuttle:
+		wheel_mode = WheelTimeline;
+	}
+
+	show_wheel_mode ();
+}
+
+void
+TranzportControlProtocol::show_wheel_mode ()
+{
+	string text;
+
+	// if(session->transport_speed() != 0) {
+	//    if session-transport_speed() < 1.0) show_big_bar/beat
+	//    if ? greater. dont
+
+	if(session->transport_speed() != 0) {
+		show_mini_meter(); 
+	} else {
+		
+		switch (wheel_mode) {
+		case WheelTimeline:
+			text = "Time";
+			break;
+		case WheelScrub:
+			text = "Scrb";
+			break;
+		case WheelShuttle:
+			text = "Shtl";
+			break;
+		}
+		
+		switch (wheel_shift_mode) {
+		case WheelShiftGain:
+			text += ":Gain";
+			break;
+					
+		case WheelShiftPan:
+			text += ":Pan ";
+			break;
+					
+		case WheelShiftMaster:
+			text += ":Mstr";
+			break;
+					
+		case WheelShiftMarker:
+			text += ":Mrkr";
+			break;
+		}
+		
+		print (1, 0, text.c_str());
+	} 
+}