diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj
index b757af6815..67098011cf 100644
--- a/MSVCardour3/Ardour3.vcproj
+++ b/MSVCardour3/Ardour3.vcproj
@@ -1323,10 +1323,6 @@
 				RelativePath="..\gtk2_ardour\tempo_dialog.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\tempo_lines.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\time_axis_view.cc"
 				>
@@ -1606,7 +1602,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\canvas_vars.h"
+				RelativePath="..\gtk2_ardour\canvas_vars.inc.h"
 				>
 			</File>
 			<File
@@ -1645,10 +1641,6 @@
 				RelativePath="..\gtk2_ardour\crossfade_edit.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\crossfade_view.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\cursor_context.h"
 				>
@@ -1682,7 +1674,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\editing_syms.h"
+				RelativePath="..\gtk2_ardour\editing_syms.inc.h"
 				>
 			</File>
 			<File
@@ -1942,7 +1934,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\luasignal_syms.h"
+				RelativePath="..\gtk2_ardour\luasignal_syms.inc.h"
 				>
 			</File>
 			<File
@@ -2537,10 +2529,6 @@
 				RelativePath="..\gtk2_ardour\tempo_dialog.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\tempo_lines.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\time_axis_view.h"
 				>
@@ -2610,7 +2598,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\ui_config_vars.h"
+				RelativePath="..\gtk2_ardour\ui_config_vars.inc.h"
 				>
 			</File>
 			<File
diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
index 64ec9120b6..cd5d080a90 100644
--- a/gtk2_ardour/ardour2_ui_dark_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
@@ -2,7 +2,7 @@
 # This is the GTK style file for Ardour
 #
 
-style "very_small_text"
+style "smaller_text"
 {
  	font_name = "%FONT_SMALLER%"
 }
@@ -431,7 +431,7 @@ style "transport_rec_button_alternate"
 	bg[ACTIVE] = { 0.91, 0.68, 0.68 }
 }
 
-style "shuttle_control" = "very_small_text"
+style "shuttle_control" = "smaller_text"
 {
 	fg[NORMAL] = { 0.85, 0.92, 0.98 }
 	fg[ACTIVE] = { 0.85, 0.92, 0.98 }
@@ -1060,7 +1060,7 @@ style "selected_strip_frame"
 	bg[NORMAL] = { 0.79, 0.28, 0.18 }
 }
 
-style "flashing_alert" = "very_small_text"
+style "flashing_alert" = "smaller_text"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 	bg[NORMAL] = { 0.26, 0.26, 0.31 }
diff --git a/gtk2_ardour/ardour2_ui_light_sae.rc.in b/gtk2_ardour/ardour2_ui_light_sae.rc.in
index 2cd6360fc4..91b4eeef6a 100644
--- a/gtk2_ardour/ardour2_ui_light_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_light_sae.rc.in
@@ -434,7 +434,7 @@ style "transport_rec_button_alternate"
 	bg[ACTIVE] = { 0.91, 0.68, 0.68 }
 }
 
-style "shuttle_control" = "very_small_text"
+style "shuttle_control" = "smaller_text"
 {
 	fg[NORMAL] = { 0.85, 0.92, 0.98 }
 	fg[ACTIVE] = { 0.85, 0.92, 0.98 }
@@ -1064,7 +1064,7 @@ style "selected_strip_frame"
 	bg[NORMAL] = { 0.79, 0.28, 0.18 }
 }
 
-style "flashing_alert" = "very_small_text"
+style "flashing_alert" = "smaller_text"
 {
 	fg[NORMAL] = { 0, 0, 0 }
 	bg[NORMAL] = { 0.80, 0.80, 0.80 }
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index c1dfbdc184..a4d3a2ccf6 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -2393,7 +2393,10 @@ AudioClock::dpi_reset ()
 	 */
 	first_width = 0;
 	first_height = 0;
-	queue_resize ();
+
+	if (get_realized ()) {
+		queue_resize ();
+	}
 }
 
 void
diff --git a/gtk2_ardour/audio_trigger_properties_box.h b/gtk2_ardour/audio_trigger_properties_box.h
index 94e061f231..8b03b17836 100644
--- a/gtk2_ardour/audio_trigger_properties_box.h
+++ b/gtk2_ardour/audio_trigger_properties_box.h
@@ -22,6 +22,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
 
 #include "ardour/ardour.h"
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 24d582c039..2c2bb7effe 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -225,6 +225,19 @@ AutomationLine::hide ()
 	set_visibility (AutomationLine::VisibleAspects (_visible & ~Line));
 }
 
+void
+AutomationLine::hide_all ()
+{
+	set_visibility (AutomationLine::VisibleAspects (0));
+}
+
+void
+AutomationLine::show ()
+{
+	/* hide everything */
+	set_visibility (AutomationLine::VisibleAspects (~0));
+}
+
 double
 AutomationLine::control_point_box_size ()
 {
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index aa16f88add..03fa06aaea 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -118,6 +118,8 @@ public:
 	void remove_visibility (VisibleAspects);
 
 	void hide ();
+	void hide_all ();
+	void show ();
 	void set_height (guint32);
 
 	bool get_uses_gain_mapping () const;
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 3caa3ced87..5a59959355 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -33,6 +33,7 @@
 #include "pbd/xml++.h"
 #include "pbd/signals.h"
 
+#include "ardour/automation_control.h"
 #include "ardour/session_handle.h"
 
 #include "gui_object.h"
diff --git a/gtk2_ardour/beatbox_gui.cc b/gtk2_ardour/beatbox_gui.cc
index aeb15cd74b..a26336d739 100644
--- a/gtk2_ardour/beatbox_gui.cc
+++ b/gtk2_ardour/beatbox_gui.cc
@@ -802,7 +802,7 @@ StepView::set_timing_text ()
 	if (_step.offset() == Temporal::Beats()) {
 		text->set (X_("0"));
 	} else {
-		const int64_t gcd = boost::integer::gcd (_step.offset().to_ticks(), int64_t (1920));
+		const int64_t gcd = std::gcd (_step.offset().to_ticks(), int64_t (1920));
 		const int64_t n = _step.offset().to_ticks() / gcd;
 		const int64_t d = 1920 / gcd;
 		text->set (string_compose ("%1/%2", n, d));
diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 33b9dfdccd..6470dcfa49 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.inc.h
similarity index 98%
rename from gtk2_ardour/canvas_vars.h
rename to gtk2_ardour/canvas_vars.inc.h
index 51bb5ca4f4..98204e19cf 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.inc.h
@@ -22,8 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-CANVAS_FONT_VARIABLE(SmallFont, "small font")
+CANVAS_FONT_VARIABLE(VerySmallFont, "very small font")
 CANVAS_FONT_VARIABLE(SmallerFont, "smaller font")
+CANVAS_FONT_VARIABLE(SmallFont, "small font")
 CANVAS_FONT_VARIABLE(NormalFont, "normal font")
 CANVAS_FONT_VARIABLE(BigFont, "big font")
 CANVAS_FONT_VARIABLE(LargeFont, "large font")
diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index c38f5b30a2..26637b0df4 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -290,7 +290,12 @@ style "status_bar_box"
         bg[NORMAL] = @background
 }
 
-style "very_small_text"
+style "smaller_text"
+{
+	font_name = "@FONTFAMILY@ @FONT_VERYSMALL@"
+}
+
+style "smaller_text"
 {
 	font_name = "@FONTFAMILY@ @FONT_SMALLER@"
 }
@@ -386,7 +391,7 @@ style "verbose_canvas_cursor" = "big_bold_text"
 {
 }
 
-style "marker_text" = "small text"
+style "marker_text" = "small_text"
 {
 }
 
@@ -400,7 +405,7 @@ style "midi_tracer_textview" = "medium_monospace_text"
 
 }
 
-style "time_axis_view_item_name" = "very small text"
+style "time_axis_view_item_name" = "smaller_text"
 {
 }
 
@@ -409,7 +414,7 @@ style "midi_tracer_textview" = "medium_monospace_text"
 
 }
 
-style "time_axis_view_item_name" = "very small text"
+style "time_axis_view_item_name" = "smaller_text"
 {
 }
 style "contrasting_popup" = "medium_monospace_text"
@@ -506,15 +511,15 @@ style "meterbridge_label" = "small_text"
 {
 }
 
-style "midi_device" = "very_small_text"
+style "midi_device" = "smaller_text"
 {
 }
 
-style "solo_isolate" = "very_small_text"
+style "solo_isolate" = "smaller_text"
 {
 }
 
-style "solo_safe" = "very_small_text"
+style "solo_safe" = "smaller_text"
 {
 }
 
@@ -547,7 +552,7 @@ style "midi_channel_selector_button"
 	fg[ACTIVE] = @light_text_on_dark
 }
 
-style "shuttle_control" = "very_small_text"
+style "shuttle_control" = "smaller_text"
 {
 	fg[NORMAL] = @control_text2
 	fg[ACTIVE] = @control_text2
@@ -606,7 +611,7 @@ style "font_scale_slider" = "default"
   bg[NORMAL] = shade(1.4, @background)
 }
 
-style "very_small_bright_when_active" = "very_small_text"
+style "very_small_bright_when_active" = "smaller_text"
 {
 	fg[NORMAL] = @foreground
 	bg[NORMAL] = @background
@@ -761,14 +766,14 @@ style "small_red_on_black_entry"  = "small_bold_text"
 	bg[ACTIVE] = @bases
 }
 
-style "audio_bus_base" = "very_small_text"
+style "audio_bus_base" = "smaller_text"
 {
 	fg[NORMAL] = @foreground
 	bg[NORMAL] = @audio_bus
 	bg[ACTIVE] = @background
 }
 
-style "foldback_bus_base" = "very_small_text"
+style "foldback_bus_base" = "smaller_text"
 {
 	fg[NORMAL] = @foreground
 	bg[NORMAL] = @foldback_bg
@@ -933,7 +938,7 @@ style "plugin_slider"
 	text[PRELIGHT] = @texts
 }
 
-style "processor_control_button"  = "very_small_text"
+style "processor_control_button"  = "smaller_text"
 {
 }
 
@@ -961,7 +966,7 @@ style "inspector_track_list_display" = "track_list_display"
 
 }
 
-style "processor_list" = "very_small_text"
+style "processor_list" = "smaller_text"
 {
 	bg[NORMAL] = @bases
 	bg[ACTIVE] = shade (1.8, @fg_selected)
@@ -1002,7 +1007,7 @@ style "selected_strip_frame"
 	bg[NORMAL] = darker(@bright_indicator)
 }
 
-style "flashing_alert" = "very_small_text"
+style "flashing_alert" = "smaller_text"
 {
 	GtkButton::child-displacement-x = 0
 	GtkButton::child-displacement-y = 0
diff --git a/gtk2_ardour/configuration_metadata.h b/gtk2_ardour/configuration_metadata.inc.h
similarity index 100%
rename from gtk2_ardour/configuration_metadata.h
rename to gtk2_ardour/configuration_metadata.inc.h
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index dea7c37642..8daa8d5f36 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -28,12 +28,17 @@
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
+#include <gtkmm/table.h>
 
 #include "canvas/canvas.h"
+#include "canvas/poly_line.h"
 
 #include "evoral/Curve.h"
+#include "ardour/automation_list.h"
 #include "ardour/session_handle.h"
 
+#include "waveview/wave_view.h"
+
 #include "ardour_dialog.h"
 
 namespace ARDOUR
diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
deleted file mode 100644
index 95a3883aec..0000000000
--- a/gtk2_ardour/crossfade_view.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Paul Davis <paul@linuxaudiosystems.com>
- * Copyright (C) 2005 Nick Mainsbridge <mainsbridge@gmail.com>
- * Copyright (C) 2005 Taybin Rutkin <taybin@taybin.com>
- * Copyright (C) 2006-2011 David Robillard <d@drobilla.net>
- * Copyright (C) 2007-2011 Carl Hetherington <carl@carlh.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; 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#pragma once
-
-#include <vector>
-#include "pbd/signals.h"
-#include "ardour/crossfade.h"
-
-#include "time_axis_view_item.h"
-
-class RouteTimeAxisView;
-class AudioRegionView;
-
-namespace ArdourCanvas {
-	class PolyLine;
-}
-
-class CrossfadeView : public TimeAxisViewItem
-{
-public:
-	CrossfadeView (ArdourCanvas::Container*,
-	               RouteTimeAxisView&,
-	               std::shared_ptr<ARDOUR::Crossfade>,
-	               double initial_samples_per_pixel,
-	               Gdk::Color& basic_color,
-	               AudioRegionView& leftview,
-	               AudioRegionView& rightview);
-
-	~CrossfadeView ();
-
-	std::shared_ptr<ARDOUR::Crossfade> crossfade;  // ok, let 'em have it
-
-	AudioRegionView& left_view;    // and these too
-	AudioRegionView& right_view;
-
-	void set_heights (double, double);
-
-	bool valid() const { return _valid; }
-	bool visible() const { return _visible; }
-	void set_valid (bool yn);
-
-	static PBD::Signal<void(CrossfadeView*)> CatchDeletion;
-
-	void fake_hide ();
-	void hide ();
-	void show ();
-	void horizontal_position_changed ();
-
-protected:
-	void reset_width_dependent_items (double pixel_width);
-
-private:
-	bool _valid;
-	bool _visible;
-	bool _all_in_view;
-	double _child_height;
-
-	ArdourCanvas::PolyLine *fade_in;
-	ArdourCanvas::PolyLine *fade_out;
-
-	void crossfade_changed (const PBD::PropertyChange&);
-	void crossfade_fades_changed ();
-	void active_changed ();
-	void redraw_curves ();
-	void color_handler ();
-};
-
diff --git a/gtk2_ardour/cue_editor.h b/gtk2_ardour/cue_editor.h
index a19ee57f34..b39f3bc696 100644
--- a/gtk2_ardour/cue_editor.h
+++ b/gtk2_ardour/cue_editor.h
@@ -89,7 +89,7 @@ class CueEditor : public EditingContext, public PBD::HistoryOwner, public sigc::
 	 */
 	void step_mouse_mode (bool next);
 	/** @return The current mouse mode (gain, object, range, timefx etc.)
-	 * (defined in editing_syms.h)
+	 * (defined in editing_syms.inc.h)
 	 */
 	Editing::MouseMode current_mouse_mode () const;
 	/** cue editors are *always* used for internal editing */
diff --git a/gtk2_ardour/cuebox_ui.h b/gtk2_ardour/cuebox_ui.h
index 2cb17babd5..be384c244a 100644
--- a/gtk2_ardour/cuebox_ui.h
+++ b/gtk2_ardour/cuebox_ui.h
@@ -22,6 +22,7 @@
 
 #include <gtkmm/window.h>
 #include <gtkmm/colorselection.h>
+#include <gtkmm/menu.h>
 
 #include "pbd/properties.h"
 
diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index 233040ff29..ace4f4f2bc 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -20,6 +20,7 @@
     <Option name="font-scale" value="102400"/>
   </UI>
   <Canvas>
+    <Option name="very small font" value="@FONT_VERYSMALL@"/>
     <Option name="small font" value="@FONT_SMALL@"/>
     <Option name="smaller font" value="@FONT_SMALLER@"/>
     <Option name="normal font" value="@FONT_NORMAL@"/>
diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 2c8e69e219..79585fa2c0 100644
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -44,14 +44,14 @@ namespace Editing {
 GridType
 str2gridtype (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return GridTypeBar;
 }
 
 #undef GRIDTYPE
 #define GRIDTYPE(s) N_(#s),
 const char *gridtypestrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef GRIDTYPE
@@ -63,14 +63,14 @@ const char *gridtypestrs[] = {
 SnapMode
 str2snapmode (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return SnapMagnetic;
 }
 
 #undef SNAPMODE
 #define SNAPMODE(s) N_(#s),
 const char *snapmodestrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef SNAPMODE
@@ -83,14 +83,14 @@ const char *snapmodestrs[] = {
 RegionListSortType
 str2regionlistsorttype (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return ByName;
 }
 
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(s) N_(#s),
 const char *regionlistsorttypestrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef REGIONLISTSORTTYPE
@@ -102,14 +102,14 @@ const char *regionlistsorttypestrs[] = {
 MouseMode
 str2mousemode (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return MouseObject;
 }
 
 #undef MOUSEMODE
 #define MOUSEMODE(s) N_(#s),
 const char *mousemodestrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef MOUSEMODE
@@ -121,14 +121,14 @@ const char *mousemodestrs[] = {
 ZoomFocus
 str2zoomfocus (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return ZoomFocusPlayhead;
 }
 
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) N_(#s),
 const char *zoomfocusstrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef ZOOMFOCUS
@@ -140,14 +140,14 @@ const char *zoomfocusstrs[] = {
 DisplayControl
 str2displaycontrol (const string & str) {
 	const char* type = str.c_str();
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	return FollowPlayhead;
 }
 
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(s) N_(#s),
 const char *displaycontrolstrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef DISPLAYCONTROL
@@ -157,7 +157,7 @@ const char *displaycontrolstrs[] = {
 #undef IMPORTMODE
 #define IMPORTMODE(s) N_(#s),
 const char *importmodestrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef IMPORTMODE
@@ -167,7 +167,7 @@ const char *importmodestrs[] = {
 #undef TEMPOEDITBEHAVIOR
 #define TEMPOEDITBEHAVIOR(s) N_(#s),
 const char *tempoeditbehaviorstrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef TEMPOEDITBEHAVIOR
@@ -176,7 +176,7 @@ const char *tempoeditbehaviorstrs[] = {
 #undef NOTENAMEDISPLAY
 #define NOTENAMEDISPLAY(s) N_(#s),
 const char *notenamedisplaystrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef NOTENAMEDISPLAY
@@ -185,7 +185,7 @@ const char *notenamedisplaystrs[] = {
 #undef MARKERCLICKBEHAVIOR
 #define MARKERCLICKBEHAVIOR(s) N_(#s),
 const char *markerclickbehaviorstrs[] = {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 	0
 };
 #undef MARKERCLICKBEHAVIOR
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 000768d9d9..54d0166c22 100644
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -50,7 +50,7 @@ namespace Editing {
 #undef GRIDTYPE
 #define GRIDTYPE(a) a,
 enum GridType {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 static const int      DRAW_VEL_AUTO = -1;
@@ -68,7 +68,7 @@ GridType str2gridtype(const std::string &);
 #undef SNAPMODE
 #define SNAPMODE(a) a,
 enum SnapMode {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *snapmodestrs[];
@@ -82,7 +82,7 @@ SnapMode str2snapmode(const std::string &);
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(a) a,
 enum RegionListSortType {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *regionlistsorttypestrs[];
@@ -96,7 +96,7 @@ RegionListSortType str2regionlistsorttype(const std::string &);
 #undef MOUSEMODE
 #define MOUSEMODE(a) a,
 enum MouseMode {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *mousemodestrs[];
@@ -110,7 +110,7 @@ MouseMode str2mousemode(const std::string &);
 #undef MIDIEDITMODE
 #define MIDIEDITMODE(a) a,
 enum MidiEditMode {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *midieditmodestrs[];
@@ -124,7 +124,7 @@ MidiEditMode str2midieditmode(const std::string &);
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(a) a,
 enum ZoomFocus {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *zoomfocusstrs[];
@@ -138,7 +138,7 @@ ZoomFocus str2zoomfocus(const std::string &);
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) a,
 enum DisplayControl {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *displaycontrolstrs[];
@@ -153,7 +153,7 @@ DisplayControl str2displaycontrol (const std::string &);
 #undef IMPORTMODE
 #define IMPORTMODE(a) a,
 enum ImportMode {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 #undef IMPORTMODE
@@ -163,7 +163,7 @@ enum ImportMode {
 #undef IMPORTPOSITION
 #define IMPORTPOSITION(a) a,
 enum ImportPosition {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 #undef IMPORTPOSITION
@@ -173,7 +173,7 @@ enum ImportPosition {
 #undef IMPORTDISPOSITION
 #define IMPORTDISPOSITION(a) a,
 enum ImportDisposition {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 #undef IMPORTDISPOSITION
@@ -183,7 +183,7 @@ enum ImportDisposition {
 #undef EDITPOINT
 #define EDITPOINT(a) a,
 enum EditPoint {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 #undef EDITPOINT
@@ -193,7 +193,7 @@ enum EditPoint {
 #undef INSERTTIMEOPT
 #define INSERTTIMEOPT(a) a,
 enum InsertTimeOption {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 #undef INSERTTIMEOPT
@@ -202,7 +202,7 @@ enum InsertTimeOption {
 #undef NOTENAMEDISPLAY
 #define NOTENAMEDISPLAY(a) a,
 enum NoteNameDisplay {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 
 extern const char *notenamedisplaystrs[];
@@ -214,7 +214,7 @@ inline const char* enum2str(NoteNameDisplay m) {return notenamedisplaystrs[m];}
 #undef MARKERCLICKBEHAVIOR
 #define MARKERCLICKBEHAVIOR(a) a,
 enum MarkerClickBehavior {
-	#include "editing_syms.h"
+	#include "editing_syms.inc.h"
 };
 #undef MARKERCLICKBEHAVIOR
 #define MARKERCLICKBEHAVIOR(a) /*empty*/
diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc
index bc72ec3e98..3c5d666a20 100644
--- a/gtk2_ardour/editing_context.cc
+++ b/gtk2_ardour/editing_context.cc
@@ -2469,6 +2469,9 @@ EditingContext::reset_zoom (samplecnt_t spp)
 
 	pending_visual_change.add (VisualChange::ZoomLevel);
 	pending_visual_change.samples_per_pixel = spp;
+	if (spp == 0.0) {
+		PBD::stacktrace (std::cerr, 12);
+	}
 	ensure_visual_change_idle_handler ();
 }
 
diff --git a/gtk2_ardour/editing_context.h b/gtk2_ardour/editing_context.h
index 4926f344b7..c6c13ad801 100644
--- a/gtk2_ardour/editing_context.h
+++ b/gtk2_ardour/editing_context.h
@@ -315,7 +315,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
 	void reset_point_selection ();
 
 	/** Set the mouse mode (gain, object, range, timefx etc.)
-	 * @param m Mouse mode (defined in editing_syms.h)
+	 * @param m Mouse mode (defined in editing_syms.inc.h)
 	 * @param force Perform the effects of the change even if no change is required
 	 * (ie even if the current mouse mode is equal to @p m)
 	 */
@@ -325,7 +325,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
 	 */
 	virtual void step_mouse_mode (bool next) = 0;
 	/** @return The current mouse mode (gain, object, range, timefx etc.)
-	 * (defined in editing_syms.h)
+	 * (defined in editing_syms.inc.h)
 	 */
 	Editing::MouseMode current_mouse_mode () const { return mouse_mode; }
 	virtual Editing::MouseMode effective_mouse_mode () const { return mouse_mode; }
@@ -571,7 +571,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
 
 	QuantizeDialog* quantize_dialog;
 
-	friend class TempoMapScope;
+	friend struct TempoMapScope;
 	virtual std::shared_ptr<Temporal::TempoMap const> start_local_tempo_map (std::shared_ptr<Temporal::TempoMap>);
 	virtual void end_local_tempo_map (std::shared_ptr<Temporal::TempoMap const>) { /* no-op by default */ }
 
diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.inc.h
similarity index 100%
rename from gtk2_ardour/editing_syms.h
rename to gtk2_ardour/editing_syms.inc.h
diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index b99f7ce178..28c97ea92e 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <gtkmm/box.h>
+#include <gtkmm/colorselection.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treemodel.h>
@@ -27,6 +29,9 @@
 
 #include "editor_component.h"
 
+#include "ardour/route_group.h"
+#include "ardour/session_handle.h"
+
 class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
 public:
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 414ba65220..8f42343bb8 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -134,7 +134,11 @@ Editor::initialize_rulers ()
 {
 	ruler_grabbed_widget = 0;
 
-	Pango::FontDescription font (UIConfiguration::instance().get_SmallerFont());
+#ifdef __APPLE__
+	Pango::FontDescription font (UIConfiguration::instance().get_VerySmallFont());
+#else
+	Pango::FontDescription font (UIConfiguration::instance().get_SmallFont());
+#endif
 	Pango::FontDescription larger_font (UIConfiguration::instance().get_SmallBoldFont());
 
 	_timecode_metric = new TimecodeMetric (this);
diff --git a/gtk2_ardour/editor_sections.cc b/gtk2_ardour/editor_sections.cc
index aa986b6308..5fe41c0338 100644
--- a/gtk2_ardour/editor_sections.cc
+++ b/gtk2_ardour/editor_sections.cc
@@ -284,13 +284,13 @@ EditorSections::selection_changed ()
 			/* OK */
 			break;
 		case Editing::MouseObject:
-			if (ActionManager::get_toggle_action ("MouseMode", "set-mouse-mode-object-range")->get_active ()) {
+			if (ActionManager::get_toggle_action (PublicEditor::instance().editor_name().c_str(), "set-mouse-mode-object-range")->get_active ()) {
 				/* smart mode; OK */
 				break;
 			}
 			/*fallthrough*/
 		default:
-			Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+			Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (PublicEditor::instance().editor_name().c_str(), X_("set-mouse-mode-range"));
 			ract->set_active (true);
 			break;
 	}
diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index 5de5189b3b..8d259e4e20 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -21,7 +21,11 @@
 
 #pragma once
 
+#include "ardour/session_handle.h"
+#include "ardour/types.h"
 #include "gtkmm2ext/cairo_widget.h"
+#include "pbd/property_basics.h"
+
 #include "editor_component.h"
 
 namespace ARDOUR {
@@ -29,6 +33,8 @@ namespace ARDOUR {
 }
 
 class Editor;
+class RegionView;
+class RouteTimeAxisView;
 
 /** Class to provide a visual summary of the contents of an editor window; represents
  *  the whole session as a set of lines, one per region view.
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index eaf7727098..58906dc47a 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -303,6 +303,7 @@ Editor::tempo_map_changed ()
 
 	 reset_metric_marks ();
 	 update_tempo_based_rulers ();
+	 update_section_rects();
 	 update_all_marker_lanes ();
 	 maybe_draw_grid_lines ();
 }
diff --git a/gtk2_ardour/ghost_event.h b/gtk2_ardour/ghost_event.h
index ed702973b5..76db97abff 100644
--- a/gtk2_ardour/ghost_event.h
+++ b/gtk2_ardour/ghost_event.h
@@ -1,6 +1,7 @@
 #ifndef __gtk2_ardour_ghost_event_h__
 #define __gtk2_ardour_ghost_event_h__
 
+#include <memory>
 #include <unordered_map>
 #include <sigc++/trackable.h>
 
diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 3a4f7cb462..ffc7c80e8b 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -192,7 +192,6 @@ MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv,
 	: GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos)
 	, _note_group (new ArdourCanvas::Container (group))
 	,  parent_mrv (rv)
-	, _optimization_iterator(events.end())
 {
 	_outline = UIConfiguration::instance().color ("ghost track midi outline");
 
@@ -298,7 +297,6 @@ MidiGhostRegion::add_note (NoteBase* n)
 {
 	GhostEvent* event = new GhostEvent (n, _note_group);
 	events.insert (make_pair (n->note(), event));
-	_optimization_iterator = events.end();
 
 	event->item->set_fill_color (UIConfiguration::instance().color_mod(n->base_color(), "ghost track midi fill"));
 	event->item->set_outline_color (_outline);
@@ -332,7 +330,6 @@ MidiGhostRegion::clear_events()
 {
 	_note_group->clear (true);
 	events.clear ();
-	_optimization_iterator = events.end();
 }
 
 /** Update the  positions of our representation of a note.
@@ -393,8 +390,6 @@ MidiGhostRegion::remove_note (NoteBase* note)
 
 	delete f->second;
 	events.erase (f);
-
-	_optimization_iterator = events.end ();
 }
 
 void
diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 417e9c1970..808b39727f 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -133,6 +133,5 @@ public:
 	GhostEvent* find_event (std::shared_ptr<GhostEvent::NoteType>);
 
 	GhostEvent::EventList events;
-	GhostEvent::EventList::iterator _optimization_iterator;
 };
 
diff --git a/gtk2_ardour/grid_lines.h b/gtk2_ardour/grid_lines.h
index 62de80a9ad..179e2298d4 100644
--- a/gtk2_ardour/grid_lines.h
+++ b/gtk2_ardour/grid_lines.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "canvas/container.h"
 #include "canvas/line_set.h"
 #include "canvas/ruler.h"
 #include "ardour/tempo.h"
diff --git a/gtk2_ardour/io_button.h b/gtk2_ardour/io_button.h
index 4cc87abfb7..d246d98cd0 100644
--- a/gtk2_ardour/io_button.h
+++ b/gtk2_ardour/io_button.h
@@ -26,6 +26,7 @@
 #include <gtkmm/menu.h>
 
 #include "ardour/data_type.h"
+#include "ardour/types.h"
 
 #include "widgets/ardour_button.h"
 
diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index cc4c32a9b3..da6b815e1d 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -22,6 +22,7 @@
 
 #include <string>
 
+#include <gtkmm/action.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/scrolledwindow.h>
diff --git a/gtk2_ardour/loudness_settings.h b/gtk2_ardour/loudness_settings.h
index 83a9d21a24..e270dc4f9f 100644
--- a/gtk2_ardour/loudness_settings.h
+++ b/gtk2_ardour/loudness_settings.h
@@ -19,6 +19,11 @@
 #ifndef _gtkardour_loudness_settings_h_
 #define _gtkardour_loudness_settings_h_
 
+#include <cstddef>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
 class XMLNode;
 
 struct CLoudnessPreset
diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc
index 3ff8a65338..27a7d7db92 100644
--- a/gtk2_ardour/luadialog.cc
+++ b/gtk2_ardour/luadialog.cc
@@ -591,6 +591,35 @@ protected:
 	Gtk::FileChooserWidget _fc;
 };
 
+class LuaDialogText : public LuaDialogWidget
+{
+public:
+	LuaDialogText (std::string const& key, std::string const& title, std::string const& dflt)
+		: LuaDialogWidget (key, title)
+	{
+		_text_view.set_wrap_mode (Gtk::WRAP_WORD);
+		_text_view.get_buffer()->set_text (dflt);
+
+		_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+
+        _scrolled_window.add(_text_view);
+	}
+
+	Gtk::Widget* widget ()
+	{
+		return &_scrolled_window;
+	}
+
+	void assign (luabridge::LuaRef* rv) const
+	{
+		(*rv)[_key] = std::string (_text_view.get_buffer()->get_text());
+	}
+
+protected:
+	Gtk::TextView _text_view;
+	Gtk::ScrolledWindow _scrolled_window;
+};
+
 /* *****************************************************************************
  * Lua Parameter Dialog
  */
@@ -659,6 +688,12 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
 				dflt = i.value ()["default"].cast<std::string> ();
 			}
 			w = new LuaDialogEntry (key, title, dflt);
+		} else if (type == "textarea") {
+			std::string dflt;
+			if (i.value ()["default"].isString ()) {
+				dflt = i.value ()["default"].cast<std::string> ();
+			}
+			w = new LuaDialogText (key, title, dflt);
 		} else if (type == "radio") {
 			std::string dflt;
 			if (!i.value ()["values"].isTable ()) {
diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index 647622a2c5..39728c274b 100644
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -365,7 +365,7 @@ LuaSignal
 str2luasignal (const std::string &str) {
 	const char* type = str.c_str();
 	if (0) { }
-#	include "luasignal_syms.h"
+#	include "luasignal_syms.inc.h"
 	else {
 		PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", str) << endmsg;
 		abort(); /*NOTREACHED*/
@@ -379,7 +379,7 @@ str2luasignal (const std::string &str) {
 #define SESSION(name,c) N_(#name),
 #define ENGINE(name,c) N_(#name),
 const char *luasignalstr[] = {
-#	include "luasignal_syms.h"
+#	include "luasignal_syms.inc.h"
 	0
 };
 
@@ -551,7 +551,7 @@ LuaInstance::register_hooks (lua_State* L)
 #define SESSION(name,c) .addConst (stringify(name), (LuaSignal::LuaSignal)LuaSignal::name)
 	luabridge::getGlobalNamespace (L)
 		.beginNamespace ("LuaSignal")
-#		include "luasignal_syms.h"
+#		include "luasignal_syms.inc.h"
 		.endNamespace ();
 #undef ENGINE
 #undef SESSION
@@ -1115,7 +1115,7 @@ LuaInstance::register_classes (lua_State* L, bool sandbox)
 		.addFunction ("set_" # var, &UIConfiguration::set_##var) \
 		.addProperty (#var, &UIConfiguration::get_##var, &UIConfiguration::set_##var)
 
-#include "ui_config_vars.h"
+#include "ui_config_vars.inc.h"
 
 #undef UI_CONFIG_VARIABLE
 		.endClass()
@@ -1147,7 +1147,7 @@ LuaInstance::register_classes (lua_State* L, bool sandbox)
 #define NOTENAMEDISPLAY(NAME) .addConst (stringify(NAME), (Editing::NoteNameDisplay)Editing::NAME)
 	luabridge::getGlobalNamespace (L)
 		.beginNamespace ("Editing")
-#		include "editing_syms.h"
+#		include "editing_syms.inc.h"
 		.endNamespace ();
 
 	if (!sandbox) {
@@ -2380,7 +2380,7 @@ LuaCallback::reconnect_object (T obj)
 #define SESSION(n,c) else if (i == LuaSignal::n) { if (_session) { connect (LuaSignal::n, _session, &(_session->c)); } }
 #define STATIC(n,c) else if (i == LuaSignal::n) { connect (LuaSignal::n, obj, c); }
 			if (0) {}
-#			include "luasignal_syms.h"
+#			include "luasignal_syms.inc.h"
 			else {
 				PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", i) << endmsg;
 				abort(); /*NOTREACHED*/
diff --git a/gtk2_ardour/luasignal.h b/gtk2_ardour/luasignal.h
index 7193050dab..0196625b1f 100644
--- a/gtk2_ardour/luasignal.h
+++ b/gtk2_ardour/luasignal.h
@@ -17,6 +17,9 @@
  */
 #ifndef _luasignal_h_
 #define _luasignal_h_
+
+#include <string>
+
 namespace LuaSignal {
 
 #define ENGINE(name,c) name,
@@ -24,7 +27,7 @@ namespace LuaSignal {
 #define SESSION(name,c) name,
 
 	enum LuaSignal {
-#		include "luasignal_syms.h"
+#		include "luasignal_syms.inc.h"
 		LAST_SIGNAL
 	};
 
diff --git a/gtk2_ardour/luasignal_syms.h b/gtk2_ardour/luasignal_syms.inc.h
similarity index 100%
rename from gtk2_ardour/luasignal_syms.h
rename to gtk2_ardour/luasignal_syms.inc.h
diff --git a/gtk2_ardour/luawindow.h b/gtk2_ardour/luawindow.h
index 2f9be48f7c..eb42842da7 100644
--- a/gtk2_ardour/luawindow.h
+++ b/gtk2_ardour/luawindow.h
@@ -40,6 +40,8 @@
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
 
+#include "ardour_window.h"
+
 class LuaWindow :
 	public ArdourWindow,
 	public PBD::ScopedConnectionList
diff --git a/gtk2_ardour/midi_cue_editor.cc b/gtk2_ardour/midi_cue_editor.cc
index a4f9054607..73bfdc354e 100644
--- a/gtk2_ardour/midi_cue_editor.cc
+++ b/gtk2_ardour/midi_cue_editor.cc
@@ -466,7 +466,7 @@ MidiCueEditor::toolbox ()
 }
 
 void
-MidiCueEditor::data_captured (timecnt_t total_duration)
+MidiCueEditor::data_captured (samplecnt_t total_duration)
 {
 	data_capture_duration = total_duration;
 
@@ -474,14 +474,13 @@ MidiCueEditor::data_captured (timecnt_t total_duration)
 		Glib::signal_idle().connect (sigc::mem_fun (*this, &MidiCueEditor::idle_data_captured));
 	}
 
-	samplepos_t pos = data_capture_duration.end().samples();
-	_playhead_cursor->set_position (pos);
+	_playhead_cursor->set_position (data_capture_duration);
 }
 
 bool
 MidiCueEditor::idle_data_captured ()
 {
-	double where = duration_to_pixels (data_capture_duration);
+	double where = sample_to_pixel_unrounded (data_capture_duration);
 
 	if (where > _visible_canvas_width * 0.80) {
 		set_samples_per_pixel (samples_per_pixel * 1.5);
@@ -494,95 +493,19 @@ MidiCueEditor::idle_data_captured ()
 	return false;
 }
 
-void
-MidiCueEditor::set_box (std::shared_ptr<ARDOUR::TriggerBox> b)
-{
-	capture_connections.drop_connections ();
-	idle_update_queued.store (0);
-
-	if (b) {
-		b->Captured.connect (capture_connections, invalidator (*this), std::bind (&MidiCueEditor::data_captured, this, _1), gui_context());
-		/* Don't bind a shared_ptr<TriggerBox> within the lambda */
-		TriggerBox* tb (b.get());
-		b->RecEnableChanged.connect (capture_connections, invalidator (*this), [&, tb]() { box_rec_enable_change (*tb); }, gui_context());
-	}
-}
-
 void
 MidiCueEditor::box_rec_enable_change (ARDOUR::TriggerBox const & b)
 {
-	if (b.record_enabled()) {
-		view->begin_write();
-	} else {
-		view->end_write ();
-	}
 }
 
 void
 MidiCueEditor::trigger_rec_enable_change (ARDOUR::Trigger const & t)
 {
-	if (t.armed()) {
-		view->begin_write();
-	} else {
+	if (!t.armed()) {
 		view->end_write ();
 	}
 }
 
-void
-MidiCueEditor::set_track (std::shared_ptr<ARDOUR::MidiTrack> t)
-{
-	_track = t;
-
-	view->set_track (t);
-
-	_update_connection.disconnect ();
-	capture_connections.drop_connections ();
-
-	if (t) {
-		set_box (t->triggerbox());
-		_update_connection = Timers::rapid_connect (sigc::mem_fun (*this, &MidiCueEditor::maybe_update));
-		_track->DropReferences.connect (track_connection, invalidator (*this), std::bind (&MidiCueEditor::set_track, this, nullptr), gui_context());
-	} else {
-		set_box (nullptr);
-	}
-}
-
-void
-MidiCueEditor::set_region (std::shared_ptr<ARDOUR::MidiRegion> r)
-{
-	if (!r) {
-		view->set_region (nullptr);
-		return;
-	}
-
-	view->set_region (r);
-
-	/* Compute zoom level to show entire source plus some margin if possible */
-
-	Temporal::timecnt_t duration = Temporal::timecnt_t (r->midi_source()->length().beats());
-
-	bool provided = false;
-	std::shared_ptr<Temporal::TempoMap> map;
-	std::shared_ptr<SMFSource> smf (std::dynamic_pointer_cast<SMFSource> (r->midi_source()));
-
-	if (smf) {
-		map = smf->tempo_map (provided);
-	}
-
-	if (!provided) {
-		map.reset (new Temporal::TempoMap (Temporal::Tempo (120, 4), Temporal::Meter (4, 4)));
-	}
-
-	{
-		EditingContext::TempoMapScope tms (*this, map);
-		double width = bg->width();
-		samplecnt_t samples = duration.samples();
-
-		samplecnt_t spp = floor (samples / width);
-		reset_zoom (spp);
-	}
-}
-
 bool
 MidiCueEditor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
 {
@@ -1697,8 +1620,9 @@ MidiCueEditor::enter_handler (ArdourCanvas::Item* item, GdkEvent* ev, ItemType i
 	switch (item_type) {
 	case AutomationTrackItem:
 		/* item is the base rectangle */
-		al = reinterpret_cast<EditorAutomationLine*> (item->get_data ("line"));
-		al->track_entered ();
+		if (view) {
+			view->automation_entry ();
+		}
 		break;
 
 	case EditorAutomationLineItem:
@@ -1740,7 +1664,7 @@ MidiCueEditor::leave_handler (ArdourCanvas::Item* item, GdkEvent* ev, ItemType i
 			}
 		}
 		if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
-			al->track_exited ();
+			view->automation_leave ();
 		}
 		break;
 
@@ -1761,3 +1685,98 @@ MidiCueEditor::selectable_owners()
 
 	return std::list<SelectableOwner*> ();
 }
+
+void
+MidiCueEditor::trigger_prop_change (PBD::PropertyChange const & what_changed)
+{
+	if (what_changed.contains (Properties::region)) {
+		std::shared_ptr<MidiRegion> mr = std::dynamic_pointer_cast<MidiRegion> (ref.trigger()->the_region());
+		if (mr) {
+			set_region (mr);
+		}
+	}
+}
+
+void
+MidiCueEditor::set (TriggerReference & tref)
+{
+	_update_connection.disconnect ();
+	object_connections.drop_connections ();
+
+	ref = tref;
+
+	idle_update_queued.store (0);
+
+	ref.box()->Captured.connect (object_connections, invalidator (*this), std::bind (&MidiCueEditor::data_captured, this, _1), gui_context());
+	/* Don't bind a shared_ptr<TriggerBox> within the lambda */
+	TriggerBox* tb (ref.box().get());
+	tb->RecEnableChanged.connect (object_connections, invalidator (*this), [&, tb]() { box_rec_enable_change (*tb); }, gui_context());
+
+	Stripable* st = dynamic_cast<Stripable*> (ref.box()->owner());
+	assert (st);
+	_track = std::dynamic_pointer_cast<MidiTrack> (st->shared_from_this());
+	assert (_track);
+
+	view->set_track (_track);
+
+	_update_connection = Timers::rapid_connect (sigc::mem_fun (*this, &MidiCueEditor::maybe_update));
+	_track->DropReferences.connect (object_connections, invalidator (*this), std::bind (&MidiCueEditor::unset, this), gui_context());
+	ref.trigger()->PropertyChanged.connect (object_connections, invalidator (*this), std::bind (&MidiCueEditor::trigger_prop_change, this, _1), gui_context());
+
+	if (ref.trigger()->the_region()) {
+
+		std::shared_ptr<MidiRegion> mr = std::dynamic_pointer_cast<MidiRegion> (ref.trigger()->the_region());
+
+		if (mr) {
+			set_region (mr);
+		}
+	}
+}
+
+void
+MidiCueEditor::unset ()
+{
+	_update_connection.disconnect();
+	object_connections.drop_connections ();
+	_track.reset ();
+	view->set_region (nullptr);
+	ref = TriggerReference ();
+}
+
+void
+MidiCueEditor::set_region (std::shared_ptr<ARDOUR::MidiRegion> r)
+{
+	if (!r) {
+		view->set_region (nullptr);
+		return;
+	}
+
+	view->set_region (r);
+
+	/* Compute zoom level to show entire source plus some margin if possible */
+
+	Temporal::timecnt_t duration = Temporal::timecnt_t (r->midi_source()->length().beats());
+
+	std::cerr << "new region: " << duration << std::endl;
+
+	bool provided = false;
+	std::shared_ptr<Temporal::TempoMap> map;
+	std::shared_ptr<SMFSource> smf (std::dynamic_pointer_cast<SMFSource> (r->midi_source()));
+
+	if (smf) {
+		map = smf->tempo_map (provided);
+	}
+
+	if (!provided) {
+		map.reset (new Temporal::TempoMap (Temporal::Tempo (120, 4), Temporal::Meter (4, 4)));
+	}
+
+	{
+		EditingContext::TempoMapScope tms (*this, map);
+		double width = bg->width();
+		samplecnt_t samples = duration.samples();
+		std::cerr << "new spp from " << samples << " / " << width << std::endl;
+		samplecnt_t spp = floor (samples / width);
+		reset_zoom (spp);
+	}
+}
diff --git a/gtk2_ardour/midi_cue_editor.h b/gtk2_ardour/midi_cue_editor.h
index c541e7175e..51ce9740de 100644
--- a/gtk2_ardour/midi_cue_editor.h
+++ b/gtk2_ardour/midi_cue_editor.h
@@ -72,9 +72,8 @@ class MidiCueEditor : public CueEditor
 	int32_t get_grid_beat_divisions (Editing::GridType gt) const { return 1; }
 	int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const { return 1; }
 
+	void set (ARDOUR::TriggerReference&);
 	void set_region (std::shared_ptr<ARDOUR::MidiRegion>);
-	void set_box (std::shared_ptr<ARDOUR::TriggerBox>);
-	void set_track (std::shared_ptr<ARDOUR::MidiTrack>);
 
 	ArdourCanvas::ScrollGroup* get_hscroll_group () const { return h_scroll_group; }
 	ArdourCanvas::ScrollGroup* get_cursor_scroll_group () const { return cursor_scroll_group; }
@@ -140,6 +139,7 @@ class MidiCueEditor : public CueEditor
 	void on_samples_per_pixel_changed ();
 
  private:
+	ARDOUR::TriggerReference ref;
 	std::shared_ptr<ARDOUR::MidiTrack> _track;
 	ArdourCanvas::GtkCanvasViewport* _canvas_viewport;
 	ArdourCanvas::GtkCanvas* _canvas;
@@ -208,17 +208,20 @@ class MidiCueEditor : public CueEditor
 	void stop_canvas_autoscroll ();
 
 	sigc::connection _update_connection;
-	PBD::ScopedConnection track_connection;
+	PBD::ScopedConnectionList object_connections;
 	void maybe_update ();
+	void trigger_prop_change (PBD::PropertyChange const &);
+
+	void unset ();
 
 	void visual_changer (const VisualChange&);
 	void bindings_changed ();
 
-	void data_captured (Temporal::timecnt_t);
+	void data_captured (samplecnt_t);
 	bool idle_data_captured ();
 	std::atomic<int> idle_update_queued;
 	PBD::ScopedConnectionList capture_connections;
-	Temporal::timecnt_t data_capture_duration;
+	samplecnt_t data_capture_duration;
 };
 
 
diff --git a/gtk2_ardour/midi_cue_view.cc b/gtk2_ardour/midi_cue_view.cc
index 374b39a15a..5669e3ede4 100644
--- a/gtk2_ardour/midi_cue_view.cc
+++ b/gtk2_ardour/midi_cue_view.cc
@@ -20,9 +20,12 @@
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
 #include "ardour/triggerbox.h"
+#include "ardour/types.h"
 
 #include "gtkmm2ext/utils.h"
 
+#include "canvas/box.h"
+#include "canvas/button.h"
 #include "canvas/debug.h"
 
 #include "editing_context.h"
@@ -39,6 +42,7 @@
 
 #include "pbd/i18n.h"
 
+using namespace ARDOUR;
 using namespace Gtkmm2ext;
 
 MidiCueView::MidiCueView (std::shared_ptr<ARDOUR::MidiTrack> mt,
@@ -48,12 +52,14 @@ MidiCueView::MidiCueView (std::shared_ptr<ARDOUR::MidiTrack> mt,
                           MidiViewBackground&      bg,
                           uint32_t                 basic_color)
 	: MidiView (mt, parent, ec, bg, basic_color)
-	, velocity_base (nullptr)
+	, active_automation (nullptr)
 	, velocity_display (nullptr)
 	, _slot_index (slot_index)
 {
 	CANVAS_DEBUG_NAME (_note_group, X_("note group for MIDI cue"));
 
+	_needs_active_notes_for_rec_enabled_track = true;
+
 	/* Containers don't get canvas events, so we need an invisible rect
 	 * that will. It will be resized as needed sothat it always covers the
 	 * entire canvas/view.
@@ -73,38 +79,72 @@ MidiCueView::MidiCueView (std::shared_ptr<ARDOUR::MidiTrack> mt,
 	automation_group->set_fill_color (UIConfiguration::instance().color ("midi automation track fill"));
 	automation_group->set_data ("linemerger", this);
 
-	velocity_base = new ArdourCanvas::Rectangle (&parent);
-	CANVAS_DEBUG_NAME (velocity_base, "cue velocity base");
-	velocity_display = new MidiCueVelocityDisplay (editing_context(), midi_context(), *this, *velocity_base, 0x312244ff);
+	button_bar = new ArdourCanvas::Box (&parent, ArdourCanvas::Box::Horizontal);
+	CANVAS_DEBUG_NAME (button_bar, "button bar");
+	button_bar->set_spacing (12.);
+	/* Right-side padding only */
+	button_bar->set_padding (0., 0., 0., 24.);
+	button_bar->set_margin (5., 5., 5., 5.);
 
-	for (auto & ev : _events) {
-		velocity_display->add_note (ev.second);
-	}
+	Pango::FontDescription button_font = UIConfiguration::instance().get_NormalFont();
+
+	velocity_button = new ArdourCanvas::Button (button_bar, _("Velocity"), button_font);
+	velocity_button->text()->set_color (UIConfiguration::instance().color ("neutral:foreground"));
+	CANVAS_DEBUG_NAME (velocity_button, "velocity button");
+
+	bender_button = new ArdourCanvas::Button (button_bar, _("Bender"), button_font);
+	bender_button->text()->set_color (UIConfiguration::instance().color ("neutral:foreground"));
+	CANVAS_DEBUG_NAME (bender_button, "bender button");
+
+	pressure_button = new ArdourCanvas::Button (button_bar, _("Pressure"), button_font);
+	pressure_button->text()->set_color (UIConfiguration::instance().color ("neutral:foreground"));
+	CANVAS_DEBUG_NAME (pressure_button, "pressure button");
+
+	expression_button = new ArdourCanvas::Button (button_bar, _("Expression"), button_font);
+	expression_button->text()->set_color (UIConfiguration::instance().color ("neutral:foreground"));
+	CANVAS_DEBUG_NAME (expression_button, "expression button");
+
+	modulation_button = new ArdourCanvas::Button (button_bar, _("Modulation"), button_font);
+	modulation_button->text()->set_color (UIConfiguration::instance().color ("neutral:foreground"));
+	CANVAS_DEBUG_NAME (modulation_button, "modulation button");
+
+	velocity_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &MidiCueView::automation_button_event), ARDOUR::MidiVelocityAutomation, 0));
+	pressure_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &MidiCueView::automation_button_event), ARDOUR::MidiChannelPressureAutomation, 0));
+	bender_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &MidiCueView::automation_button_event), ARDOUR::MidiPitchBenderAutomation, 0));
+	modulation_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &MidiCueView::automation_button_event), ARDOUR::MidiCCAutomation, MIDI_CTL_MSB_MODWHEEL));
+	expression_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &MidiCueView::automation_button_event), ARDOUR::MidiCCAutomation, MIDI_CTL_MSB_EXPRESSION));
 
 	set_extensible (true);
 
-	Evoral::Parameter fully_qualified_param (ARDOUR::MidiCCAutomation, 0, MIDI_CTL_MSB_MODWHEEL);
-	show_automation (fully_qualified_param);
+	/* show velocity by default */
+
+	update_automation_display (Evoral::Parameter (MidiVelocityAutomation, 0, 0), SelectionSet);
+}
+
+MidiCueView::~MidiCueView ()
+{
+	delete velocity_display;
 }
 
 void
 MidiCueView::set_height (double h)
 {
-	double note_area_height = ceil (h / 2.);
-	double velocity_height = ceil ((h - note_area_height) / 2.);
-	double automation_height = h - note_area_height - velocity_height;
+	double bbw, bbh;
+	button_bar->size_request (bbw, bbh);
+
+	double note_area_height = ceil ((h - bbh) / 2.);
+	double automation_height = ceil (h - bbh - note_area_height);
 
 	event_rect->set (ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, note_area_height));
-	midi_context().set_size (ArdourCanvas::COORD_MAX, note_area_height);
+	midi_context().set_size (midi_context().width(), note_area_height);
 
-	velocity_base->set_position (ArdourCanvas::Duple (0., note_area_height));
-	velocity_base->set (ArdourCanvas::Rect (0., 0., ArdourCanvas::COORD_MAX, velocity_height));
-
-	automation_group->set_position (ArdourCanvas::Duple (0., note_area_height + velocity_height));
+	automation_group->set_position (ArdourCanvas::Duple (0., note_area_height));
 	automation_group->set (ArdourCanvas::Rect (0., 0., ArdourCanvas::COORD_MAX, automation_height));
 
-	if (automation_line) {
-		automation_line->set_height (automation_height);
+	button_bar->size_allocate (ArdourCanvas::Rect (0., note_area_height + automation_height, ArdourCanvas::COORD_MAX, note_area_height + automation_height + bbh));
+
+	for (auto & ads : automation_map) {
+		ads.second.set_height (automation_height);
 	}
 
 	view_changed ();
@@ -235,8 +275,31 @@ MidiCueView::update_hit (Hit* h)
 	}
 }
 
+bool
+MidiCueView::automation_button_event (GdkEvent* ev, Evoral::ParameterType type, int id)
+{
+	SelectionOperation op = ArdourKeyboard::selection_type (ev->button.state);
+
+	switch (ev->type) {
+	case GDK_BUTTON_RELEASE:
+		automation_button_click (type, id, op);
+		break;
+	default:
+		break;
+	}
+
+	return false;
+}
+
 void
-MidiCueView::show_automation (Evoral::Parameter const & param)
+MidiCueView::automation_button_click (Evoral::ParameterType type, int id, SelectionOperation op)
+{
+#warning paul allow channel selection (2nd param)
+	update_automation_display (Evoral::Parameter (type, 0, id), op);
+}
+
+void
+MidiCueView::update_automation_display (Evoral::Parameter const & param, SelectionOperation op)
 {
 	using namespace ARDOUR;
 
@@ -244,52 +307,110 @@ MidiCueView::show_automation (Evoral::Parameter const & param)
 		return;
 	}
 
-	if (param.type() == NullAutomation) {
-		return;
-	}
-
-//	if (automation_line && automation_line->param() == param) {
-//		return;
-//	}
-
-	automation_line.reset ();
-	automation_control.reset ();
-
-	std::shared_ptr<AutomationControl> control;
-
 	switch (param.type()) {
-
 	case MidiCCAutomation:
 	case MidiPgmChangeAutomation:
 	case MidiPitchBenderAutomation:
 	case MidiChannelPressureAutomation:
 	case MidiNotePressureAutomation:
-	case MidiSystemExclusiveAutomation: {
-		/* These controllers are region "automation" - they are owned
-		 * by regions (and their MidiModels), not by the track. As a
-		 * result there is no AutomationList/Line for the track, but we create
-		 * a controller for the user to write immediate events, so the editor
-		 * can act as a control surface for the present MIDI controllers.
-		 *
-		 * TODO: Record manipulation of the controller to regions?
-		 */
-
-		std::shared_ptr<Evoral::Control> control = _midi_region->model()->control (param, true);
-		automation_control = std::dynamic_pointer_cast<AutomationControl> (control);
-
-		if (automation_control) {
-			automation_line.reset (new MidiCueAutomationLine ("whatevs",
-			                                                  _editing_context,
-			                                                  *automation_group,
-			                                                  automation_group,
-			                                                  automation_control->alist(),
-			                                                  automation_control->desc()));
-			automation_line->set_height (automation_group->get().height());
-		}
+	case MidiSystemExclusiveAutomation:
+	case MidiVelocityAutomation:
 		break;
+	default:
+		return;
 	}
 
-	default:
+	CueAutomationMap::iterator i = automation_map.find (param);
+	AutomationDisplayState* ads = nullptr;
+
+	if (i != automation_map.end()) {
+
+		ads = &i->second;
+
+	} else {
+
+		if (op == SelectionRemove) {
+			/* remove it, but it doesn't exist yet, no worries */
+			return;
+		}
+
+		if (param.type() == MidiVelocityAutomation) {
+
+
+			if (!velocity_display) {
+
+				/* Create and add to automation display map */
+
+				velocity_display = new MidiCueVelocityDisplay (editing_context(), midi_context(), *this, *automation_group, 0x312244ff);
+				auto res = automation_map.insert (std::make_pair (Evoral::Parameter (ARDOUR::MidiVelocityAutomation, 0, 0), AutomationDisplayState (*velocity_display, true)));
+
+				ads = &((*res.first).second);
+
+				for (auto & ev : _events) {
+					velocity_display->add_note (ev.second);
+				}
+			}
+
+		} else {
+
+			std::shared_ptr<Evoral::Control> control = _midi_region->model()->control (param, true);
+			CueAutomationControl ac = std::dynamic_pointer_cast<AutomationControl> (control);
+
+			if (!ac) {
+				return;
+			}
+
+			CueAutomationLine line (new MidiCueAutomationLine (ARDOUR::EventTypeMap::instance().to_symbol (param),
+			                                                   _editing_context,
+			                                                   *automation_group,
+			                                                   automation_group,
+			                                                   ac->alist(),
+			                                                   ac->desc()));
+			AutomationDisplayState cad (ac, line, true);
+
+			auto res = automation_map.insert (std::make_pair (param, cad));
+
+			ads = &((*res.first).second);
+		}
+	}
+
+	std::cerr << "sad " << op << " param " << ARDOUR::EventTypeMap::instance().to_symbol (param) << std::endl;
+
+	switch (op) {
+	case SelectionSet:
+		/* hide the rest */
+		for (auto & as : automation_map) {
+			as.second.hide ();
+		}
+		/*FALLTHRU*/
+	case SelectionAdd:
+		ads->set_height (automation_group->get().height());
+		ads->show ();
+		active_automation = ads;
+		break;
+
+	case SelectionRemove:
+		ads->hide ();
+		if (active_automation == ads) {
+			active_automation = nullptr;
+		}
+		break;
+
+	case SelectionToggle:
+		if (ads->visible) {
+			ads->hide ();
+			if (active_automation == ads) {
+				active_automation = nullptr;
+			}
+		} else {
+			ads->set_height (automation_group->get().height());
+			ads->show ();
+			active_automation = ads;
+		}
+		return;
+
+	case SelectionExtend:
+		/* undefined in this context */
 		break;
 	}
 }
@@ -298,8 +419,8 @@ std::list<SelectableOwner*>
 MidiCueView::selectable_owners()
 {
 	std::list<SelectableOwner*> sl;
-	if (automation_line) {
-		sl.push_back (automation_line.get());
+	if (active_automation && active_automation->line) {
+		sl.push_back (active_automation->line.get());
 	}
 	return sl;
 }
@@ -307,16 +428,24 @@ MidiCueView::selectable_owners()
 MergeableLine*
 MidiCueView::make_merger ()
 {
-	return new MergeableLine (automation_line, automation_control,
-	                          [](Temporal::timepos_t const& t) { return t; },
-	                          nullptr, nullptr);
+	if (active_automation && active_automation->line) {
+		return new MergeableLine (active_automation->line, active_automation->control,
+		                          [](Temporal::timepos_t const& t) { return t; },
+		                          nullptr, nullptr);
+	}
+
+	return nullptr;
 }
 
 bool
 MidiCueView::automation_rb_click (GdkEvent* event, Temporal::timepos_t const & pos)
 {
+	if (!active_automation || !active_automation->control || !active_automation->line) {
+		return false;
+	}
+
 	bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
-	automation_line->add (automation_control, event, pos, event->button.y, with_guard_points);
+	active_automation->line->add (active_automation->control, event, pos, event->button.y, with_guard_points);
 	return false;
 }
 
@@ -325,4 +454,60 @@ MidiCueView::line_drag_click (GdkEvent* event, Temporal::timepos_t const & pos)
 {
 }
 
+MidiCueView::AutomationDisplayState::~AutomationDisplayState()
+{
+	/* We do not own the velocity_display */
+}
 
+void
+MidiCueView::AutomationDisplayState::hide ()
+{
+	if (velocity_display) {
+		std::cerr << "hide vdisp\n";
+		velocity_display->hide ();
+	} else if (line) {
+		std::cerr << "hide line\n";
+		line->hide_all ();
+	}
+	visible = false;
+}
+
+void
+MidiCueView::AutomationDisplayState::show ()
+{
+	if (velocity_display) {
+		std::cerr << "show vdisp\n";
+		velocity_display->show ();
+	} else if (line) {
+		std::cerr << "show line\n";
+		line->show ();
+	}
+	visible = true;
+}
+
+void
+MidiCueView::AutomationDisplayState::set_height (double h)
+{
+	if (velocity_display) {
+		// velocity_display->set_height (h);
+	} else if (line) {
+		line->set_height (h);
+	}
+}
+
+void
+MidiCueView::automation_entry ()
+{
+	if (active_automation && active_automation->line) {
+		active_automation->line->track_entered ();
+	}
+}
+
+
+void
+MidiCueView::automation_leave ()
+{
+	if (active_automation && active_automation->line) {
+		active_automation->line->track_entered ();
+	}
+}
diff --git a/gtk2_ardour/midi_cue_view.h b/gtk2_ardour/midi_cue_view.h
index 01c8b5da12..05c15d0237 100644
--- a/gtk2_ardour/midi_cue_view.h
+++ b/gtk2_ardour/midi_cue_view.h
@@ -24,11 +24,20 @@
 
 #pragma once
 
+#include <map>
+
+#include "ardour/types.h"
+
 #include "midi_view.h"
 
 class VelocityDisplay;
 class MidiCueAutomationLine;
 
+namespace ArdourCanvas {
+	class Box;
+	class Button;
+}
+
 class MidiCueView : public MidiView
 {
   public:
@@ -40,6 +49,8 @@ class MidiCueView : public MidiView
 	             uint32_t                    basic_color
 		);
 
+	~MidiCueView();
+
 	bool canvas_event (GdkEvent*);
 	void set_samples_per_pixel (double);
 	void set_height (double);
@@ -51,7 +62,7 @@ class MidiCueView : public MidiView
 	void ghost_add_note (NoteBase*);
 	void ghost_sync_selection (NoteBase*);
 
-	void show_automation (Evoral::Parameter const & param);
+	void update_automation_display (Evoral::Parameter const & param, ARDOUR::SelectionOperation);
 
 	ArdourCanvas::Item* drag_group() const;
 
@@ -61,16 +72,50 @@ class MidiCueView : public MidiView
 	bool automation_rb_click (GdkEvent*, Temporal::timepos_t const &);
 	void line_drag_click (GdkEvent*, Temporal::timepos_t const &);
 
+	void automation_entry();
+	void automation_leave ();
+
   protected:
 	bool scroll (GdkEventScroll* ev);
 
 	ArdourCanvas::Rectangle* automation_group;
-	std::shared_ptr<MidiCueAutomationLine>   automation_line;
-	std::shared_ptr<ARDOUR::AutomationControl> automation_control;
 
-	ArdourCanvas::Rectangle* velocity_base;
+	typedef std::shared_ptr<MidiCueAutomationLine>  CueAutomationLine;
+	typedef std::shared_ptr<ARDOUR::AutomationControl>  CueAutomationControl;
+
+	struct AutomationDisplayState {
+
+		AutomationDisplayState (CueAutomationControl ctl, CueAutomationLine ln, bool vis)
+			: control (ctl), line (ln), velocity_display (nullptr), visible (vis) {}
+		AutomationDisplayState (VelocityDisplay& vdisp, bool vis)
+			: control (nullptr), line (nullptr), velocity_display (&vdisp), visible (vis) {}
+
+		~AutomationDisplayState();
+
+		CueAutomationControl control;
+		CueAutomationLine line;
+		VelocityDisplay* velocity_display;
+		bool visible;
+
+		void hide ();
+		void show ();
+		void set_height (double);
+	};
+
+	typedef std::map<Evoral::Parameter, AutomationDisplayState> CueAutomationMap;
+
+	CueAutomationMap automation_map;
+	AutomationDisplayState* active_automation;
+
 	VelocityDisplay* velocity_display;
 
+	ArdourCanvas::Box*    button_bar;
+	ArdourCanvas::Button* velocity_button;
+	ArdourCanvas::Button* bender_button;
+	ArdourCanvas::Button* pressure_button;
+	ArdourCanvas::Button* expression_button;
+	ArdourCanvas::Button* modulation_button;
+
 	std::shared_ptr<Temporal::TempoMap const> tempo_map;
 	ArdourCanvas::Rectangle* event_rect;
 	uint32_t _slot_index;
@@ -78,6 +123,6 @@ class MidiCueView : public MidiView
 	void update_sustained (Note *);
 	void update_hit (Hit *);
 
+	bool automation_button_event (GdkEvent*, Evoral::ParameterType type, int id);
+	void automation_button_click (Evoral::ParameterType type, int id, ARDOUR::SelectionOperation);
 };
-
-
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 95474201b6..56cf9399df 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -170,6 +170,20 @@ MidiRegionView::init (bool /*wfd*/)
 	connect_to_diskstream ();
 }
 
+void
+MidiRegionView::set_model (std::shared_ptr<ARDOUR::MidiModel> model)
+{
+	MidiView::set_model (model);
+
+	region_muted ();
+	region_sync_changed ();
+	region_resized (ARDOUR::bounds_change);
+	region_locked ();
+
+	set_colors ();
+	reset_width_dependent_items (_pixel_width);
+}
+
 bool
 MidiRegionView::display_is_enabled () const
 {
@@ -642,24 +656,8 @@ MidiRegionView::~MidiRegionView ()
 void
 MidiRegionView::reset_width_dependent_items (double pixel_width)
 {
-	RegionView::reset_width_dependent_items(pixel_width);
-
-	view_changed ();
-
-	bool hide_all = false;
-	PatchChanges::iterator x = _patch_changes.begin();
-	if (x != _patch_changes.end()) {
-		hide_all = x->second->width() >= _pixel_width;
-	}
-
-	if (hide_all) {
-		for (; x != _patch_changes.end(); ++x) {
-			x->second->hide();
-		}
-	}
-
-	move_step_edit_cursor (_step_edit_cursor_position);
-	set_step_edit_cursor_width (_step_edit_cursor_width);
+	MidiView::reset_width_dependent_items (pixel_width);
+	RegionView::reset_width_dependent_items (pixel_width);
 }
 
 void
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 39c85d4bdf..8968e4b9b0 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -112,6 +112,7 @@ public:
 	{ return midi_view()->midi_view(); }
 
 	void set_height (double);
+	void set_model (std::shared_ptr<ARDOUR::MidiModel>);
 
 	inline ARDOUR::ColorMode color_mode() const { return midi_view()->color_mode(); }
 
diff --git a/gtk2_ardour/midi_util.h b/gtk2_ardour/midi_util.h
index aac285fb25..14619a76ff 100644
--- a/gtk2_ardour/midi_util.h
+++ b/gtk2_ardour/midi_util.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 inline static void clamp_to_0_127(uint8_t &val)
 {
 	if ((127 < val) && (val < 192)) {
diff --git a/gtk2_ardour/midi_view.cc b/gtk2_ardour/midi_view.cc
index deb9aa159d..e4d70be077 100644
--- a/gtk2_ardour/midi_view.cc
+++ b/gtk2_ardour/midi_view.cc
@@ -113,13 +113,14 @@ MidiView::MidiView (std::shared_ptr<MidiTrack> mt,
                     uint32_t                   basic_color)
 	: _editing_context (ec)
 	, _midi_context (bg)
-	, _active_notes (0)
+	, _active_notes (nullptr)
 	, _note_group (new ArdourCanvas::Container (&parent))
 	, _note_diff_command (nullptr)
 	, _ghost_note(0)
 	, _step_edit_cursor (0)
 	, _step_edit_cursor_width (1, 0)
 	, _channel_selection_scoped_note (0)
+	, _needs_active_notes_for_rec_enabled_track (false)
 	, _mouse_state(None)
 	, _pressed_button(0)
 	, _optimization_iterator (_events.end())
@@ -139,19 +140,19 @@ MidiView::MidiView (std::shared_ptr<MidiTrack> mt,
 	init (mt);
 }
 
-
 MidiView::MidiView (MidiView const & other)
 	: sigc::trackable (other)
 	, _editing_context (other.editing_context())
 	, _midi_context (other.midi_context())
 	, _midi_region (other.midi_region())
-	, _active_notes(0)
+	, _active_notes (nullptr)
 	, _note_group (new ArdourCanvas::Container (other._note_group->parent()))
 	, _note_diff_command (0)
 	, _ghost_note(0)
 	, _step_edit_cursor (0)
 	, _step_edit_cursor_width (1, 0)
 	, _channel_selection_scoped_note (0)
+	, _needs_active_notes_for_rec_enabled_track (false)
 	, _mouse_state(None)
 	, _pressed_button(0)
 	, _optimization_iterator (_events.end())
@@ -192,12 +193,6 @@ MidiView::set_track (std::shared_ptr<MidiTrack> mt)
 
 	if (_midi_track) {
 		_midi_track->DropReferences.connect (track_going_away_connection, invalidator (*this), std::bind (&MidiView::track_going_away, this), gui_context());
-
-		if (_midi_track->triggerbox()->record_enabled()) {
-			begin_write ();
-		} else {
-			end_write ();
-		}
 	}
 }
 
@@ -236,23 +231,20 @@ MidiView::set_model (std::shared_ptr<MidiModel> m)
 	assert (_midi_track);
 	assert (_midi_region);
 
+	clear_events ();
+	connections_requiring_model.drop_connections ();
+
 	_model = m;
 
+	if (!_model) {
+		std::cerr << "no model!\n";
+		return;
+	}
+
+	std::cerr << "model set to " << _model << std::endl;
+
 	//set_height (trackview.current_height());
 
-#warning paul pianorule needs these fixed
-/* XXXX
-	region_muted ();
-	region_sync_changed ();
-	region_resized (ARDOUR::bounds_change);
-	//region_locked ();
-
-	set_colors ();
-	reset_width_dependent_items (_pixel_width);
-*/
-
-	connections_requiring_model.drop_connections ();
-
 	_model->ContentsChanged.connect (connections_requiring_model, invalidator (*this), std::bind (&MidiView::model_changed, this), gui_context());
 
 	_midi_track->playback_filter().ChannelModeChanged.connect (connections_requiring_model, invalidator (*this),
@@ -849,9 +841,8 @@ MidiView::clear_events ()
 {
 	// clear selection without signaling or trying to change state of event objects
 	_selection.clear ();
-
 	clear_ghost_events ();
-
+	/* This will delete all the NoteBase* in the _events map */
 	_note_group->clear (true);
 	_events.clear();
 	_patch_changes.clear();
@@ -863,8 +854,6 @@ void
 MidiView::display_model (std::shared_ptr<MidiModel> model)
 {
 	set_model (_model);
-	/* Don't signal as nobody else needs to know until selection has been altered. */
-	clear_events();
 	model_changed ();
 }
 
@@ -1099,12 +1088,14 @@ MidiView::model_changed()
 		return;
 	}
 
-	if (!_model) {
-		return;
+	for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) {
+		_optimization_iterator->second->invalidate ();
 	}
 
-	for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) {
-		_optimization_iterator->second->invalidate();
+	/* note that _optimization_iterator now points to _events.end() */
+
+	if (!_model) {
+		return;
 	}
 
 	bool empty_when_starting = _events.empty();
@@ -1565,6 +1556,8 @@ MidiView::begin_write()
 	   XXX this should not happen.
 	*/
 
+	clear_events ();
+
 	if (_active_notes) {
 		for (unsigned i = 0; i < 128; ++i) {
 			delete _active_notes[i];
@@ -1588,6 +1581,7 @@ void
 MidiView::end_write()
 {
 	if (_active_notes) {
+		std::cerr << "active notes deleted in end_write\n";
 		for (unsigned i = 0; i < 128; ++i) {
 			delete _active_notes[i];
 		}
@@ -2271,7 +2265,7 @@ MidiView::clear_selection_internal ()
 	DEBUG_TRACE(DEBUG::Selection, "MRV::clear_selection_internal\n");
 
 	for (auto & sel : _selection) {
-		sel->set_selected(false);
+		sel->set_selected (false);
 		sel->hide_velocity();
 		ghost_sync_selection (sel);
 	}
@@ -4490,15 +4484,14 @@ MidiView::set_step_edit_cursor_width (Temporal::Beats beats)
 }
 
 void
-MidiView::clip_data_recorded (timecnt_t const & total_duration)
+MidiView::clip_data_recorded (samplecnt_t total_duration)
 {
 	if (!_midi_track) {
 		return;
 	}
 
 	if (!_active_notes) {
-		/* we aren't actively being recorded to */
-		return;
+		begin_write ();
 	}
 
 	if (_active_notes) {
@@ -4565,7 +4558,7 @@ MidiView::clip_data_recorded (timecnt_t const & total_duration)
 		}
 	}
 
-	active_note_end = total_duration;
+	active_note_end = timecnt_t (total_duration);
 }
 
 /** Called when a diskstream on our track has received some data.  Update the view, if applicable.
diff --git a/gtk2_ardour/midi_view.h b/gtk2_ardour/midi_view.h
index 843510f199..32355d242e 100644
--- a/gtk2_ardour/midi_view.h
+++ b/gtk2_ardour/midi_view.h
@@ -118,9 +118,9 @@ class MidiView : public virtual sigc::trackable, public LineMerger
 	virtual GhostRegion* add_ghost (TimeAxisView&) { return nullptr; }
 	virtual std::string get_modifier_name() const;
 
-	void set_region (std::shared_ptr<ARDOUR::MidiRegion>);
-	void set_track (std::shared_ptr<ARDOUR::MidiTrack>);
-	void set_model (std::shared_ptr<ARDOUR::MidiModel>);
+	virtual void set_region (std::shared_ptr<ARDOUR::MidiRegion>);
+	virtual void set_track (std::shared_ptr<ARDOUR::MidiTrack>);
+	virtual void set_model (std::shared_ptr<ARDOUR::MidiModel>);
 
 	NoteBase* add_note(const std::shared_ptr<NoteType> note, bool visible);
 
@@ -341,7 +341,7 @@ class MidiView : public virtual sigc::trackable, public LineMerger
 	EditingContext& editing_context() const { return _editing_context; }
 	MidiViewBackground& midi_context() const { return _midi_context; }
 
-	void clip_data_recorded (Temporal::timecnt_t const &);
+	void clip_data_recorded (samplecnt_t);
 
 	virtual void select_self (bool add) {}
 	virtual void unselect_self () {}
@@ -503,7 +503,7 @@ class MidiView : public virtual sigc::trackable, public LineMerger
 	Temporal::Beats                      _step_edit_cursor_width;
 	Temporal::Beats                      _step_edit_cursor_position;
 	NoteBase*                            _channel_selection_scoped_note;
-
+	bool                                 _needs_active_notes_for_rec_enabled_track;
 	MouseState _mouse_state;
 	int _pressed_button;
 
diff --git a/gtk2_ardour/midi_view_background.cc b/gtk2_ardour/midi_view_background.cc
index bc6c2c8b38..b6790e5d89 100644
--- a/gtk2_ardour/midi_view_background.cc
+++ b/gtk2_ardour/midi_view_background.cc
@@ -42,6 +42,7 @@ MidiViewBackground::MidiViewBackground (ArdourCanvas::Item* parent)
 	, _note_lines (new ArdourCanvas::LineSet (parent, ArdourCanvas::LineSet::Horizontal))
 	, _note_mode (ARDOUR::Sustained)
 	, _color_mode (ARDOUR::MeterColors)
+	, _visibility_note_range (ContentsRange)
 {
 	_note_lines->lower_to_bottom();
 
diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h
index 6d3101a237..d9bb3fa47b 100644
--- a/gtk2_ardour/mouse_cursors.h
+++ b/gtk2_ardour/mouse_cursors.h
@@ -26,6 +26,10 @@
  *  Held centrally by the Editor because some cursors are used in several places.
  */
 
+#include <gdkmm/cursor.h>
+
+#include <string>
+
 class MouseCursors
 {
 public:
diff --git a/gtk2_ardour/normalize_dialog.h b/gtk2_ardour/normalize_dialog.h
index ce2c9aa56a..b5c9bd913b 100644
--- a/gtk2_ardour/normalize_dialog.h
+++ b/gtk2_ardour/normalize_dialog.h
@@ -21,6 +21,7 @@
 #include "progress_reporter.h"
 
 namespace Gtk {
+	class CheckButton;
 	class RadioButton;
 	class SpinButton;
 	class ProgressBar;
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 3392ccf36d..4897e575e5 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -29,13 +29,13 @@
 
 #include "note_base.h"
 #include "editing_context.h"
-#include "editing_syms.h"
+#include "editing_syms.inc.h"
 #include "keyboard.h"
 #include "midi_view.h"
 
 /* clang-format off */
 // Include last, when GRIDTYPE has been defined by editing.h via midi_region_view.h
-#include "editing_syms.h"
+#include "editing_syms.inc.h"
 /* clang-format on */
 
 using namespace std;
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 01873047f2..234b740587 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -49,6 +49,7 @@ namespace ARDOUR {
 }
 
 namespace Gtk {
+	class CheckMenuItem;
 	class Menu;
 	class Menuitem;
 }
diff --git a/gtk2_ardour/patch_change.h b/gtk2_ardour/patch_change.h
index c436a92cbe..4196a9a565 100644
--- a/gtk2_ardour/patch_change.h
+++ b/gtk2_ardour/patch_change.h
@@ -23,6 +23,11 @@
 
 #include "canvas/flag.h"
 
+#include <gtkmm/menu.h>
+
+#include "midi_view.h"
+#include "patch_change_dialog.h"
+
 class MidiRegionView;
 
 namespace MIDI {
diff --git a/gtk2_ardour/patch_change_dialog.h b/gtk2_ardour/patch_change_dialog.h
index 261672a945..b841ec4159 100644
--- a/gtk2_ardour/patch_change_dialog.h
+++ b/gtk2_ardour/patch_change_dialog.h
@@ -19,6 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#pragma once
+
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/comboboxtext.h>
 
@@ -27,7 +30,6 @@
 #include "audio_clock.h"
 
 namespace ARDOUR {
-	class BeatsSamplesConverter;
 	class Session;
 	class InstrumentInfo;
 }
diff --git a/gtk2_ardour/pingback.h b/gtk2_ardour/pingback.h
index d83bafce55..e55057d9fd 100644
--- a/gtk2_ardour/pingback.h
+++ b/gtk2_ardour/pingback.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <string>
+
 namespace ARDOUR {
 	void pingback (const std::string& this_version,
 		       const std::string& announce_path);
diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h
index 43b861cfc1..7d2f48dbbc 100644
--- a/gtk2_ardour/playlist_selector.h
+++ b/gtk2_ardour/playlist_selector.h
@@ -28,6 +28,8 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 
+#include "widgets/ardour_button.h"
+
 #include "ardour/playlist.h"
 #include "ardour/session_handle.h"
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/plugin_scan_dialog.h b/gtk2_ardour/plugin_scan_dialog.h
index e9c2db16b2..b6688212c9 100644
--- a/gtk2_ardour/plugin_scan_dialog.h
+++ b/gtk2_ardour/plugin_scan_dialog.h
@@ -21,6 +21,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
+#include <gtkmm/frame.h>
 #include <gtkmm/label.h>
 #include <gtkmm/progressbar.h>
 #include <gtkmm/sizegroup.h>
diff --git a/gtk2_ardour/po/es.po b/gtk2_ardour/po/es.po
index aeb37473ba..cb764df37e 100644
--- a/gtk2_ardour/po/es.po
+++ b/gtk2_ardour/po/es.po
@@ -2,23 +2,21 @@
 # This file is distributed under the same license as the gtk-ardour package.
 #
 # Pablo Fernández <pablo.fbus@gmail.com>, 2016
-#: audio_clock.cc:941 audio_clock.cc:942 session_dialog.cc:604
-#: session_dialog.cc:605
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk2_ardour\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-05-20 14:36-0600\n"
-"PO-Revision-Date: 2016-07-27 21:44+0100\n"
+"PO-Revision-Date: 2024-11-07 10:29-0500\n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #: about.cc:133
 msgid "Fons Adriaensen"
@@ -58,7 +56,7 @@ msgstr "Christian Borss"
 
 #: about.cc:142
 msgid "Thomas Brand"
-msgstr ""
+msgstr "Thomas Brand"
 
 #: about.cc:143
 msgid "Chris Cannam"
@@ -90,7 +88,7 @@ msgstr "Paul Davis"
 
 #: about.cc:150
 msgid "Simon Dixon"
-msgstr ""
+msgstr "Simon Dixon"
 
 #: about.cc:151
 msgid "Gerard van Dongen"
@@ -198,7 +196,7 @@ msgstr "Joshua Leach"
 
 #: about.cc:177
 msgid "Jan Lentfer"
-msgstr ""
+msgstr "Jan Lentfer"
 
 #: about.cc:178
 msgid "Ben Loftis"
@@ -206,7 +204,7 @@ msgstr "Ben Loftis"
 
 #: about.cc:179
 msgid "Matthias Mauch"
-msgstr ""
+msgstr "Matthias Mauch"
 
 #: about.cc:180
 msgid "Nick Mainsbridge"
@@ -222,11 +220,11 @@ msgstr "Doug Mclain"
 
 #: about.cc:183
 msgid "Johannes Mueller"
-msgstr ""
+msgstr "Johannes Mueller"
 
 #: about.cc:184
 msgid "Edward Tomasz Napierała"
-msgstr ""
+msgstr "Edward Tomasz Napierała"
 
 #: about.cc:185
 msgid "Todd Naugle"
@@ -246,7 +244,7 @@ msgstr "Jack O'Quin"
 
 #: about.cc:189
 msgid "Len Ovens"
-msgstr ""
+msgstr "Len Ovens"
 
 #: about.cc:190
 msgid "Pavel Potocek"
@@ -286,7 +284,7 @@ msgstr "Rodrigo Severo"
 
 #: about.cc:199
 msgid "Daniel Sheeler"
-msgstr ""
+msgstr "Daniel Sheeler"
 
 #: about.cc:200
 msgid "Per Sigmond"
@@ -306,7 +304,7 @@ msgstr "Mark Stewart"
 
 #: about.cc:204
 msgid "Nathan Stewart"
-msgstr ""
+msgstr "Nathan Stewart"
 
 #: about.cc:205
 msgid "Roland Stigge"
@@ -346,6 +344,13 @@ msgid ""
 "\tOlivier Humbert <trebmuh@tuxfamily.org>\n"
 "\tFrédéric Rech <fred_rech@laposte.net>\n"
 msgstr ""
+"Francés:\n"
+"\tAlain Fréhel <alain.frehel@free.fr>\n"
+"\tChristophe Combelles <ccomb@free.fr>\n"
+"\tMartin Blanchard\n"
+"\tRomain Arnaud <roming22@gmail.com>\n"
+"\tOlivier Humbert <trebmuh@tuxfamily.org>\n"
+"\tFrédéric Rech <fred_rech@laposte.net>\n"
 
 #: about.cc:217
 msgid ""
@@ -468,6 +473,8 @@ msgid ""
 "Japanese:\n"
 "\t Hiroki Inagaki <hiroki.ingk@gmail.com>\n"
 msgstr ""
+"Japonés:\n"
+"\t Hiroki Inagaki <hiroki.ingk@gmail.com>\n"
 
 #: about.cc:558
 msgid "Intel 64-bit"
@@ -499,7 +506,7 @@ msgstr " - debug"
 
 #: about.cc:582
 msgid "Copyright (C) 1999-2020 Paul Davis\n"
-msgstr ""
+msgstr "Copyright (C) 1999-2020 Paul Davis\n"
 
 #: about.cc:586
 msgid "http://ardour.org/"
@@ -563,7 +570,7 @@ msgstr "Posición:"
 
 #: add_route_dialog.cc:80
 msgid "Pin Mode:"
-msgstr ""
+msgstr "Modo de Pines:"
 
 #: add_route_dialog.cc:81
 msgid "Record Mode:"
@@ -579,37 +586,40 @@ msgstr "Pistas de audio"
 
 #: add_route_dialog.cc:102
 msgid "Use these settings to create one or more audio tracks."
-msgstr ""
+msgstr "Utilizar estas propiedades para crear una o más pistas de audio."
 
 #: add_route_dialog.cc:103 add_route_dialog.cc:117 add_route_dialog.cc:131
 #: add_route_dialog.cc:145 add_route_dialog.cc:159 add_route_dialog.cc:168
 msgid "You may select:"
-msgstr ""
+msgstr "Puedes seleccionar:"
 
 #: add_route_dialog.cc:104 add_route_dialog.cc:118
 msgid "The number of tracks to add"
-msgstr ""
+msgstr "La cantidad de pistas a añadir"
 
 #: add_route_dialog.cc:105 add_route_dialog.cc:119
 msgid "A name for the track(s)"
-msgstr ""
+msgstr "Nombre para la(s) pista(s)"
 
 #: add_route_dialog.cc:106
 msgid "Mono, stereo, or multi-channel operation for the track(s)"
-msgstr ""
+msgstr "Operación mono, estéreo o multi-canal para la(s) pista(s)"
 
 #: add_route_dialog.cc:107 add_route_dialog.cc:121
 msgid "A group which the track(s) will be assigned to"
-msgstr ""
+msgstr "Un grupo al que serán asignadas las pistas"
 
 #: add_route_dialog.cc:109 add_route_dialog.cc:123 add_route_dialog.cc:136
 #: add_route_dialog.cc:151
 msgid "The pin connections mode (see tooltip for details)"
 msgstr ""
+"El modo de conexiones de pines (Ver la información sobre las herramientas "
+"para más detalles)"
 
 #: add_route_dialog.cc:111 add_route_dialog.cc:125
 msgid "The track(s) will be added at the location specified by \"Position\""
 msgstr ""
+"La(s) pista(s) serán añadidas en la ubicación especificada por \"Posición\""
 
 #: add_route_dialog.cc:115 add_route_dialog.cc:567
 msgid "MIDI Tracks"
@@ -617,11 +627,13 @@ msgstr "Pistas MIDI"
 
 #: add_route_dialog.cc:116
 msgid "Use these settings to create one or more MIDI tracks."
-msgstr ""
+msgstr "Utilice estas propiedades para crear una o más pistas MIDI."
 
 #: add_route_dialog.cc:120 add_route_dialog.cc:148
 msgid "An instrument plugin (or select \"None\" to drive an external device)"
 msgstr ""
+"Un instrumento plugin (o seleccione \"Ninguno\" para manejar un dispositivo "
+"externo)"
 
 #: add_route_dialog.cc:129 add_route_dialog.cc:563
 msgid "Audio Busses"
@@ -629,23 +641,24 @@ msgstr "Buses de audio"
 
 #: add_route_dialog.cc:130
 msgid "Use these settings to create one or more audio busses."
-msgstr ""
+msgstr "Utilice estas propiedades para crear uno o más buses de audio."
 
 #: add_route_dialog.cc:132 add_route_dialog.cc:146 add_route_dialog.cc:169
 msgid "The number of busses to add"
-msgstr ""
+msgstr "La cantidad de buses a añadir"
 
 #: add_route_dialog.cc:133 add_route_dialog.cc:147 add_route_dialog.cc:170
 msgid "A name for the buss(es)"
-msgstr ""
+msgstr "Un nombre para el/los bus(es)"
 
 #: add_route_dialog.cc:134 add_route_dialog.cc:149
 msgid "A group which the buss(es) will be assigned to"
-msgstr ""
+msgstr "Un grupo al que será(n) asignado(s) el/los bus(es)"
 
 #: add_route_dialog.cc:138 add_route_dialog.cc:153
 msgid "The buss(es) will be added at the location specified by \"Position\""
 msgstr ""
+"El/los bus(es) serán asignados a la ubicación especificado por \"Posición\""
 
 #: add_route_dialog.cc:142 add_route_dialog.cc:565
 msgid "MIDI Busses"
@@ -653,7 +666,7 @@ msgstr "Buses MIDI"
 
 #: add_route_dialog.cc:143
 msgid "Use these settings to create one or more MIDI busses."
-msgstr ""
+msgstr "Utilice estas propiedades para crear uno o más buses MIDI."
 
 #: add_route_dialog.cc:144
 msgid ""
@@ -662,6 +675,10 @@ msgid ""
 "to host a single \"heavy\" instrument plugin which is fed from multiple MIDI "
 "tracks."
 msgstr ""
+"Los buses MIDI pueden combinar la salida de varias pistas. Son usados a "
+"veces\n"
+"para soportar un único plugin de instrumento \"pesado\" que recibe señal \n"
+"de múltiples pistas MIDI."
 
 #: add_route_dialog.cc:157 add_route_dialog.cc:571
 msgid "VCA Masters"
@@ -669,11 +686,11 @@ msgstr "Masters VCA"
 
 #: add_route_dialog.cc:158
 msgid "Use these settings to create one or more VCA masters."
-msgstr ""
+msgstr "Utilice estas propiedades para crear uno o más masters VCA."
 
 #: add_route_dialog.cc:160
 msgid "The number of VCAs to add"
-msgstr ""
+msgstr "La cantidad de VCAs a añadir"
 
 #: add_route_dialog.cc:161
 #, c-format
@@ -681,14 +698,16 @@ msgid ""
 "A name for the VCA(s). \"%n\" will be replaced by an index number for each "
 "VCA"
 msgstr ""
+"Un nombre para el/los VCA(s). \"%n\" será reemplazado por un número indicial "
+"para cada VCA"
 
 #: add_route_dialog.cc:165 add_route_dialog.cc:573
 msgid "Foldback Busses"
-msgstr ""
+msgstr "Buses de monitoreo"
 
 #: add_route_dialog.cc:166
 msgid "Use these settings to create one or more foldback busses."
-msgstr ""
+msgstr "Utilice estas propiedades para crear uno o más buses de monitoreo."
 
 #: add_route_dialog.cc:167
 msgid ""
@@ -696,6 +715,9 @@ msgid ""
 "by\n"
 "hidden monitor sends."
 msgstr ""
+"Los buses de monitoreo son utilizados como salidas \"master\" para canales "
+"de \n"
+"monitoreo y reciben alimentación de envíos de monitoreo ocultos."
 
 #: add_route_dialog.cc:174 add_route_dialog.cc:1055
 #: duplicate_routes_dialog.cc:57 duplicate_routes_dialog.cc:224
@@ -726,11 +748,11 @@ msgstr "E/S estricto"
 
 #: add_route_dialog.cc:213
 msgid "Template/Type"
-msgstr ""
+msgstr "Plantilla/Tipo"
 
 #: add_route_dialog.cc:215 session_dialog.cc:353 session_dialog.cc:694
 msgid "Modified With"
-msgstr ""
+msgstr "Modificado con"
 
 #: add_route_dialog.cc:303 rc_option_editor.cc:2968
 msgid ""
@@ -745,10 +767,11 @@ msgstr ""
 #: add_route_dialog.cc:322
 msgid "Add selected items (and leave dialog open)"
 msgstr ""
+"Agregar los items seleccionados (y dejar la ventana de diálogo abierta)"
 
 #: add_route_dialog.cc:348
 msgid "Add and Close"
-msgstr ""
+msgstr "Agregar y cerrar"
 
 #: add_route_dialog.cc:439 add_route_dialog.cc:778 add_route_dialog.cc:787
 #: editor_actions.cc:469 editor_rulers.cc:256 time_axis_view.cc:1362
@@ -757,7 +780,7 @@ msgstr "Normal"
 
 #: add_route_dialog.cc:543
 msgid "Manual Configuration"
-msgstr ""
+msgstr "Configuración Manual"
 
 #: add_route_dialog.cc:590 add_route_dialog.cc:756 ardour_ui.cc:1194
 #: ardour_ui_ed.cc:782 engine_dialog.cc:265 plugin_pin_dialog.cc:74
@@ -782,7 +805,7 @@ msgstr "Bus"
 
 #: add_route_dialog.cc:600 add_route_dialog.cc:759
 msgid "Foldback"
-msgstr ""
+msgstr "Respaldo"
 
 #: add_route_dialog.cc:789
 msgid "Non Layered"
@@ -828,7 +851,7 @@ msgstr "Personalizado"
 
 #: add_route_dialog.cc:941 session_dialog.cc:582 session_dialog.cc:583
 msgid "Factory Template"
-msgstr ""
+msgstr "Plantilla de fábrica"
 
 #: add_route_dialog.cc:1000 add_route_dialog.cc:1016 route_group_menu.cc:86
 msgid "New Group..."
@@ -911,11 +934,11 @@ msgstr "Re-analizar datos"
 
 #: ardour_http.cc:228 ardour_http.cc:231 ardour_http.cc:251
 msgid "HTTP request failed: (%1) %2"
-msgstr ""
+msgstr "Solicitud HTTP fallida: (%1) %2"
 
 #: ardour_http.cc:237 ardour_http.cc:240 ardour_http.cc:254
 msgid "HTTP request status: %1"
-msgstr ""
+msgstr "Estatus de solicitud HTTP:  %1"
 
 #: ardour_ui.cc:233
 msgid ""
@@ -945,7 +968,7 @@ msgstr "Solo"
 
 #: ardour_ui.cc:315
 msgid "Feedback"
-msgstr "Realimentación"
+msgstr "Retroal."
 
 #: ardour_ui.cc:328 speaker_dialog.cc:37
 msgid "Speaker Configuration"
@@ -965,7 +988,7 @@ msgstr "Posiciones"
 
 #: ardour_ui.cc:332 route_params_ui.cc:65 route_params_ui.cc:567
 msgid "Tracks and Busses"
-msgstr "Pistas y buses"
+msgstr "Pistas y Buses"
 
 #: ardour_ui.cc:333 engine_dialog.cc:84
 msgid "Audio/MIDI Setup"
@@ -981,15 +1004,15 @@ msgstr "Gestor de scripts"
 
 #: ardour_ui.cc:336
 msgid "Idle'o'Meter"
-msgstr ""
+msgstr "Medidor de inactividad"
 
 #: ardour_ui.cc:337 plugin_dspload_window.cc:34
 msgid "Plugin DSP Load"
-msgstr ""
+msgstr "Carga DSP de Plugins"
 
 #: ardour_ui.cc:338 rc_option_editor.cc:3411 transport_masters_dialog.cc:696
 msgid "Transport Masters"
-msgstr ""
+msgstr "Módulos de Transporte"
 
 #: ardour_ui.cc:339
 msgid "Properties"
@@ -1001,19 +1024,19 @@ msgstr "Añadir Video"
 
 #: ardour_ui.cc:341 bundle_manager.cc:265
 msgid "Bundle Manager"
-msgstr "Gestor de conjuntos de conexiones"
+msgstr "Gestor de Conjuntos de Conexiones"
 
 #: ardour_ui.cc:342 big_clock_window.cc:39
 msgid "Big Clock"
-msgstr "Reloj grande"
+msgstr "Reloj Grande"
 
 #: ardour_ui.cc:343 big_transport_window.cc:31
 msgid "Transport Controls"
-msgstr ""
+msgstr "Controles de Transporte"
 
 #: ardour_ui.cc:344 port_group.cc:517 rc_option_editor.cc:3071
 msgid "Virtual Keyboard"
-msgstr ""
+msgstr "Teclado Virtual"
 
 #: ardour_ui.cc:345
 msgid "Audio Connections"
@@ -1025,7 +1048,7 @@ msgstr "Conexiones MIDI"
 
 #: ardour_ui.cc:347 keyeditor.cc:94
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Atajos de Teclado"
 
 #: ardour_ui.cc:357 editor.cc:1316
 msgid "Window|Editor"
@@ -1045,7 +1068,7 @@ msgstr "Se copiaron tus archivos de configuración. Ahora puedes reiniciar %1."
 
 #: ardour_ui.cc:411
 msgid "Global keybindings are missing"
-msgstr ""
+msgstr "Faltan mapeos de teclas globales"
 
 #: ardour_ui.cc:610
 msgid ""
@@ -1073,18 +1096,22 @@ msgid ""
 "Audio Unit Plugin Scan Failed. Automatic AU scanning has been disabled. "
 "Please see the log window for further details."
 msgstr ""
+"El escaneo de Plugins en formato \"Audio Unit\" falló. El escaneo automático "
+"de AU fue desactivado. Por favor vea la ventana de registro para más "
+"detalles."
 
 #: ardour_ui.cc:636
 msgid "Audio Unit Plugin Scan Failed:"
-msgstr ""
+msgstr "Falló el escaneo de Plugins en formato \"Audio Unit\":"
 
 #: ardour_ui.cc:681 ardour_ui.cc:758 keyeditor.cc:587
 msgid "Could not open temporary file to print bindings (%1)"
 msgstr ""
+"No se pudo abrir el archivo temporal para imprimir las asignaciones (%1)"
 
 #: ardour_ui.cc:699 ardour_ui.cc:776 keyeditor.cc:605
 msgid "Could not save bindings to file (%1)"
-msgstr ""
+msgstr "No se pudieron guardar las asignaciones en el archivo (%1)"
 
 #: ardour_ui.cc:990
 msgid "Don't quit"
@@ -1092,11 +1119,11 @@ msgstr "No salir"
 
 #: ardour_ui.cc:993
 msgid "Discard session"
-msgstr ""
+msgstr "Descartar sesión"
 
 #: ardour_ui.cc:994
 msgid "Name session and quit"
-msgstr ""
+msgstr "Nombrar la sesión y salir"
 
 #: ardour_ui.cc:996
 msgid "Just quit"
@@ -1122,7 +1149,7 @@ msgstr ""
 
 #: ardour_ui.cc:1081
 msgid "DANGER!"
-msgstr ""
+msgstr "PELIGRO!"
 
 #: ardour_ui.cc:1086
 msgid ""
@@ -1135,18 +1162,26 @@ msgid ""
 "\n"
 "Deletion is permanent and irreversible."
 msgstr ""
+"No ha nombrado esta sesión aún\n"
+"Puede seguir utilizandola cómo está\n"
+"\n"
+"%1\n"
+"\n"
+"O será eliminada\n"
+"\n"
+"La eliminación es permanente e irreversible."
 
 #: ardour_ui.cc:1092
 msgid "SCRATCH SESSION - DANGER!"
-msgstr ""
+msgstr "SESIÓN TEMPORAL - ¡PELIGRO!"
 
 #: ardour_ui.cc:1093
 msgid "Delete this session (IRREVERSIBLE!)"
-msgstr ""
+msgstr "Eliminar esta sesión (IRREVERSIBLE!)"
 
 #: ardour_ui.cc:1094
 msgid "Do not delete"
-msgstr ""
+msgstr "No eliminar"
 
 #: ardour_ui.cc:1200 ardour_ui.cc:1209 session_option_editor.cc:79
 msgid "none"
@@ -1154,7 +1189,7 @@ msgstr "ninguno"
 
 #: ardour_ui.cc:1216 ardour_ui.cc:1220
 msgid "kHz"
-msgstr ""
+msgstr "kHz"
 
 #: ardour_ui.cc:1217 ardour_ui.cc:1221 editor_ops.cc:7322 editor_ops.cc:7333
 #: rhythm_ferret.cc:131 rhythm_ferret.cc:146
@@ -1163,7 +1198,7 @@ msgstr "ms"
 
 #: ardour_ui.cc:1237
 msgid "File"
-msgstr ""
+msgstr "Archivo"
 
 #: ardour_ui.cc:1241
 msgid "BWF"
@@ -1199,11 +1234,11 @@ msgstr "RF64/WAV"
 
 #: ardour_ui.cc:1265
 msgid "MBWF"
-msgstr ""
+msgstr "MBWF"
 
 #: ardour_ui.cc:1268 session_option_editor.cc:206
 msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
 
 #: ardour_ui.cc:1276
 msgid "32-float"
@@ -1219,7 +1254,7 @@ msgstr "16-int"
 
 #: ardour_ui.cc:1293 editor_sources.cc:145
 msgid "Path"
-msgstr ""
+msgstr "Ruta"
 
 #: ardour_ui.cc:1309 ardour_ui_ed.cc:784
 msgid "DSP"
@@ -1227,28 +1262,28 @@ msgstr "DSP"
 
 #: ardour_ui.cc:1324 ardour_ui.cc:1326
 msgid "Shift+Click to clear xruns."
-msgstr ""
+msgstr "Shift+Clic para limpiar los xruns."
 
 #: ardour_ui.cc:1340
 msgid "PkBld"
-msgstr ""
+msgstr "PkBld"
 
 #: ardour_ui.cc:1362
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: ardour_ui.cc:1363
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: ardour_ui.cc:1373
 #, c-format
 msgid "%02dh:%02dm:%02ds"
-msgstr ""
+msgstr "%02dh:%02dm:%02ds"
 
 #: ardour_ui.cc:1374
 msgid "Available record time"
-msgstr ""
+msgstr "Tiempo de grabación disponible"
 
 #: ardour_ui.cc:1376 editor_route_groups.cc:110
 msgid "Rec"
@@ -1256,23 +1291,23 @@ msgstr "Grb"
 
 #: ardour_ui.cc:1379
 msgid ">24h"
-msgstr ""
+msgstr ">24h"
 
 #: ardour_ui.cc:1382 ardour_ui.cc:1385
 msgid "hours|h"
-msgstr ""
+msgstr "h"
 
 #: ardour_ui.cc:1388
 msgid "minutes|m"
-msgstr ""
+msgstr "m"
 
 #: ardour_ui.cc:1433
 msgid "Timecode|TC"
-msgstr ""
+msgstr "TC"
 
 #: ardour_ui.cc:1452
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
 #: ardour_ui.cc:1488
 msgid "You cannot add a track without a session already loaded."
@@ -1305,8 +1340,8 @@ msgstr[1] "no se pudieron crear %1 nuevos buses de audio"
 #: ardour_ui.cc:1589
 msgid "could not create %1 new foldback bus"
 msgid_plural "could not create %1 new foldback busses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "no se pudo crear %1 nuevo bus de monitoreo"
+msgstr[1] "no se pudo crear %1 buses de monitoreo"
 
 #: ardour_ui.cc:1604
 msgid ""
@@ -1315,6 +1350,11 @@ msgid ""
 "You should save %1, exit and\n"
 "restart with more ports."
 msgstr ""
+"No hay suficientes puertos\n"
+" disponibles para crear una\n"
+" nueva pista o bus.\n"
+"Debería grabar%1, salir y\n"
+"reiniciar con más puertos."
 
 #: ardour_ui.cc:1747
 msgid ""
@@ -1348,6 +1388,11 @@ msgid ""
 "These may still include regions that\n"
 "require some unused files to continue to exist."
 msgstr ""
+"Si esto parece sorprendente,\n"
+"verifica si hay instantáneas existentes.\n"
+"Estas pueden incluir regiones que\n"
+"requieren que algunos archivos no\n"
+"utilizados continúen existiendo."
 
 #: ardour_ui.cc:2451
 msgid "kilo"
@@ -1445,7 +1490,7 @@ msgstr "archivo eliminado"
 
 #: ardour_ui.cc:2703
 msgid "You cannot add tracks or busses without a session already loaded."
-msgstr ""
+msgstr "No puedes añadir pistas o buses sin una sesión ya cargada."
 
 #: ardour_ui.cc:2805
 msgid ""
@@ -1489,6 +1534,13 @@ msgid ""
 "you, or it can ignore it. Please decide\n"
 "what you would like to do.\n"
 msgstr ""
+"Esta sesión parece haber sido modificada\n"
+"sin guardar, o en medio de la grabación\n"
+"cuando %1 o el ordenador se apagó.\n"
+"\n"
+"%1 puede recuperar cualquier\n"
+"cambio por ti, o puede ignorarlo.\n"
+"Por favor, decide qué te gustaría hacer.\n"
 
 #: ardour_ui.cc:2877
 msgid "Ignore crash data"
@@ -1505,10 +1557,14 @@ msgstr "Al detenerse, volver al último inicio de reproducción"
 #: ardour_ui2.cc:88
 msgid "Playhead follows Range tool clicks, and Range selections"
 msgstr ""
+"El cabezal de reproducción sigue los clics de la herramienta de rango y las "
+"selecciones de rango"
 
 #: ardour_ui2.cc:89
 msgid "Track Input Monitoring automatically follows transport state"
 msgstr ""
+"La monitoreo de entrada de la pista sigue automáticamente el estado de "
+"transporte"
 
 #: ardour_ui2.cc:91 monitor_section.cc:135
 msgid ""
@@ -1532,27 +1588,39 @@ msgstr "Cuando está activo,  existe un bucle de realimentación."
 
 #: ardour_ui2.cc:94
 msgid ""
-"<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
-"+drag a digit or mouse-over+scroll wheel to modify.\n"
+"<b>Primary Clock</b> right-click to set display mode. Click to edit, "
+"click+drag a digit or mouse-over+scroll wheel to modify.\n"
 "Text edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: "
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
+"<b>Reloj Primario</b> haz clic derecho para establecer el modo de "
+"visualización. Haz clic para editar, haz clic y arrastra un \n"
+"dígito o pasa el ratón y usa la rueda de desplazamiento para modificar.\n"
+"Ediciones de texto: sobrescritura de derecha a izquierda <tt>Esc</tt>: "
+"cancelar; <tt>Enter</tt>: confirmar; añade '+' o '-' \n"
+"al final de la edición para ingresar tiempos delta.\n"
 
 #: ardour_ui2.cc:95
 msgid ""
-"<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
-"+drag a digit or mouse-over+scroll wheel to modify.\n"
+"<b>Secondary Clock</b> right-click to set display mode. Click to edit, "
+"click+drag a digit or mouse-over+scroll wheel to modify.\n"
 "Text edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: "
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
+"<b>Reloj Secundario</b> haz clic derecho para establecer el modo de "
+"visualización. Haz clic para editar, haz clic y arrastra \n"
+"un dígito o pasa el ratón y usa la rueda de desplazamiento para modificar.\n"
+"Ediciones de texto: sobrescritura de derecha a izquierda <tt>Esc</tt>: "
+"cancelar; <tt>Enter</tt>: confirmar; añade '+' o '-' al \n"
+"final de la edición para ingresar tiempos delta.\n"
 
 #: ardour_ui2.cc:96
 msgid "Reset All Peak Meters"
-msgstr ""
+msgstr "Restablecer Todos los Medidores de Pico"
 
 #: ardour_ui2.cc:97
 msgid "Show Error Log and acknowledge warnings"
-msgstr ""
+msgstr "Mostrar Registro de Errores y reconocer advertencias"
 
 #: ardour_ui2.cc:99
 msgid ""
@@ -1560,6 +1628,9 @@ msgid ""
 "from live input to output, but any paths with delay-causing plugins will "
 "sound later than those without."
 msgstr ""
+"Desactivar toda la Compensación de Retraso de Plugins. Esto resulta en el "
+"menor retraso desde la entrada en vivo hasta la salida, pero cualquier ruta "
+"con plugins que causen retraso sonará más tarde que aquellas sin ellos."
 
 #: ardour_ui2.cc:130
 msgid "[ERROR]: "
@@ -1575,16 +1646,16 @@ msgstr "[INFO]: "
 
 #: ardour_ui2.cc:288
 msgid "LogestSync|M-Clk"
-msgstr ""
+msgstr "M-Clk"
 
 # he cambiado desde Auto Volver. Qudaba un poco raro y auto return se entiende mejor
 #: ardour_ui2.cc:381 ardour_ui_ed.cc:481
 msgid "Auto Return"
-msgstr "Auto Return"
+msgstr "Auto Retorno"
 
 #: ardour_ui2.cc:382 ardour_ui_ed.cc:484
 msgid "Follow Range"
-msgstr ""
+msgstr "Seguir Rango"
 
 #: ardour_ui2.cc:383 ardour_ui_ed.cc:461 mixer_strip.cc:2059
 #: mixer_strip.cc:2252 route_ui.cc:213
@@ -1597,35 +1668,35 @@ msgstr "Salida"
 
 #: ardour_ui2.cc:385
 msgid "Non-Layered"
-msgstr ""
+msgstr "Sin Capas"
 
 #: ardour_ui2.cc:387 ardour_ui_ed.cc:454
 msgid "All In"
-msgstr ""
+msgstr "Todo entrada"
 
 #: ardour_ui2.cc:388 ardour_ui_ed.cc:456 ardour_ui_ed.cc:457
 msgid "All Disk"
-msgstr ""
+msgstr "Todo disco"
 
 #: ardour_ui2.cc:389
 msgid "Auto-Input"
-msgstr ""
+msgstr "Entrada Automática"
 
 #: ardour_ui2.cc:391
 msgid "Disable PDC"
-msgstr ""
+msgstr "Desabilitar PDC"
 
 #: ardour_ui2.cc:392
 msgid "I/O Latency:"
-msgstr ""
+msgstr "Latencia I/O:"
 
 #: ardour_ui2.cc:394
 msgid "Punch:"
-msgstr ""
+msgstr "Pinchar:"
 
 #: ardour_ui2.cc:395
 msgid "Rec:"
-msgstr ""
+msgstr "Rec:"
 
 #: ardour_ui2.cc:400 ardour_ui2.cc:404 ardour_ui2.cc:408
 msgid ""
@@ -1633,6 +1704,10 @@ msgid ""
 "\n"
 "To re-attach the window, use the Window > %1 > Attach menu action"
 msgstr ""
+"Arrastra esta pestaña al escritorio para mostrar %1 en su propia ventana.\n"
+"\n"
+"Para volver a adjuntar la ventana, utiliza la acción de menú Ventana > %1 > "
+"Adjuntar"
 
 #: ardour_ui2.cc:411
 msgid "Start recording at auto-punch start"
@@ -1647,25 +1722,29 @@ msgid ""
 "Force all tracks to monitor Input, unless they are explicitly set to monitor "
 "Disk"
 msgstr ""
+"Forzar todas las pistas a monitorear la Entrada, a menos que estén "
+"explícitamente configuradas para monitorear el Disco"
 
 #: ardour_ui2.cc:415
 msgid ""
 "Force all tracks to monitor Disk playback, unless they are explicitly set to "
 "Input"
 msgstr ""
+"Forzar todas las pistas a monitorear la reproducción del Disco, a menos que "
+"estén explícitamente configuradas para Entrada"
 
 #: ardour_ui2.cc:865 rc_option_editor.cc:3774 rc_option_editor.cc:3787
 #: rc_option_editor.cc:3799 rc_option_editor.cc:3801 rc_option_editor.cc:3803
 #: rc_option_editor.cc:3811 rc_option_editor.cc:3829 rc_option_editor.cc:3831
 #: rc_option_editor.cc:3839 rc_option_editor.cc:3850
 msgid "Appearance"
-msgstr ""
+msgstr "Apariencia"
 
 #: ardour_ui2.cc:878 rc_option_editor.cc:3105 rc_option_editor.cc:3106
 #: rc_option_editor.cc:3107 rc_option_editor.cc:3118 rc_option_editor.cc:3119
 #: session_option_editor.cc:388
 msgid "Metronome"
-msgstr ""
+msgstr "Metrónomo"
 
 #: ardour_ui2.cc:891 ardour_ui_ed.cc:299 rc_option_editor.cc:3287
 #: rc_option_editor.cc:3300 rc_option_editor.cc:3308 rc_option_editor.cc:3319
@@ -1681,10 +1760,12 @@ msgid ""
 "<b>Just ask and wait for an answer.\n"
 "It may take from minutes to hours.</b>"
 msgstr ""
+"<b>Solo pregunta y espera una respuesta. Puede tardar desde minutos hasta "
+"horas.</b>"
 
 #: ardour_ui_access_web.cc:55
 msgid "About the Chat"
-msgstr ""
+msgstr "Acerca del Chat"
 
 #: ardour_ui_access_web.cc:56
 msgid ""
@@ -1697,6 +1778,14 @@ msgid ""
 "You should just leave the chat window open and check back regularly until "
 "someone has answered your question."
 msgstr ""
+"Cuando estés dentro del chat, solo pregunta tu duda y espera una respuesta. "
+"El chat está ocupado por personas reales con vidas reales, por lo que muchos "
+"de ellos están en línea de forma pasiva y pueden no leer tu pregunta hasta "
+"minutos o horas después.\n"
+"Así que, por favor, ten paciencia y espera una respuesta.\n"
+"\n"
+"Deberías dejar la ventana del chat abierta y revisar regularmente hasta que "
+"alguien haya respondido a tu pregunta."
 
 #: ardour_ui_dependents.cc:137
 msgid "Setup Editor"
@@ -1712,7 +1801,7 @@ msgstr "Recargar historial de sesión"
 
 #: ardour_ui_dependents.cc:209
 msgid "Quit %1?"
-msgstr ""
+msgstr "¿Salir de %1?"
 
 #: ardour_ui_dependents.cc:261
 msgid "UI: cannot setup editor"
@@ -1724,11 +1813,11 @@ msgstr "interfaz de usuario: no se pudo configurar el mezclador"
 
 #: ardour_ui_dependents.cc:271
 msgid "UI: cannot setup meterbridge"
-msgstr ""
+msgstr "Interfaz de usuario: no se puede configurar el medidor de puente"
 
 #: ardour_ui_dependents.cc:276
 msgid "UI: cannot setup luawindow"
-msgstr ""
+msgstr "Interfaz de usuario: no se puede configurar la ventana LUA"
 
 #: ardour_ui_dependents.cc:287 ardour_ui_ed.cc:160 ardour_ui_ed.cc:666
 #: rc_option_editor.cc:2290 rc_option_editor.cc:4368
@@ -1758,13 +1847,13 @@ msgstr "Editor"
 
 #: ardour_ui_dependents.cc:446 editor_actions.cc:494
 msgid "Unset #%1"
-msgstr ""
+msgstr "Desactivar #%1"
 
 #: ardour_ui_dependents.cc:447
 msgid ""
 "No action bound\n"
 "Right-click to assign"
-msgstr ""
+msgstr "Ninguna acción asignada. Haz clic derecho para asignar"
 
 #: ardour_ui_dependents.cc:451
 msgid ""
@@ -1774,6 +1863,11 @@ msgid ""
 "Right-click to re-assign\n"
 "Shift+right-click to unassign"
 msgstr ""
+"%1\n"
+"\n"
+"Haz clic para ejecutar\n"
+"Haz clic derecho para reasignar\n"
+"Shift+clic derecho para desasignar"
 
 #: ardour_ui_dialogs.cc:314
 msgid "Don't close"
@@ -1781,7 +1875,7 @@ msgstr "No cerrar"
 
 #: ardour_ui_dialogs.cc:316 template_dialog.cc:325
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #: ardour_ui_dialogs.cc:318
 msgid "Just close"
@@ -1809,11 +1903,11 @@ msgstr "Archivos"
 
 #: ardour_ui_ed.cc:143
 msgid "Escape (deselect all)"
-msgstr ""
+msgstr "Escape (deseleccionar todo"
 
 #: ardour_ui_ed.cc:148
 msgid "Close Current Dialog"
-msgstr ""
+msgstr "Cerrar Diálogo Actual"
 
 #: ardour_ui_ed.cc:152 rc_option_editor.cc:3050
 msgid "Session"
@@ -1906,7 +2000,7 @@ msgstr "Cerrar"
 
 #: ardour_ui_ed.cc:183
 msgid "Add Track, Bus or VCA..."
-msgstr ""
+msgstr "Agregar Pista, Bus, o VCA..."
 
 #: ardour_ui_ed.cc:188
 msgid "Duplicate Tracks/Busses..."
@@ -1922,11 +2016,11 @@ msgstr "Scripts"
 
 #: ardour_ui_ed.cc:201
 msgid "Open Video..."
-msgstr "Abrir video..."
+msgstr "Abrir Video..."
 
 #: ardour_ui_ed.cc:204
 msgid "Remove Video"
-msgstr "Borrar video"
+msgstr "Borrar Video"
 
 #: ardour_ui_ed.cc:207
 msgid "Export to Video File..."
@@ -1934,27 +2028,27 @@ msgstr "Exportar a archivo de video..."
 
 #: ardour_ui_ed.cc:211
 msgid "Snapshot (& keep working on current version) ..."
-msgstr "Captura de sesión (y seguir trabajando en la versión actual) ..."
+msgstr "Captura de Sesión (y seguir trabajando en la versión actual) ..."
 
 #: ardour_ui_ed.cc:214
 msgid "Snapshot (& switch to new version) ..."
-msgstr "Captura de sesión (y cambiar a nueva versión) ..."
+msgstr "Captura de Sesión (y cambiar a nueva versión) ..."
 
 #: ardour_ui_ed.cc:217
 msgid "Quick Snapshot (& keep working on current version) ..."
-msgstr ""
+msgstr "Instantánea Rápida (y seguir trabajando en la versión actual) ..."
 
 #: ardour_ui_ed.cc:220
 msgid "Quick Snapshot (& switch to new version) ..."
-msgstr ""
+msgstr "Instantánea Rápida (y cambiar a la nueva versión) ..."
 
 #: ardour_ui_ed.cc:224
 msgid "Save As..."
-msgstr "Guardar como..."
+msgstr "Guardar Como..."
 
 #: ardour_ui_ed.cc:227
 msgid "Archive..."
-msgstr ""
+msgstr "Archivar..."
 
 #: ardour_ui_ed.cc:230 editor_actions.cc:1480 editor_markers.cc:919
 #: editor_snapshots.cc:141 foldback_strip.cc:1190 mixer_strip.cc:1716
@@ -1964,11 +2058,11 @@ msgstr "Renombrar..."
 
 #: ardour_ui_ed.cc:234
 msgid "Save Template..."
-msgstr "Guardar plantilla..."
+msgstr "Guardar Plantilla..."
 
 #: ardour_ui_ed.cc:237
 msgid "Templates"
-msgstr ""
+msgstr "Plantillas"
 
 #: ardour_ui_ed.cc:240
 msgid "Metadata"
@@ -2036,23 +2130,23 @@ msgstr "Report a Bug"
 
 #: ardour_ui_ed.cc:278
 msgid "Cheat Sheet"
-msgstr ""
+msgstr "Hoja de Referencia"
 
 #: ardour_ui_ed.cc:279
 msgid "Website"
-msgstr ""
+msgstr "Sitio web"
 
 #: ardour_ui_ed.cc:280
 msgid "Development"
-msgstr ""
+msgstr "Desarrollo"
 
 #: ardour_ui_ed.cc:281
 msgid "User Forums"
-msgstr "Foros de usuarios"
+msgstr "Foros de Usuarios"
 
 #: ardour_ui_ed.cc:282
 msgid "How to Report a Bug"
-msgstr ""
+msgstr "Cómo Reportar un Error"
 
 #: ardour_ui_ed.cc:284 luawindow.cc:101 luawindow.cc:693 plugin_ui.cc:467
 #: template_dialog.cc:324
@@ -2077,7 +2171,7 @@ msgstr "Comenzar/Continuar/Detener"
 
 #: ardour_ui_ed.cc:321
 msgid "Stop and Forget Capture"
-msgstr "Detener y destruir captura"
+msgstr "Detener y Destruir Captura"
 
 #: ardour_ui_ed.cc:325
 msgid "Play Loop Range"
@@ -2089,23 +2183,23 @@ msgstr "Reproducir selección"
 
 #: ardour_ui_ed.cc:331
 msgid "Play w/Preroll"
-msgstr ""
+msgstr "Reproducir con Preroll"
 
 #: ardour_ui_ed.cc:336
 msgid "Record w/Preroll"
-msgstr ""
+msgstr "Grabar con Preroll"
 
 #: ardour_ui_ed.cc:340
 msgid "Record w/Count-In"
-msgstr ""
+msgstr "Grabar con Cuenta Regresiva"
 
 #: ardour_ui_ed.cc:344
 msgid "Enable Record"
-msgstr "Activar grabación"
+msgstr "Activar Grabación"
 
 #: ardour_ui_ed.cc:347 ardour_ui_ed.cc:351
 msgid "Start Recording"
-msgstr "Iniciar grabación"
+msgstr "Iniciar Grabación"
 
 #: ardour_ui_ed.cc:355
 msgid "Rewind"
@@ -2145,51 +2239,51 @@ msgstr "Ir a fin"
 
 #: ardour_ui_ed.cc:385
 msgid "Go to Wall Clock"
-msgstr "Ir a reloj "
+msgstr "Ir a reloj"
 
 #: ardour_ui_ed.cc:390 ardour_ui_ed.cc:393
 msgid "Numpad Decimal"
-msgstr ""
+msgstr "Decimal del Teclado Numérico"
 
 #: ardour_ui_ed.cc:396
 msgid "Numpad 0"
-msgstr ""
+msgstr "0 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:399
 msgid "Numpad 1"
-msgstr ""
+msgstr "1 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:402
 msgid "Numpad 2"
-msgstr ""
+msgstr "2 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:405
 msgid "Numpad 3"
-msgstr ""
+msgstr "3 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:408
 msgid "Numpad 4"
-msgstr ""
+msgstr "4 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:411
 msgid "Numpad 5"
-msgstr ""
+msgstr "5 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:414
 msgid "Numpad 6"
-msgstr ""
+msgstr "6 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:417
 msgid "Numpad 7"
-msgstr ""
+msgstr "7 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:420
 msgid "Numpad 8"
-msgstr ""
+msgstr "8 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:423
 msgid "Numpad 9"
-msgstr ""
+msgstr "9 del Teclado Numérico"
 
 #: ardour_ui_ed.cc:427
 msgid "Focus On Clock"
@@ -2214,7 +2308,7 @@ msgstr "Muestras"
 
 #: ardour_ui_ed.cc:453
 msgid "All Input"
-msgstr ""
+msgstr "Todas las entradas"
 
 #: ardour_ui_ed.cc:460
 msgid "Punch In"
@@ -2247,11 +2341,11 @@ msgstr "Auto Play"
 
 #: ardour_ui_ed.cc:488
 msgid "Disable Latency Compensation"
-msgstr ""
+msgstr "Desactivar la Compensación de Latencia"
 
 #: ardour_ui_ed.cc:491 new_user_wizard.cc:406
 msgid "Monitor Section"
-msgstr "Sección de monitorización"
+msgstr "Sección de Monitoreo"
 
 #: ardour_ui_ed.cc:494
 msgid "Sync Startup to Video"
@@ -2263,7 +2357,7 @@ msgstr "Maestro"
 
 #: ardour_ui_ed.cc:498
 msgid "Use External Positional Sync Source"
-msgstr "Usar sincronización de posición externa"
+msgstr "Usar Sincronización de Posición Externa"
 
 #: ardour_ui_ed.cc:503
 msgid "Toggle Record Enable Track %1"
@@ -2295,18 +2389,18 @@ msgstr "Enviar MIDI Clock"
 
 #: ardour_ui_ed.cc:527
 msgid "Panic (Send MIDI all-notes-off)"
-msgstr ""
+msgstr "Pánico (Enviar MIDI all-notes-off)"
 
 # it's not literal, but it's what it does
 # translating to "rollo" or "rodar" doesn't make much sense in spanish
 # am I missing something?
 #: ardour_ui_ed.cc:553
 msgid "Transition to Roll"
-msgstr "Transición hacia delante"
+msgstr "Transición hacia Adelante"
 
 #: ardour_ui_ed.cc:557
 msgid "Transition to Reverse"
-msgstr "Transición hacia atrás"
+msgstr "Transición hacia Atrás"
 
 #: ardour_ui_ed.cc:561 ardour_ui_ed.cc:595
 msgid "Jump to Previous Mark"
@@ -2337,31 +2431,31 @@ msgstr "Purgar archivos no usados..."
 
 #: ardour_ui_ed.cc:581
 msgid "Clean-up Unused Regions..."
-msgstr ""
+msgstr "Limpiar regiones no utilizadas..."
 
 #: ardour_ui_ed.cc:585
 msgid "Rebuild Peak Files"
-msgstr ""
+msgstr "Reconstruir archivos de pico"
 
 #: ardour_ui_ed.cc:598
 msgid "Set Session Start from Playhead"
-msgstr "Definir Inicio de sesión según cursor"
+msgstr "Definir Inicio de sesión según el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:600
 msgid "Set Session End from Playhead"
-msgstr "Definir Fin de sesión según cursor"
+msgstr "Definir Fin de sesión según el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:603
 msgid "Toggle Mark at Playhead"
-msgstr ""
+msgstr "Alternar Marcador en el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:605 ardour_ui_ed.cc:607
 msgid "Add Mark from Playhead"
-msgstr "Añadir marca en cursor"
+msgstr "Añadir marca en el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:610 ardour_ui_ed.cc:612
 msgid "Remove Mark at Playhead"
-msgstr "Borrar marca en cursor"
+msgstr "Borrar marca en el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:615
 msgid "Nudge Next Later"
@@ -2373,27 +2467,27 @@ msgstr "Adelantar a cercano"
 
 #: ardour_ui_ed.cc:620
 msgid "Nudge Playhead Forward"
-msgstr "Empujar cursor adelante"
+msgstr "Empujar el Cabezal de Reproducción adelante"
 
 #: ardour_ui_ed.cc:622
 msgid "Nudge Playhead Backward"
-msgstr "Empujar cursor atrás"
+msgstr "Empujar el Cabezal de Reproducción atrás"
 
 #: ardour_ui_ed.cc:624
 msgid "Playhead to Next Grid"
-msgstr "Cursor a rejilla siguiente"
+msgstr "Cabezal de Reproducción a rejilla siguiente"
 
 #: ardour_ui_ed.cc:626
 msgid "Playhead to Previous Grid"
-msgstr "Cursor a rejilla anterior"
+msgstr "Cabezal de Reproducción a rejilla anterior"
 
 #: ardour_ui_ed.cc:629
 msgid "Start Range from Playhead"
-msgstr "Inicio de rango según cursor"
+msgstr "Inicio de rango según el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:631
 msgid "Finish Range from Playhead"
-msgstr "Fin de rango según cursor"
+msgstr "Fin de rango según el Cabezal de Reproducción"
 
 #: ardour_ui_ed.cc:633 ardour_ui_ed.cc:645
 msgid "Start Range"
@@ -2423,7 +2517,7 @@ msgstr "Fin de rango de bucle"
 
 #: ardour_ui_ed.cc:650
 msgid "Select All Visible Lanes"
-msgstr ""
+msgstr "Seleccionar Todas las Carriles Visibles"
 
 #: ardour_ui_ed.cc:652
 msgid "Select All Tracks"
@@ -2439,7 +2533,7 @@ msgstr "Invertir selección"
 
 #: ardour_ui_ed.cc:659
 msgid "Solo Selection"
-msgstr ""
+msgstr "Selección con solo"
 
 #: ardour_ui_ed.cc:672 ardour_ui_ed.cc:673 ardour_ui_ed.cc:674
 msgid "Attach"
@@ -2447,11 +2541,11 @@ msgstr "Acoplar"
 
 #: ardour_ui_ed.cc:680
 msgid "Show Mixer"
-msgstr ""
+msgstr "Mostrar Mezclador"
 
 #: ardour_ui_ed.cc:681
 msgid "Show Editor"
-msgstr ""
+msgstr "Mostrar Editor"
 
 #: ardour_ui_ed.cc:687 ardour_ui_ed.cc:688 ardour_ui_ed.cc:689
 #: ardour_ui_ed.cc:695 ardour_ui_ed.cc:696 ardour_ui_ed.cc:697
@@ -2480,11 +2574,11 @@ msgstr "Maximizar Mezclador"
 
 #: ardour_ui_ed.cc:778
 msgid "Path to Session"
-msgstr ""
+msgstr "Ruta a la Sesión"
 
 #: ardour_ui_ed.cc:779
 msgid "Active Peak-file Work"
-msgstr ""
+msgstr "Trabajo Activo de Archivos de Pico"
 
 #: ardour_ui_ed.cc:780
 msgid "File Format"
@@ -2504,23 +2598,23 @@ msgstr "Hora actual"
 
 #: ardour_ui_ed.cc:799
 msgid "Double click to open session folder."
-msgstr ""
+msgstr "Haz doble clic para abrir la carpeta de la sesión."
 
 #: ardour_ui_ed.cc:800
 msgid "Double click to edit audio file format."
-msgstr ""
+msgstr "Haz doble clic para editar el formato del archivo de audio."
 
 #: ardour_ui_ed.cc:801
 msgid "Double click to change timecode settings."
-msgstr ""
+msgstr "Haz doble clic para cambiar la configuración del código de tiempo."
 
 #: ardour_ui_ed.cc:802
 msgid "Double click to show audio/midi setup."
-msgstr ""
+msgstr "Haz doble clic para mostrar la configuración de audio/MIDI."
 
 #: ardour_ui_engine.cc:60
 msgid "This is a free/demo copy of %1. It has just switched to silent mode."
-msgstr ""
+msgstr "Esta es una copia gratuita/demo de %1. Ha cambiado a modo silencioso."
 
 #: ardour_ui_engine.cc:66
 msgid "%1 is now silent"
@@ -2530,18 +2624,21 @@ msgstr "%1 está silenciado"
 msgid ""
 "Please consider paying for a copy of %1 - you can pay whatever you want."
 msgstr ""
+"Por favor, considere pagar por una copia de %1; puede pagar lo que desee."
 
 #: ardour_ui_engine.cc:69
 msgid "Better yet become a subscriber - subscriptions start at US$1 per month."
 msgstr ""
+"Mejor aún, conviértase en suscriptor: las suscripciones comienzan en US$1 al "
+"mes."
 
 #: ardour_ui_engine.cc:70
 msgid "Pay for a copy (via the web)"
-msgstr ""
+msgstr "Pagar por una copia (a través de la web)"
 
 #: ardour_ui_engine.cc:71
 msgid "Become a subscriber (via the web)"
-msgstr ""
+msgstr "Conviértete en suscriptor (a través de la web)"
 
 #: ardour_ui_engine.cc:90
 msgid "Remain silent"
@@ -2549,7 +2646,7 @@ msgstr "Permanecer silenciado"
 
 #: ardour_ui_engine.cc:92
 msgid "Give me more time"
-msgstr ""
+msgstr "Dame más tiempo"
 
 #: ardour_ui_engine.cc:117
 msgid "xrun"
@@ -2564,16 +2661,20 @@ msgid ""
 "%1 is not connected to any audio backend.\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
+"%1 no está conectado a ningún backend de audio.\n"
+"No puedes abrir ni cerrar sesiones en esta condición"
 
 #: ardour_ui_options.cc:64
 msgid ""
 "It is not possible to use JACK as the sync source\n"
 " when the pull up/down setting is non-zero."
 msgstr ""
+"No es posible usar JACK como fuente de sincronización\n"
+"cuando la configuración de pull up/down es diferente de cero."
 
 #: ardour_ui_options.cc:307 ardour_ui_options.cc:327
 msgid "SyncSource|Int."
-msgstr ""
+msgstr "Int."
 
 #: ardour_ui_options.cc:573
 msgid "Enable/Disable external positional sync"
@@ -2599,7 +2700,7 @@ msgstr "Abrir sesión existente"
 
 #: ardour_ui_session.cc:186 ardour_ui_session.cc:1108 startup_fsm.cc:673
 msgid "Extracting session-archive failed: %1"
-msgstr ""
+msgstr "La extracción del archivo de sesión falló: %1"
 
 #: ardour_ui_session.cc:236 ardour_ui_session.cc:269 ardour_ui_session.cc:800
 #: startup_fsm.cc:741
@@ -2631,6 +2732,8 @@ msgid ""
 "Session \"%1 (snapshot %2)\" did not load successfully:\n"
 "%3%4%5"
 msgstr ""
+"La sesión \"%1 (instantánea %2)\" no se cargó correctamente:\n"
+"%3%4%5"
 
 #: ardour_ui_session.cc:432 ardour_ui_session.cc:453 ardour_ui_session.cc:641
 #: ardour_ui_session.cc:654
@@ -2639,7 +2742,7 @@ msgstr "Error al cargar"
 
 #: ardour_ui_session.cc:447
 msgid "Session \"%1 (snapshot %2)\" did not load successfully.%3%4"
-msgstr ""
+msgstr "La sesión \"%1 (instantánea %2)\" no se cargó correctamente.%3%4"
 
 #: ardour_ui_session.cc:463
 msgid ""
@@ -2652,10 +2755,18 @@ msgid ""
 "If you need to continue using tape tracks/destructive recording\n"
 "please use an older version of %1 to work on this session"
 msgstr ""
+"Esta sesión (de una versión anterior de %1) utilizó al menos una\n"
+"'pista de cinta' (también conocida como 'grabación destructiva').\n"
+"\n"
+"Esto ya no es compatible con el programa. Las pistas de cinta se han "
+"configurado como pistas normales.\n"
+"\n"
+"Si necesitas seguir usando pistas de cinta/grabación destructiva,\n"
+"por favor utiliza una versión anterior de %1 para trabajar en esta sesión"
 
 #: ardour_ui_session.cc:472
 msgid "Tape Tracks No Longer Supported"
-msgstr ""
+msgstr "Pistas de Cinta Ya No Soportadas"
 
 #: ardour_ui_session.cc:494
 msgid ""
@@ -2663,30 +2774,33 @@ msgid ""
 "\n"
 "You will not be able to record or save."
 msgstr ""
+"Esta sesión se ha abierto en modo de solo lectura.\n"
+"\n"
+"No podrás grabar ni guardar."
 
 #: ardour_ui_session.cc:499
 msgid "Read-only Session"
-msgstr ""
+msgstr "Sesión de Solo Lectura"
 
 #: ardour_ui_session.cc:640
 msgid "Could not create session in \"%1\": %2%3%4"
-msgstr ""
+msgstr "No se pudo crear la sesión en \"%1\": %2%3%4"
 
 #: ardour_ui_session.cc:653
 msgid "Could not create session in \"%1\"%2%3"
-msgstr ""
+msgstr "No se pudo crear la sesión en \"%1\"%2%3"
 
 #: ardour_ui_session.cc:704
 msgid "Abort saving snapshot"
-msgstr ""
+msgstr "Abortar el guardado de la instantánea"
 
 #: ardour_ui_session.cc:705
 msgid "Don't save now, just snapshot"
-msgstr ""
+msgstr "No guardar ahora, solo hacer una instantánea"
 
 #: ardour_ui_session.cc:706 ardour_ui_session.cc:866
 msgid "Save it first"
-msgstr ""
+msgstr "Guardarla primero"
 
 #: ardour_ui_session.cc:714 ardour_ui_session.cc:874
 msgid ""
@@ -2696,10 +2810,15 @@ msgid ""
 "\n"
 "\"Don't save now\" option."
 msgstr ""
+"%1 no pudo guardar su sesión.\n"
+"\n"
+"Si aún desea continuar, por favor \n"
+"\n"
+"utilice la opción \"No guardar ahora\"."
 
 #: ardour_ui_session.cc:732
 msgid "Snapshot and switch"
-msgstr "Captura de sesión y cambio"
+msgstr "Captura de Sesión y Cambio"
 
 #: ardour_ui_session.cc:733 ardour_ui_session.cc:785
 msgid "New session name"
@@ -2707,19 +2826,19 @@ msgstr "Nuevo nombre de sesión"
 
 #: ardour_ui_session.cc:735
 msgid "Take Snapshot"
-msgstr "Guardar captura de sesión"
+msgstr "Guardar Captura de Sesión"
 
 #: ardour_ui_session.cc:736
 msgid "Name of new snapshot"
-msgstr "Nombre de captura de sesión"
+msgstr "Nombre de Captura de Sesión"
 
 #: ardour_ui_session.cc:781
 msgid "Name Session"
-msgstr ""
+msgstr "Nombrar Sesión"
 
 #: ardour_ui_session.cc:782
 msgid "Session name"
-msgstr ""
+msgstr "Nombre de la sesión"
 
 #: ardour_ui_session.cc:784
 msgid "Rename Session"
@@ -2743,15 +2862,15 @@ msgstr ""
 #: ardour_ui_session.cc:836
 #, c-format
 msgid "Copied %<PRId64> of %<PRId64>"
-msgstr ""
+msgstr "Copiado %<PRId64> de %<PRId64>"
 
 #: ardour_ui_session.cc:864
 msgid "Abort save-as"
-msgstr ""
+msgstr "Abortar guardar como"
 
 #: ardour_ui_session.cc:865
 msgid "Don't save now, just save-as"
-msgstr ""
+msgstr "No guardar ahora, solo guardar como"
 
 #: ardour_ui_session.cc:921 save_as_dialog.cc:35
 msgid "Save As"
@@ -2763,7 +2882,7 @@ msgstr "Guardar como falló: %1"
 
 #: ardour_ui_session.cc:985
 msgid "Session Archiving failed."
-msgstr ""
+msgstr "La archivación de la sesión falló."
 
 #: ardour_ui_session.cc:1013
 msgid ""
@@ -2771,15 +2890,18 @@ msgid ""
 "snapshot names may not contain a '%1' character"
 msgstr ""
 "Para asegurar la compatibilidad entre varios sistemas, los\n"
-"nombres de captura de sesión no pueden contener el carácter '%1'"
+"nombres de captura instantánea de sesión no \n"
+"pueden contener el carácter '%1'"
 
 #: ardour_ui_session.cc:1027
 msgid "Confirm Snapshot Overwrite"
-msgstr "Confirmar reescritura de captura de sesión"
+msgstr "Confirmar reescritura de captura instánea de sesión"
 
 #: ardour_ui_session.cc:1028
 msgid "A snapshot already exists with that name. Do you want to overwrite it?"
-msgstr "Ya existe una captura de sesión con ese nombre. ¿Quieres reescribirla?"
+msgstr ""
+"Ya existe una captura instantánea de sesión con ese nombre. ¿Quieres "
+"reescribirla?"
 
 #: ardour_ui_session.cc:1050
 msgid "Open Session"
@@ -2792,7 +2914,7 @@ msgstr "sesiones %1"
 
 #: ardour_ui_session.cc:1079 session_dialog.cc:460
 msgid "Session Archives"
-msgstr ""
+msgstr "Archivos de Sesión"
 
 #: ardour_ui_session.cc:1165
 msgid "Unsaved Session"
@@ -2808,7 +2930,7 @@ msgid ""
 "\n"
 "What do you want to do?"
 msgstr ""
-" La sesión \"%1\"\n"
+"La sesión \"%1\"\n"
 "no se ha guardado.\n"
 "\n"
 "Si no la guardas se perderán \n"
@@ -2826,8 +2948,9 @@ msgid ""
 "\n"
 "What do you want to do?"
 msgstr ""
-" La captura de sesión \"%1\"\n"
-"no se ha guardado.\n"
+"La captura instantánea\n"
+" de sesión \"%1\" no se \n"
+"ha guardado.\n"
 "\n"
 "Si no la guardas se perderá\n"
 "cualquier cambio que hayas realizado.\n"
@@ -2852,6 +2975,18 @@ msgid ""
 "\n"
 "From now on, use the backup copy with older versions of %3"
 msgstr ""
+"%4Esta es una sesión de una versión anterior de %3%5\n"
+"\n"
+"%3 ha copiado el archivo de sesión antiguo\n"
+"\n"
+"%6%1%7\n"
+"\n"
+"a\n"
+"\n"
+"%6%2%7\n"
+"\n"
+"De ahora en adelante, use la copia de monitoreo con versiones anteriores de "
+"%3"
 
 #: ardour_ui_startup.cc:183
 msgid "Sample Rate Mismatch"
@@ -2887,27 +3022,27 @@ msgstr ""
 "pero %2 está ejecutándose actualmente a %3 Hz.\n"
 "El audio se capturará y reproducirá con una tasa de muestreo incorrecta.\n"
 "Reconfigura el motor de audio en\n"
-"Menú > Ventana > Configuración Audio/Midi "
+"Menú > Ventana > Configuración Audio/Midi"
 
 #: ardour_ui_startup.cc:380
 msgid "NSM: initialization failed"
-msgstr ""
+msgstr "NSM: la inicialización falló"
 
 #: ardour_ui_startup.cc:407
 msgid "NSM server did not announce itself. Continuing without NSM."
-msgstr ""
+msgstr "El servidor NSM no se anunció. Continuando sin NSM."
 
 #: ardour_ui_startup.cc:409
 msgid "NSM server did not announce itself"
-msgstr ""
+msgstr "El servidor NSM no se anunció"
 
 #: ardour_ui_startup.cc:425
 msgid "NSM: no client ID provided"
-msgstr ""
+msgstr "NSM: no se proporcionó un ID de cliente"
 
 #: ardour_ui_startup.cc:434
 msgid "NSM: no session created"
-msgstr ""
+msgstr "NSM: no se creó ninguna sesión"
 
 #: ardour_ui_startup.cc:581 new_user_wizard.cc:419
 msgid "%1 is ready for use"
@@ -2921,10 +3056,11 @@ msgid ""
 "You can view the memory limit with 'ulimit -l', and it is normally "
 "controlled by %2"
 msgstr ""
-"AVISO: Tu sistema tiene un límite para la cantidad de memoria bloqueada. "
+"ALERTA: Tu sistema tiene un límite para la cantidad de memoria bloqueada. "
 "Esto puede causar que %1 se quede sin memoria antes que tu sistema. \n"
 "\n"
-"Puedes comprobar este límite con 'ulimit -l' y normalmente se establece en %2"
+"Puedes observar este límite con 'ulimit -l' y normalmente es controlado con "
+"%2"
 
 #: ardour_ui_startup.cc:648
 msgid "Do not show this window again"
@@ -2945,11 +3081,11 @@ msgstr "¿De verdad quieres detener el servidor de video?"
 
 #: ardour_ui_video.cc:78
 msgid "Yes, Stop It"
-msgstr "Sí, páralo."
+msgstr "Sí, páralo"
 
 #: ardour_ui_video.cc:107
 msgid "The Video Server is already started."
-msgstr "El servidor de video ya está en marcha"
+msgstr "El servidor de video ya está en marcha."
 
 #: ardour_ui_video.cc:109
 msgid ""
@@ -2969,11 +3105,11 @@ msgstr ""
 
 #: ardour_ui_video.cc:150
 msgid "Specified docroot is not an existing directory."
-msgstr ""
+msgstr "El docroot especificado no es un directorio existente."
 
 #: ardour_ui_video.cc:156 ardour_ui_video.cc:162
 msgid "Given Video Server is not an executable file."
-msgstr ""
+msgstr "El servidor de video proporcionado no es un archivo ejecutable."
 
 #: ardour_ui_video.cc:200
 msgid "Cannot launch the video-server"
@@ -2993,23 +3129,23 @@ msgstr "no hay archivo de video seleccionado"
 
 #: ardour_ui_video.cc:355
 msgid "No LTC detected, video will not be aligned."
-msgstr ""
+msgstr "No se detectó LTC, el video no estará alineado."
 
 #: ardour_ui_video.cc:361
 msgid "Align video-start to %1 [samples]"
-msgstr ""
+msgstr "Alinear el inicio del video a %1 [muestras]"
 
 #: audio_clock.cc:132 audio_clock.cc:133
 msgid "0000000000000"
-msgstr ""
+msgstr "0000000000000"
 
 #: audio_clock.cc:934
 msgid "Change current tempo"
-msgstr ""
+msgstr "Cambiar el tempo actual"
 
 #: audio_clock.cc:935
 msgid "Change current time signature"
-msgstr ""
+msgstr "Cambiar el compás actual"
 
 #: audio_clock.cc:971 audio_clock.cc:985
 msgid "--pending--"
@@ -3017,7 +3153,7 @@ msgstr "--pendiente--"
 
 #: audio_clock.cc:991
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
 #: audio_clock.cc:1051
 msgid "SR"
@@ -3034,11 +3170,11 @@ msgstr "Pull"
 
 #: audio_clock.cc:1280
 msgid "Tempo|T"
-msgstr ""
+msgstr "T"
 
 #: audio_clock.cc:1284
 msgid "TimeSignature|TS"
-msgstr ""
+msgstr "COMP"
 
 #: audio_clock.cc:1896 audio_streamview.cc:118 editor_actions.cc:1104
 #: luainstance.cc:1324 luainstance.cc:1329 luainstance.cc:2171
@@ -3070,7 +3206,7 @@ msgstr "Posicionar aquí"
 
 #: audio_clock.cc:2163
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Copiar al portapapeles"
 
 #: audio_region_editor.cc:63 rhythm_ferret.cc:140 rhythm_ferret.cc:157
 msgid "dB"
@@ -3104,11 +3240,11 @@ msgstr "Seleccionar nota..."
 
 #: automation_controller.cc:322
 msgid "Halve"
-msgstr ""
+msgstr "Reducir a la mitad"
 
 #: automation_controller.cc:325
 msgid "Double"
-msgstr ""
+msgstr "Incrementar al doble"
 
 #: automation_controller.cc:336
 msgid "Set to %1 beat"
@@ -3135,6 +3271,7 @@ msgstr "añadir evento de automatización"
 #: automation_streamview.cc:98
 msgid "unable to display automation region for control without list"
 msgstr ""
+"no se puede mostrar la región de automatización para el control sin lista"
 
 #: automation_time_axis.cc:178 automation_time_axis.cc:402
 #: automation_time_axis.cc:657 editor.cc:2001 editor.cc:2079
@@ -3177,11 +3314,11 @@ msgstr "???"
 
 #: automation_time_axis.cc:518
 msgid "clear automation"
-msgstr "limpiar automatización"
+msgstr "borrar automatización"
 
 #: automation_time_axis.cc:622
 msgid "Automation|Off"
-msgstr ""
+msgstr "Apagado"
 
 #: automation_time_axis.cc:625 gain_meter.cc:783
 msgid "Automation|Manual"
@@ -3211,15 +3348,15 @@ msgstr "Modo"
 
 #: automation_time_axis.cc:721
 msgid "Logarithmic"
-msgstr ""
+msgstr "Logarítmico"
 
 #: automation_time_axis.cc:731
 msgid "Exponential"
-msgstr ""
+msgstr "Exponencial"
 
 #: automation_time_axis.cc:741
 msgid "Interpolation"
-msgstr ""
+msgstr "Interpolación"
 
 #: bundle_manager.cc:184
 msgid "Disassociate"
@@ -3235,7 +3372,7 @@ msgstr "Dirección:"
 
 #: bundle_manager.cc:208 bundle_manager.cc:214
 msgid "Destination"
-msgstr ""
+msgstr "Destino"
 
 #: bundle_manager.cc:209 bundle_manager.cc:212 bundle_manager.cc:247
 #: editor_sources.cc:141 export_dialog.cc:570 transport_masters_dialog.cc:81
@@ -3296,11 +3433,11 @@ msgstr "Color"
 
 #: color_theme_manager.cc:145
 msgid "Items"
-msgstr ""
+msgstr "Items"
 
 #: color_theme_manager.cc:146
 msgid "Palette"
-msgstr ""
+msgstr "Paleta"
 
 #: color_theme_manager.cc:147
 msgid "Transparency"
@@ -3320,7 +3457,7 @@ msgstr "Punto de control"
 
 #: control_point_dialog.cc:46
 msgid "on"
-msgstr "on"
+msgstr "encendido"
 
 #: control_point_dialog.cc:48 rc_option_editor.cc:3133 rc_option_editor.cc:3147
 msgid "off"
@@ -3332,11 +3469,11 @@ msgstr "Valor"
 
 #: control_slave_ui.cc:52
 msgid "VCA Assign"
-msgstr ""
+msgstr "Asignar VCA"
 
 #: control_slave_ui.cc:56
 msgid "-VCAs-"
-msgstr ""
+msgstr "-VCAs-"
 
 #: control_slave_ui.cc:212
 msgid "Unassign All"
@@ -3344,35 +3481,35 @@ msgstr "Desasignar todos"
 
 #: duplicate_routes_dialog.cc:35
 msgid "Duplicate Tracks/Busses"
-msgstr ""
+msgstr "Duplicas Pistas/Buses"
 
 #: duplicate_routes_dialog.cc:36
 msgid "For each Track:"
-msgstr ""
+msgstr "Para cada Pista:"
 
 #: duplicate_routes_dialog.cc:37
 msgid "Copy playlist"
-msgstr ""
+msgstr "Copiar lista de reproducción"
 
 #: duplicate_routes_dialog.cc:38
 msgid "New playlist"
-msgstr ""
+msgstr "Nueva lista de reproducción"
 
 #: duplicate_routes_dialog.cc:39
 msgid "Share playlist"
-msgstr ""
+msgstr "Compartir lista de reproducción"
 
 #: duplicate_routes_dialog.cc:42
 msgid "Duplicate each track/bus this number of times:"
-msgstr ""
+msgstr "Duplicar cada pista/bus este número de veces:"
 
 #: duplicate_routes_dialog.cc:63
 msgid "Insert duplicates at: "
-msgstr ""
+msgstr "Insertar duplicados en: "
 
 #: duplicate_routes_dialog.cc:210
 msgid "1 or more tracks/busses could not be duplicated"
-msgstr ""
+msgstr "1 o más pistas/buses no se pudieron duplicar"
 
 #: edit_note_dialog.cc:44
 msgid "Note"
@@ -3428,79 +3565,79 @@ msgstr "editar nota"
 
 #: editor.cc:179 editor_actions.cc:563
 msgid "No Grid"
-msgstr "No rejilla"
+msgstr "Sin rejilla"
 
 #: editor.cc:180
 msgid "Bar"
-msgstr ""
+msgstr "Compás"
 
 #: editor.cc:181 quantize_dialog.cc:40
 msgid "1/4 Note"
-msgstr ""
+msgstr "Negra"
 
 #: editor.cc:182 quantize_dialog.cc:41
 msgid "1/8 Note"
-msgstr ""
+msgstr "Corchea"
 
 #: editor.cc:183 quantize_dialog.cc:42
 msgid "1/16 Note"
-msgstr ""
+msgstr "Semicorchea"
 
 #: editor.cc:184 quantize_dialog.cc:43
 msgid "1/32 Note"
-msgstr ""
+msgstr "Fusa"
 
 #: editor.cc:185 quantize_dialog.cc:44
 msgid "1/64 Note"
-msgstr ""
+msgstr "Semifusa"
 
 #: editor.cc:186 quantize_dialog.cc:45
 msgid "1/128 Note"
-msgstr ""
+msgstr "Cuartifusa"
 
 #: editor.cc:187 quantize_dialog.cc:47
 msgid "1/3 (8th triplet)"
-msgstr ""
+msgstr "1/3 (Tresillo de Corchea)"
 
 #: editor.cc:188 quantize_dialog.cc:48
 msgid "1/6 (16th triplet)"
-msgstr ""
+msgstr "1/6 (Tresillo de Semicorchea)"
 
 #: editor.cc:189 quantize_dialog.cc:49
 msgid "1/12 (32nd triplet)"
-msgstr ""
+msgstr "1/12 (Tresillo de Fusa)"
 
 #: editor.cc:190
 msgid "1/24 (64th triplet)"
-msgstr ""
+msgstr "1/24 (Tresillo de Semifusa"
 
 #: editor.cc:191 quantize_dialog.cc:51
 msgid "1/5 (8th quintuplet)"
-msgstr ""
+msgstr "1/5 (Quintillo de Corchea)"
 
 #: editor.cc:192 quantize_dialog.cc:52
 msgid "1/10 (16th quintuplet)"
-msgstr ""
+msgstr "1/10 (Quintillo de Semicorchea)"
 
 #: editor.cc:193 quantize_dialog.cc:53
 msgid "1/20 (32nd quintuplet)"
-msgstr ""
+msgstr "1/20 (Quintillo de Fusa)"
 
 #: editor.cc:194 quantize_dialog.cc:55
 msgid "1/7 (8th septuplet)"
-msgstr ""
+msgstr "1/7 (Septillizo de Corchea)"
 
 #: editor.cc:195 quantize_dialog.cc:56
 msgid "1/14 (16th septuplet)"
-msgstr ""
+msgstr "1/14 (Septizillo de Semicorchea)"
 
 #: editor.cc:196 quantize_dialog.cc:57
 msgid "1/28 (32nd septuplet)"
-msgstr ""
+msgstr "1/28 (Septizillo de Fusa)"
 
 #: editor.cc:198
 msgid "MinSec"
-msgstr ""
+msgstr "MinSeg"
 
 #: editor.cc:199
 msgid "CD Frames"
@@ -3508,7 +3645,7 @@ msgstr "Cuadros CD"
 
 #: editor.cc:204 editor.cc:222 editor_actions.cc:157 editor_actions.cc:547
 msgid "Playhead"
-msgstr "Cursor"
+msgstr "Cabezal de Reproducción"
 
 #: editor.cc:205 editor_actions.cc:549
 msgid "Marker"
@@ -3525,7 +3662,7 @@ msgstr "Deslizar"
 # seguro?
 #: editor.cc:212
 msgid "Splice"
-msgstr "Reunir"
+msgstr "Empalmar"
 
 #: editor.cc:213 editor_actions.cc:555
 msgid "Ripple"
@@ -3554,7 +3691,7 @@ msgstr "Punto de edición"
 
 #: editor.cc:230
 msgid "Mushy"
-msgstr "Mushy"
+msgstr "Pastoso"
 
 #: editor.cc:231
 msgid "Smooth"
@@ -3571,11 +3708,11 @@ msgstr "Percusión no tonal con notas estables"
 # "brillante" es un término común al menos en mi zona, quizás haya otras sugerencias
 #: editor.cc:234
 msgid "Crisp monophonic instrumental"
-msgstr "Instrumental monofónico brillante"
+msgstr "Instrumental monofónico nítido"
 
 #: editor.cc:235
 msgid "Unpitched solo percussion"
-msgstr "Percusión no tonal"
+msgstr "Percusión solista no tonal"
 
 #: editor.cc:236
 msgid "Resample without preserving pitch"
@@ -3612,7 +3749,7 @@ msgstr "Marcas de CD"
 
 #: editor.cc:335
 msgid "Video Timeline"
-msgstr ""
+msgstr "Línea de tiempo de video"
 
 #: editor.cc:391
 msgid "mode"
@@ -3624,7 +3761,7 @@ msgstr "Pistas y buses"
 
 #: editor.cc:662
 msgid "Sources"
-msgstr ""
+msgstr "Fuentes"
 
 #: editor.cc:663 rc_option_editor.cc:3030
 msgid "Regions"
@@ -3632,7 +3769,7 @@ msgstr "Regiones"
 
 #: editor.cc:664
 msgid "Snapshots"
-msgstr "Capturas de sesión"
+msgstr "Capturas instantáneas de sesión"
 
 #: editor.cc:665
 msgid "Track & Bus Groups"
@@ -3652,7 +3789,7 @@ msgstr "Pinchazo"
 
 #: editor.cc:1471 rc_option_editor.cc:2604
 msgid "Linear (for highly correlated material)"
-msgstr "Linear (for highly correlated material)"
+msgstr "Lineal (para material altamente correlacionado)"
 
 #: editor.cc:1481 rc_option_editor.cc:2605
 msgid "Constant power"
@@ -3660,7 +3797,7 @@ msgstr "Potencia constante"
 
 #: editor.cc:1490 rc_option_editor.cc:2606
 msgid "Symmetric"
-msgstr "Symmetric"
+msgstr "Simétrico"
 
 #: editor.cc:1500 rc_option_editor.cc:2607
 msgid "Slow"
@@ -3690,15 +3827,15 @@ msgstr "Descongelar"
 
 #: editor.cc:1744
 msgid "Region Loudness Analysis"
-msgstr "Análisis de loudness de región"
+msgstr "Análisis de Sonoridad de Región"
 
 #: editor.cc:1763 editor.cc:1812
 msgid "Audio Report/Analysis"
-msgstr ""
+msgstr "Informe/Análisis de Audio"
 
 #: editor.cc:1793
 msgid "Range Loudness Analysis"
-msgstr ""
+msgstr "Análisis de Sonoridad de Rango"
 
 #: editor.cc:1878
 msgid "Selected Regions"
@@ -3718,7 +3855,7 @@ msgstr "Zoom a rango"
 
 #: editor.cc:1920
 msgid "Loudness Analysis"
-msgstr "Análisis de loudness"
+msgstr "Análisis de sonoridad"
 
 #: editor.cc:1927 editor_actions.cc:414
 msgid "Move Range Start to Previous Region Boundary"
@@ -3746,15 +3883,15 @@ msgstr "Seleccionar todo en rango"
 
 #: editor.cc:1961 editor_actions.cc:341
 msgid "Set Loop from Selection"
-msgstr "Definir bucle según selección"
+msgstr "Definir Bucle Según Selección"
 
 #: editor.cc:1962 editor_actions.cc:342
 msgid "Set Punch from Selection"
-msgstr "Definir pinchazo según selección"
+msgstr "Definir Pinchazo Según Selección"
 
 #: editor.cc:1963 editor_actions.cc:343
 msgid "Set Session Start/End from Selection"
-msgstr "Definir Inicio y Fin de sesión según selección"
+msgstr "Definir Inicio y Fin de Sesión Según Selección"
 
 #: editor.cc:1966
 msgid "Add Range Markers"
@@ -3778,11 +3915,11 @@ msgstr "Consolidar rango con procesado"
 
 #: editor.cc:1975
 msgid "Bounce Range to Source List"
-msgstr ""
+msgstr "Rebotar Rango a la Lista de Fuentes"
 
 #: editor.cc:1976
 msgid "Bounce Range to Source List with Processing"
-msgstr ""
+msgstr "Rebotar Rango a la Lista de Fuentes con Procesamiento"
 
 #: editor.cc:1977 editor_markers.cc:970
 msgid "Export Range..."
@@ -3790,7 +3927,7 @@ msgstr "Exportar rango..."
 
 #: editor.cc:1979
 msgid "Export Video Range..."
-msgstr ""
+msgstr "Exportar Rango de Video..."
 
 #: editor.cc:1995 editor.cc:2077 editor_actions.cc:349
 msgid "Play from Edit Point"
@@ -3842,26 +3979,29 @@ msgstr "Seleccionar todo hasta punto de edición"
 
 #: editor.cc:2020 editor.cc:2094
 msgid "Select All After Playhead"
-msgstr "Seleccionar todo desde cursor"
+msgstr "Seleccionar Todo Después del Cabezal de Reproducción"
 
 #: editor.cc:2021 editor.cc:2095
 msgid "Select All Before Playhead"
-msgstr "Seleccionar todo hasta cursor"
+msgstr "Seleccionar Todo Antes del Cabezal de Reproducción"
 
 #: editor.cc:2022
 msgid "Select All Between Playhead and Edit Point"
-msgstr "Seleccionar todo entre cursor y punto de edición"
+msgstr ""
+"Seleccionar Todo Entre el Cabezal de Reproducción y el Punto de Edición"
 
 # Qué diferencia hay entre :
 # - Between playhead and edit point
 # - Within playhead and edit point
 #: editor.cc:2023
 msgid "Select All Within Playhead and Edit Point"
-msgstr "Seleccionar todo dentro de cursor y punto de edición"
+msgstr ""
+"Seleccionar Todo Dentro del Cabezal de Reproducción y el Punto de Edición"
 
 #: editor.cc:2024
 msgid "Select Range Between Playhead and Edit Point"
-msgstr "Seleccionar rango entre cursor y punto de edición"
+msgstr ""
+"Seleccionar Rango Entre el Cabezal de Reproducción y el Punto de Edición"
 
 #: editor.cc:2026 editor.cc:2097 editor_actions.cc:167 editor_actions.cc:168
 #: transport_masters_dialog.cc:78
@@ -3920,6 +4060,8 @@ msgstr "Empujar"
 msgid ""
 "Playhead position stored with a negative value - ignored (use zero instead)"
 msgstr ""
+"Posición del cabezal de reproducción almacenada con un valor negativo - "
+"ignorado (use cero en su lugar)"
 
 #: editor.cc:3166 editor.cc:3831 editor.cc:3913 midi_channel_selector.cc:160
 #: midi_channel_selector.cc:391 midi_channel_selector.cc:430
@@ -3928,55 +4070,55 @@ msgstr "Todos"
 
 #: editor.cc:3297
 msgid "Triplets"
-msgstr ""
+msgstr "Tresillo"
 
 #: editor.cc:3307
 msgid "Quintuplets"
-msgstr ""
+msgstr "Quintillo"
 
 #: editor.cc:3317
 msgid "Septuplets"
-msgstr ""
+msgstr "Septizillo"
 
 #: editor.cc:3328
 msgid "Smart Mode (add range functions to Grab Mode)"
-msgstr "Modo smart (añade funciones de rango al modo atrapar)"
+msgstr "Modo Inteligente (agregar funciones de rango al Modo de Agarre)"
 
 #: editor.cc:3329
 msgid "Grab Mode (select/move objects)"
-msgstr "Modo atrapar (seleccionar/mover objetos)"
+msgstr "Modo de Agarre (seleccionar/mover objetos)"
 
 #: editor.cc:3330
 msgid "Cut Mode (split regions)"
-msgstr "Modo recortar (separar regiones)"
+msgstr "Modo Recortar (separar regiones)"
 
 #: editor.cc:3331
 msgid "Range Mode (select time ranges)"
-msgstr "Modo rango (seleccionar rangos de tiempo)"
+msgstr "Modo de Rango (seleccionar rangos de tiempo)"
 
 #: editor.cc:3332
 msgid "Draw Mode (draw and edit gain/notes/automation)"
-msgstr "Modo dibujo (dibujar y editar ganancia/notas/automatización)"
+msgstr "Modo de Dibujo (dibujar y editar ganancia/notas/automatización)"
 
 #: editor.cc:3333
 msgid "Stretch Mode (time-stretch audio and midi regions, preserving pitch)"
 msgstr ""
-"Modo estirar (cambio de tempo de regiones audio y midi, manteniendo el tono)"
+"Modo Estirar (cambio de tempo de regiones audio y midi, manteniendo el tono)"
 
 #: editor.cc:3334
 msgid "Audition Mode (listen to regions)"
-msgstr "Modo audición (escuchar regiones)"
+msgstr "Modo de Audición (escuchar regiones)"
 
 #: editor.cc:3335
 msgid "Internal Edit Mode (edit notes and automation points)"
-msgstr "Modo edición interna (editar notas y puntos de automatización)"
+msgstr "Modo de Edición Interna (editar notas y puntos de automatización)"
 
 #: editor.cc:3336
 msgid ""
 "Groups: click to (de)activate\n"
 "Context-click for other operations"
 msgstr ""
-"Grupos: clic  para (des)activar\n"
+"Grupos: clic para (des)activar\n"
 "Contexto-clic para otras operaciones"
 
 #: editor.cc:3337
@@ -3997,31 +4139,31 @@ msgstr "Alejar"
 
 #: editor.cc:3341
 msgid "Zoom to Time Scale"
-msgstr ""
+msgstr "Acercar a la Escala de Tiempo"
 
 #: editor.cc:3342 editor.cc:3853 editor_actions.cc:292
 msgid "Zoom to Session"
-msgstr "Ajustar zoom a sesión"
+msgstr "Ajustar Zoom a Sesión"
 
 #: editor.cc:3343 editor_actions.cc:148 editor_actions.cc:184
 msgid "Zoom Focus"
-msgstr "Foco del zoom"
+msgstr "Foco del Zoom"
 
 #: editor.cc:3344
 msgid "Expand Tracks"
-msgstr "Expandir pistas"
+msgstr "Expandir Pistas"
 
 #: editor.cc:3345
 msgid "Shrink Tracks"
-msgstr "Encoger pistas"
+msgstr "Encoger Pistas"
 
 #: editor.cc:3346
 msgid "Number of visible tracks"
-msgstr "Número de pistas visibles"
+msgstr "Número de pistas isibles"
 
 #: editor.cc:3347
 msgid "Grid Mode"
-msgstr ""
+msgstr "Modo de Cuadrícula"
 
 #: editor.cc:3348
 msgid ""
@@ -4029,10 +4171,13 @@ msgid ""
 "\n"
 "Right-click to visit Snap preferences."
 msgstr ""
+"Modo de Ajuste\n"
+"\n"
+"Haga clic derecho para visitar las preferencias de Ajuste."
 
 #: editor.cc:3349 editor_actions.cc:134
 msgid "Edit Point"
-msgstr "Punto de edición"
+msgstr "Punto de Edición"
 
 #: editor.cc:3350
 msgid "Edit Mode"
@@ -4080,43 +4225,43 @@ msgstr "Selección"
 
 #: editor.cc:3833
 msgid "Fit 1 track"
-msgstr "Poner 1 pista"
+msgstr "Ajustar a 1 pista"
 
 #: editor.cc:3834
 msgid "Fit 2 tracks"
-msgstr "Poner 2 pistas"
+msgstr "Ajustar a 2 pistas"
 
 #: editor.cc:3835
 msgid "Fit 4 tracks"
-msgstr "Poner 4 pistas"
+msgstr "Ajustar a 4 pistas"
 
 #: editor.cc:3836
 msgid "Fit 8 tracks"
-msgstr "Poner 8 pistas"
+msgstr "Ajustar a 8 pistas"
 
 #: editor.cc:3837
 msgid "Fit 16 tracks"
-msgstr "Poner 16 pistas"
+msgstr "Ajustar a 16 pistas"
 
 #: editor.cc:3838
 msgid "Fit 24 tracks"
-msgstr "Poner 24 pistas"
+msgstr "Ajustar a 24 pistas"
 
 #: editor.cc:3839
 msgid "Fit 32 tracks"
-msgstr "Poner 32 pistas"
+msgstr "Ajustar a 32 pistas"
 
 #: editor.cc:3840
 msgid "Fit 48 tracks"
-msgstr "Poner 48 pistas"
+msgstr "Ajustar a 48 pistas"
 
 #: editor.cc:3841
 msgid "Fit All tracks"
-msgstr "Poner todas las pistas"
+msgstr "Ajustar a todas las pistas"
 
 #: editor.cc:3842
 msgid "Fit Selection"
-msgstr "Ajustar selección"
+msgstr "Ajustar a la selección"
 
 #: editor.cc:3844 editor_actions.cc:309
 msgid "Zoom to 10 ms"
@@ -4156,7 +4301,7 @@ msgstr "Zoom a 24 horas"
 
 #: editor.cc:3854 editor_actions.cc:293
 msgid "Zoom to Extents"
-msgstr ""
+msgstr "Acercar a los Extremos"
 
 #: editor.cc:3855
 msgid "Zoom to Range/Region Selection"
@@ -4194,7 +4339,7 @@ msgstr "Conservar lista de reproducción"
 
 #: editor.cc:4213
 msgid "Keep Remaining"
-msgstr ""
+msgstr "Conservar Restante"
 
 #: editor.cc:4214 editor_audio_import.cc:674 editor_ops.cc:6964
 #: engine_dialog.cc:3162 sfdb_freesound_mootcher.cc:69 keyeditor.cc:80
@@ -4312,19 +4457,19 @@ msgstr "Enlace"
 # chequear en contexto
 #: editor_actions.cc:149
 msgid "Locate to Markers"
-msgstr "Localizar a marcas"
+msgstr "Localizar en Marcadores"
 
 #: editor_actions.cc:150 editor_actions.cc:611 rc_option_editor.cc:2718
 msgid "Markers"
-msgstr "Marcas"
+msgstr "Marcadores"
 
 #: editor_actions.cc:151
 msgid "Meter falloff"
-msgstr "Tasa de decaimiento"
+msgstr "Tasa de decaimiento del medidor"
 
 #: editor_actions.cc:152
 msgid "Meter hold"
-msgstr "Retención"
+msgstr "Retención del medidor"
 
 #: editor_actions.cc:153 session_option_editor.cc:347
 msgid "MIDI Options"
@@ -4338,15 +4483,15 @@ msgstr "Opciones misceláneas"
 #: session_option_editor.cc:264 session_option_editor.cc:265
 #: session_option_editor.cc:272 session_option_editor.cc:278
 msgid "Monitoring"
-msgstr "Monitorización"
+msgstr "Monitoreo"
 
 #: editor_actions.cc:156
 msgid "Active Mark"
-msgstr "Marca activa"
+msgstr "Marca Activa"
 
 #: editor_actions.cc:159
 msgid "Primary Clock"
-msgstr "Reloj primario"
+msgstr "Reloj Primario"
 
 #: editor_actions.cc:160
 msgid "Pullup / Pulldown"
@@ -4371,7 +4516,7 @@ msgstr "Desplazamiento"
 
 #: editor_actions.cc:166
 msgid "Secondary Clock"
-msgstr "Reloj secundario"
+msgstr "Reloj Secundario"
 
 #: editor_actions.cc:173
 msgid "Subframes"
@@ -4379,7 +4524,7 @@ msgstr "Subcuadros"
 
 #: editor_actions.cc:176
 msgid "Timecode fps"
-msgstr "Timecode fps"
+msgstr "Código de tiempo fps"
 
 #: editor_actions.cc:178 route_time_axis.cc:644 vca_time_axis.cc:458
 msgid "Height"
@@ -4399,7 +4544,7 @@ msgstr "Zoom"
 
 #: editor_actions.cc:186
 msgid "Lua Scripts"
-msgstr ""
+msgstr "Scripts de Lua"
 
 #: editor_actions.cc:195
 msgid "Session|Lock"
@@ -4411,47 +4556,49 @@ msgstr "Mostrar Mezclador en Editor"
 
 #: editor_actions.cc:198
 msgid "Show Editor List"
-msgstr "Mostrar lista de Editor"
+msgstr "Mostrar Lista del Editor"
 
 #: editor_actions.cc:200
 msgid "Playhead to Next Region Boundary"
-msgstr "Cursor a borde de región siguiente"
+msgstr "Cabezal de Reproducción a borde de región siguiente"
 
 #: editor_actions.cc:201
 msgid "Playhead to Next Region Boundary (No Track Selection)"
-msgstr "Cursor a borde de región siguiente (sin selección de pista)"
+msgstr ""
+"Cabezal de Reproducción a borde de región siguiente (sin selección de pista)"
 
 #: editor_actions.cc:202
 msgid "Playhead to Previous Region Boundary"
-msgstr "Cursor a borde de región anterior"
+msgstr "Cabezal de Reproducción a borde de región anterior"
 
 #: editor_actions.cc:203
 msgid "Playhead to Previous Region Boundary (No Track Selection)"
-msgstr "Cursor a borde de región anterior (sin selección de pista)"
+msgstr ""
+"Cabezal de Reproducción a borde de región anterior (sin selección de pista)"
 
 #: editor_actions.cc:205
 msgid "Playhead to Next Region Start"
-msgstr "Cursor a inicio de región siguiente"
+msgstr "Cabezal de Reproducción a inicio de región siguiente"
 
 #: editor_actions.cc:206
 msgid "Playhead to Next Region End"
-msgstr "Cursor a fin de región siguiente"
+msgstr "Cabezal de Reproducción a fin de región siguiente"
 
 #: editor_actions.cc:207
 msgid "Playhead to Next Region Sync"
-msgstr "Cursor a punto de sincronía siguiente"
+msgstr "Cabezal de Reproducción a punto de sincronía siguiente"
 
 #: editor_actions.cc:209
 msgid "Playhead to Previous Region Start"
-msgstr "Cursor a inicio de región anterior"
+msgstr "Cabezal de Reproducción a inicio de región anterior"
 
 #: editor_actions.cc:210
 msgid "Playhead to Previous Region End"
-msgstr "Cursor a fin de región anterior"
+msgstr "Cabezal de Reproducción a fin de región anterior"
 
 #: editor_actions.cc:211
 msgid "Playhead to Previous Region Sync"
-msgstr "Cursor a punto de sincronía anterior"
+msgstr "Cabezal de Reproducción a punto de sincronía anterior"
 
 #: editor_actions.cc:213
 msgid "To Next Region Boundary"
@@ -4503,19 +4650,19 @@ msgstr "A fin de rango"
 
 #: editor_actions.cc:229
 msgid "Playhead to Range Start"
-msgstr "Cursor a inicio de rango"
+msgstr "Cabezal de Reproducción a inicio de rango"
 
 #: editor_actions.cc:230
 msgid "Playhead to Range End"
-msgstr "Cursor a final de rango"
+msgstr "Cabezal de Reproducción a final de rango"
 
 #: editor_actions.cc:238
 msgid "Edit Current Tempo"
-msgstr ""
+msgstr "Editar Tempo Actual"
 
 #: editor_actions.cc:239
 msgid "Edit Current Meter"
-msgstr ""
+msgstr "Editar Compás Actual"
 
 #: editor_actions.cc:246
 msgid "Select All Overlapping Edit Range"
@@ -4547,35 +4694,35 @@ msgstr "Seleccionar pista o bus anterior"
 
 #: editor_actions.cc:257
 msgid "Select Next Strip"
-msgstr ""
+msgstr "Seleccionar Siguiente Franja"
 
 #: editor_actions.cc:258
 msgid "Select Previous Strip"
-msgstr ""
+msgstr "Seleccionar Franja Anterior"
 
 #: editor_actions.cc:260
 msgid "Toggle All Existing Automation"
-msgstr ""
+msgstr "Activar/Desactivar Toda la Automatización Existente"
 
 #: editor_actions.cc:261
 msgid "Toggle Layer Display"
-msgstr ""
+msgstr "Activar/Desactivar Visualización de Capas"
 
 #: editor_actions.cc:263
 msgid "Toggle Record Enable"
-msgstr "Activar/Desactivar grabación"
+msgstr "Activar/Desactivar Grabación"
 
 #: editor_actions.cc:265
 msgid "Toggle Solo"
-msgstr "Conmutar solo"
+msgstr "Activar/Desactivar Solo"
 
 #: editor_actions.cc:267
 msgid "Toggle Mute"
-msgstr "Conmutar mudo"
+msgstr "Activar/Desactivar Mudo"
 
 #: editor_actions.cc:269
 msgid "Toggle Solo Isolate"
-msgstr "Conmutar solo aislado"
+msgstr "Activar/Desactivar solo aislado"
 
 #: editor_actions.cc:274
 msgid "Save View %1"
@@ -4595,7 +4742,7 @@ msgstr "Zoom a selección"
 
 #: editor_actions.cc:295
 msgid "Zoom to Selection (Horizontal)"
-msgstr ""
+msgstr "Acercar a la Selección (Horizontal)"
 
 #: editor_actions.cc:296
 msgid "Toggle Zoom State"
@@ -4611,31 +4758,31 @@ msgstr "Disminuir altura de pista"
 
 #: editor_actions.cc:301
 msgid "Fit 1 Track"
-msgstr "Poner 1 pista"
+msgstr "Ajustar a 1 pista"
 
 #: editor_actions.cc:302
 msgid "Fit 2 Tracks"
-msgstr "Poner 2 pistas"
+msgstr "Ajustar a 2 pistas"
 
 #: editor_actions.cc:303
 msgid "Fit 4 Tracks"
-msgstr "Poner 4 pistas"
+msgstr "Ajustar a 4 pistas"
 
 #: editor_actions.cc:304
 msgid "Fit 8 Tracks"
-msgstr "Poner 8 pistas"
+msgstr "Ajustar a 8 pistas"
 
 #: editor_actions.cc:305
 msgid "Fit 16 Tracks"
-msgstr "Poner 16 pistas"
+msgstr "Ajustar a 16 pistas"
 
 #: editor_actions.cc:306
 msgid "Fit 32 Tracks"
-msgstr "Poner 32 pistas"
+msgstr "Ajustar a 32 pistas"
 
 #: editor_actions.cc:307
 msgid "Fit All Tracks"
-msgstr "Poner todas las pistas"
+msgstr "Ajustar a todas las pistas"
 
 #: editor_actions.cc:314
 msgid "Zoom to 5 min"
@@ -4643,33 +4790,33 @@ msgstr "Zoom a 5 min"
 
 #: editor_actions.cc:317
 msgid "Move Selected Tracks Up"
-msgstr "Subir las pistas seleccionadas"
+msgstr "Mover Pistas Seleccionadas hacia Arriba"
 
 #: editor_actions.cc:319
 msgid "Move Selected Tracks Down"
-msgstr "Bajar las pistas seleccionadas"
+msgstr "Mover Pistas Seleccionadas hacia Abajo"
 
 # Esto estaba traducido como "desplazar pistas hacia arriba" pero no estaba bien. La clave del sentido original la da la palabra "scroll". Es un desplazamiento de visualización en el editor para ver las pistas de más arriba o de más abajo. NO estamos desplazando pistas.
 #: editor_actions.cc:322
 msgid "Scroll Tracks Up"
-msgstr "Desplazarse hacia arriba"
+msgstr "Desplazar Pistas hacia arriba"
 
 #: editor_actions.cc:323
 msgid "Scroll Tracks Down"
-msgstr "Desplazarse hacia abajo"
+msgstr "Desplazar Pistas hacia abajo"
 
 # No lo encuentro en el Editor pero supongo que es lo mismo que Scroll Tracks up/down, sólo que poco a poco, no de forma brusca como hace el scroll. Lo dejo sin traducir, pues sospecho que la traducción era incorrecta y no sé dónde está ni cómo traducirlo
 #: editor_actions.cc:324
 msgid "Step Tracks Up"
-msgstr "Step Tracks Up"
+msgstr "Subir Pistas"
 
 #: editor_actions.cc:325
 msgid "Step Tracks Down"
-msgstr "Step Tracks Down"
+msgstr "Bajar Pistas"
 
 #: editor_actions.cc:326
 msgid "Select Topmost Track"
-msgstr ""
+msgstr "Seleccionar la Pista Superior"
 
 #: editor_actions.cc:328
 msgid "Scroll Backward"
@@ -4681,7 +4828,7 @@ msgstr "Desplazarse hacia delante"
 
 #: editor_actions.cc:330
 msgid "Center Playhead"
-msgstr "Centrar cursor"
+msgstr "Centrar el Cabezal de Reproducción"
 
 #: editor_actions.cc:331
 msgid "Center Edit Point"
@@ -4689,31 +4836,31 @@ msgstr "Centrar punto de edición"
 
 #: editor_actions.cc:333
 msgid "Playhead Forward"
-msgstr "Cursor hacia delante"
+msgstr "Cabezal de Reproducción hacia delante"
 
 #: editor_actions.cc:334
 msgid "Playhead Backward"
-msgstr "Cursor hacia atrás"
+msgstr "Cabezal de Reproducción hacia atrás"
 
 #: editor_actions.cc:336
 msgid "Playhead to Active Mark"
-msgstr "Cursor a marca activa"
+msgstr "Cabezal de Reproducción a marcador activo"
 
 #: editor_actions.cc:337
 msgid "Active Mark to Playhead"
-msgstr "Marca activa a cursor"
+msgstr "Marcador activo a Cabezal de Reproducción"
 
 #: editor_actions.cc:339
 msgid "Use Skip Ranges"
-msgstr ""
+msgstr "Usar Rangos de Salto"
 
 #: editor_actions.cc:346 editor_actions.cc:1598
 msgid "Play Selected Regions"
-msgstr "Reproducir regiones seleccionadas"
+msgstr "Reproducir Regiones Seleccionadas"
 
 #: editor_actions.cc:347 editor_actions.cc:1599
 msgid "Tag Selected Regions"
-msgstr ""
+msgstr "Etiquetar Regiones Seleccionadas"
 
 #: editor_actions.cc:350
 msgid "Play from Edit Point and Return"
@@ -4725,15 +4872,17 @@ msgstr "Reproducir rango de edición"
 
 #: editor_actions.cc:354
 msgid "Playhead to Mouse"
-msgstr "Cursor a ratón"
+msgstr "Cabezal de Reproducción a ratón"
 
 #: editor_actions.cc:355
 msgid "Active Marker to Mouse"
-msgstr "Marca activa a ratón"
+msgstr "Marcador activo a ratón"
 
 #: editor_actions.cc:356
 msgid "Set Auto Punch In/Out from Playhead"
 msgstr ""
+"Establecer Pinchado Automático de Entrada/Salida desde el Cabezal de "
+"Reproducción"
 
 #: editor_actions.cc:361 editor_actions.cc:1548
 msgid "Multi-Duplicate..."
@@ -4741,19 +4890,19 @@ msgstr "Duplicado múltiple..."
 
 #: editor_actions.cc:370
 msgid "Undo Selection Change"
-msgstr "Deshacer cambio de selección"
+msgstr "Deshacer Cambio de Selección"
 
 #: editor_actions.cc:371
 msgid "Redo Selection Change"
-msgstr "Rehacer cambio de selección"
+msgstr "Rehacer Cambio de Selección"
 
 #: editor_actions.cc:373
 msgid "Export Audio"
-msgstr "Exportar audio"
+msgstr "Exportar Audio"
 
 #: editor_actions.cc:374 export_dialog.cc:532
 msgid "Export Range"
-msgstr "Exportar rango"
+msgstr "Exportar Rango"
 
 #: editor_actions.cc:379
 msgid "Separate Using Punch Range"
@@ -4781,43 +4930,43 @@ msgstr "Definir tempo según \"rango de edición = compás\""
 
 #: editor_actions.cc:399
 msgid "Log"
-msgstr "Log"
+msgstr "Registro"
 
 #: editor_actions.cc:402 editor_actions.cc:404
 msgid "Move to Next Transient"
-msgstr "Mover a siguiente transitorio"
+msgstr "Mover a siguiente transiente"
 
 #: editor_actions.cc:403 editor_actions.cc:405
 msgid "Move to Previous Transient"
-msgstr "Mover a transitorio previo"
+msgstr "Mover a transiente previo"
 
 #: editor_actions.cc:439
 msgid "Follow Playhead"
-msgstr "Seguir al cursor"
+msgstr "Seguir el Cabezal de Reproducción"
 
 #: editor_actions.cc:440
 msgid "Remove Last Capture"
-msgstr "Borrar última captura"
+msgstr "Borrar Última Captura"
 
 #: editor_actions.cc:441 editor_ops.cc:5202
 msgid "Tag Last Capture"
-msgstr ""
+msgstr "Etiquetar la Última Captura"
 
 #: editor_actions.cc:443
 msgid "Stationary Playhead"
-msgstr "Cursor estático"
+msgstr "Cabezal de Reproducción Estacionario"
 
 #: editor_actions.cc:445 insert_remove_time_dialog.cc:36
 msgid "Insert Time"
-msgstr "Insertar tiempo"
+msgstr "Insertar Tiempo"
 
 #: editor_actions.cc:447 insert_remove_time_dialog.cc:36
 msgid "Remove Time"
-msgstr "Borrar tiempo"
+msgstr "Borrar Tiempo"
 
 #: editor_actions.cc:452
 msgid "Toggle Active"
-msgstr "Activar/Desactivar pista"
+msgstr "Activar/Desactivar Pista"
 
 #: editor_actions.cc:454 editor_actions.cc:1477 editor_markers.cc:936
 #: editor_markers.cc:1031 editor_markers.cc:1053 editor_snapshots.cc:139
@@ -4869,7 +5018,7 @@ msgstr "Foco de zoom al centro"
 
 #: editor_actions.cc:484
 msgid "Zoom Focus Playhead"
-msgstr "Foco de zoom al cursor"
+msgstr "Foco de zoom al Cabezal de Reproducción"
 
 #: editor_actions.cc:485
 msgid "Zoom Focus Mouse"
@@ -4885,15 +5034,15 @@ msgstr "Siguiente foco del zoom"
 
 #: editor_actions.cc:496
 msgid "no action bound"
-msgstr ""
+msgstr "ninguna acción asignada"
 
 #: editor_actions.cc:503
 msgid "Smart Mode"
-msgstr ""
+msgstr "Modo Inteligente"
 
 #: editor_actions.cc:506
 msgid "Smart"
-msgstr "Smart"
+msgstr "Inteligente"
 
 #: editor_actions.cc:509
 msgid "Object Tool"
@@ -4921,11 +5070,11 @@ msgstr "Herramienta de contenidos"
 
 #: editor_actions.cc:539
 msgid "Cut Tool"
-msgstr ""
+msgstr "Herramienta de Corte"
 
 #: editor_actions.cc:544
 msgid "Step Mouse Mode"
-msgstr "Step Mouse Mode"
+msgstr "Modo de Ratón por Pasos"
 
 #: editor_actions.cc:551
 msgid "Change Edit Point"
@@ -4933,7 +5082,7 @@ msgstr "Cambiar punto de edición"
 
 #: editor_actions.cc:552
 msgid "Change Edit Point Including Marker"
-msgstr "Cambiar punto de edición incluyendo marca"
+msgstr "Cambiar punto de edición incluyendo marcador"
 
 #: editor_actions.cc:557
 msgid "EditMode|Lock"
@@ -4945,11 +5094,11 @@ msgstr "Modo de edición cíclica"
 
 #: editor_actions.cc:560
 msgid "Snap & Grid"
-msgstr ""
+msgstr "Ajuste y Cuadrícula"
 
 #: editor_actions.cc:564 rc_option_editor.cc:2750
 msgid "Grid"
-msgstr "Rejilla"
+msgstr "Cuadrícula"
 
 #: editor_actions.cc:565
 msgid "Magnetic"
@@ -4957,23 +5106,23 @@ msgstr "Imán"
 
 #: editor_actions.cc:567
 msgid "Snap"
-msgstr ""
+msgstr "Ajustar"
 
 #: editor_actions.cc:571
 msgid "Toggle Snap"
-msgstr ""
+msgstr "Activar/Desactivar Ajuste"
 
 #: editor_actions.cc:572
 msgid "Next Quantize Grid Choice"
-msgstr ""
+msgstr "Siguiente Opción de Cuadrícula de Cuantización"
 
 #: editor_actions.cc:573
 msgid "Previous Quantize Grid Choice"
-msgstr ""
+msgstr "Elección de Cuadrícula de Cuantización Anterior"
 
 #: editor_actions.cc:603
 msgid "Show Marker Lines"
-msgstr "Mostrar líneas de marca"
+msgstr "Mostrar Líneas de Marcadores"
 
 #: editor_actions.cc:613
 msgid "Loop/Punch"
@@ -4986,35 +5135,35 @@ msgstr "Mins:Segs"
 #: editor_actions.cc:619 editor_actions.cc:622 editor_rulers.cc:276
 #: rc_option_editor.cc:1731
 msgid "Video Monitor"
-msgstr ""
+msgstr "Monitor de Video"
 
 #: editor_actions.cc:621 rc_option_editor.cc:4232 rc_option_editor.cc:4233
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: editor_actions.cc:624
 msgid "Always on Top"
-msgstr ""
+msgstr "Siempre al frente"
 
 #: editor_actions.cc:626
 msgid "Frame number"
-msgstr ""
+msgstr "Número de fotograma"
 
 #: editor_actions.cc:627
 msgid "Timecode Background"
-msgstr ""
+msgstr "Fondo de código de tiempo"
 
 #: editor_actions.cc:628
 msgid "Fullscreen"
-msgstr ""
+msgstr "Pantalla completa"
 
 #: editor_actions.cc:629
 msgid "Letterbox"
-msgstr ""
+msgstr "Letterbox"
 
 #: editor_actions.cc:630
 msgid "Original Size"
-msgstr ""
+msgstr "Tamaño Original"
 
 #: editor_actions.cc:677
 msgid "Remove Unused"
@@ -5022,28 +5171,28 @@ msgstr "Eliminar no usados"
 
 #: editor_actions.cc:679
 msgid "Import PT session"
-msgstr "Importar sesión PT"
+msgstr "Importar sesión de PT"
 
 #: editor_actions.cc:684
 msgid "Import to Source List..."
-msgstr ""
+msgstr "Importar a la Lista de Fuentes..."
 
 #: editor_actions.cc:687 session_import_dialog.cc:51
 #: session_import_dialog.cc:72
 msgid "Import from Session"
-msgstr "Importar desde sesión"
+msgstr "Importar desde Sesión"
 
 #: editor_actions.cc:691
 msgid "Bring all media into session folder"
-msgstr ""
+msgstr "Traer todo el material a la carpeta de la sesión"
 
 #: editor_actions.cc:694
 msgid "Show Summary"
-msgstr "Mostrar resumen"
+msgstr "Mostrar Resumen"
 
 #: editor_actions.cc:696
 msgid "Show Group Tabs"
-msgstr "Mostrar pestañas de grupos"
+msgstr "Mostrar Pestañas de Grupos"
 
 #: editor_actions.cc:698
 msgid "Toggle MIDI Input Active for Editor-Selected Tracks/Busses"
@@ -5057,183 +5206,184 @@ msgstr "Cuantificar"
 
 #: editor_actions.cc:713
 msgid "Delete Selection"
-msgstr ""
+msgstr "Eliminar Selección"
 
 #: editor_actions.cc:714
 msgid "Delete Selection (alternate)"
-msgstr ""
+msgstr "Eliminar Selección (alternativo)"
 
 #: editor_actions.cc:716
 msgid "Clear Note Selection"
-msgstr ""
+msgstr "Desmarcar Selección de Notas"
 
 #: editor_actions.cc:717
 msgid "Move Note Start Earlier (fine)"
-msgstr ""
+msgstr "Adelantar el Inicio de la Nota (preciso)"
 
 #: editor_actions.cc:718
 msgid "Move Note Start Earlier"
-msgstr ""
+msgstr "Adelantar el Inicio de la Nota"
 
 #: editor_actions.cc:719
 msgid "Move Note Ends Later (fine)"
-msgstr ""
+msgstr "Atrasar el Final de la Nota (preciso)"
 
 #: editor_actions.cc:720
 msgid "Move Note Ends Later"
-msgstr ""
+msgstr "Atrasar el Final de la Nota"
 
 #: editor_actions.cc:724
 msgid "Select Next"
-msgstr ""
+msgstr "Seleccionar Siguiente"
 
 #: editor_actions.cc:725
 msgid "Select Next (alternate)"
-msgstr ""
+msgstr "Seleccionar Siguiente (alternativo)"
 
 #: editor_actions.cc:726
 msgid "Select Previous"
-msgstr ""
+msgstr "Seleccionar Anterior"
 
 #: editor_actions.cc:727
 msgid "Select Previous (alternate)"
-msgstr ""
+msgstr "Seleccionar Anterior (alternativo)"
 
 #: editor_actions.cc:728
 msgid "Add Next to Selection"
-msgstr ""
+msgstr "Añadir Siguiente a la Selección"
 
 #: editor_actions.cc:729
 msgid "Add Next to Selection (alternate)"
-msgstr ""
+msgstr "Añadir Siguiente a la Selección (alternativo)"
 
 #: editor_actions.cc:730
 msgid "Add Previous to Selection"
-msgstr ""
+msgstr "Añadir Anterior a la Selección"
 
 #: editor_actions.cc:731
 msgid "Add Previous to Selection (alternate)"
-msgstr ""
+msgstr "Añadir Anterior a la Selección (alternativo)"
 
 #: editor_actions.cc:733
 msgid "Increase Velocity"
-msgstr ""
+msgstr "Aumentar la Velocidad"
 
 #: editor_actions.cc:734
 msgid "Increase Velocity (fine)"
-msgstr ""
+msgstr "Aumentar la Velocidad (preciso)"
 
 #: editor_actions.cc:735
 msgid "Increase Velocity (allow mush)"
-msgstr ""
+msgstr "Aumentar la Velocidad (permitir exceso o distorsión)"
 
 #: editor_actions.cc:736
 msgid "Increase Velocity (non-relative)"
-msgstr ""
+msgstr "Aumentar la Velocidad (no relativa)"
 
 #: editor_actions.cc:737
 msgid "Increase Velocity (fine, allow mush)"
-msgstr ""
+msgstr "Aumentar la Velocidad (preciso, permitir distorsión)"
 
 #: editor_actions.cc:738
 msgid "Increase Velocity (fine, non-relative)"
-msgstr ""
+msgstr "Aumentar la Velocidad (preciso, no relativo)"
 
 #: editor_actions.cc:739
 msgid "Increase Velocity (maintain ratios, allow mush)"
-msgstr ""
+msgstr "Aumentar la Velocidad (mantener las proporciones, permitir distorsión)"
 
 #: editor_actions.cc:740
 msgid "Increase Velocity (fine, allow mush, non-relative)"
-msgstr ""
+msgstr "Aumentar la Velocidad (preciso, permitir distorsión, no relativo)"
 
 #: editor_actions.cc:742
 msgid "Decrease Velocity"
-msgstr ""
+msgstr "Disminuir la Velocidad"
 
 #: editor_actions.cc:743
 msgid "Decrease Velocity (fine)"
-msgstr ""
+msgstr "Disminuir la Velocidad (preciso)"
 
 #: editor_actions.cc:744
 msgid "Decrease Velocity (allow mush)"
-msgstr ""
+msgstr "Disminuir la Velocidad (permitir distorsión)"
 
 #: editor_actions.cc:745
 msgid "Decrease Velocity (non-relative)"
-msgstr ""
+msgstr "Disminuir la Velocidad (no relativa)"
 
 #: editor_actions.cc:746
 msgid "Decrease Velocity (fine, allow mush)"
-msgstr ""
+msgstr "Disminuir la Velocidad (preciso, permitir distorsión)"
 
 #: editor_actions.cc:747
 msgid "Decrease Velocity (fine, non-relative)"
-msgstr ""
+msgstr "Disminuir la Velocidad (preciso, no relativo)"
 
 #: editor_actions.cc:748
 msgid "Decrease Velocity (maintain ratios, allow mush)"
 msgstr ""
+"Disminuir la Velocidad (mantener las proporciones, permitir distorsión)"
 
 #: editor_actions.cc:749
 msgid "Decrease Velocity (fine, allow mush, non-relative)"
-msgstr ""
+msgstr "Disminuir la Velocidad (preciso, permitir distorsión, no relativo)"
 
 #: editor_actions.cc:751
 msgid "Transpose Up (octave)"
-msgstr ""
+msgstr "Transponer hacia Arriba (octava)"
 
 #: editor_actions.cc:752
 msgid "Transpose Up (octave, allow mush)"
-msgstr ""
+msgstr "Transponer hacia Arriba (octava, permitir distorsión)"
 
 #: editor_actions.cc:753
 msgid "Transpose Up (semitone)"
-msgstr ""
+msgstr "Transponer hacia Arriba (semitono)"
 
 #: editor_actions.cc:754
 msgid "Transpose Up (semitone, allow mush)"
-msgstr ""
+msgstr "Transponer hacia Arriba (semitono, permitir distorsión)"
 
 #: editor_actions.cc:756
 msgid "Transpose Down (octave)"
-msgstr ""
+msgstr "Transponer hacia Abajo (octava)"
 
 #: editor_actions.cc:757
 msgid "Transpose Down (octave, allow mush)"
-msgstr ""
+msgstr "Transponer hacia Abajo (octava, permitir distorsión)"
 
 #: editor_actions.cc:758
 msgid "Transpose Down (semitone)"
-msgstr ""
+msgstr "Transponer hacia Abajo (semitono)"
 
 #: editor_actions.cc:759
 msgid "Transpose Down (semitone, allow mush)"
-msgstr ""
+msgstr "Transponer hacia Abajo (semitono, permitir distorsión)"
 
 #: editor_actions.cc:761
 msgid "Nudge Notes Later (grid)"
-msgstr ""
+msgstr "Desplazar Notas Más Tarde (cuadrícula)"
 
 #: editor_actions.cc:762
 msgid "Nudge Notes Later (1/4 grid)"
-msgstr ""
+msgstr "Desplazar Notas Más Tarde (1/4 de cuadrícula)"
 
 #: editor_actions.cc:763
 msgid "Nudge Notes Earlier (grid)"
-msgstr ""
+msgstr "Desplazar Notas Más Pronto (cuadrícula)"
 
 #: editor_actions.cc:764
 msgid "Nudge Notes Earlier (1/4 grid)"
-msgstr ""
+msgstr "Desplazar Notas Más Pronto (1/4 de cuadrícula)"
 
 #: editor_actions.cc:766
 msgid "Edit Note Channels"
-msgstr ""
+msgstr "Editar Canales de las Notas"
 
 #: editor_actions.cc:767
 msgid "Edit Note Velocities"
-msgstr ""
+msgstr "Editar Velocidades de las Notas"
 
 #: editor_actions.cc:1093 editor_actions.cc:1231 editor_actions.cc:1242
 #: editor_actions.cc:1297 editor_actions.cc:1308 editor_actions.cc:1355
@@ -5263,7 +5413,7 @@ msgstr "Mover a posición original"
 
 #: editor_actions.cc:1499
 msgid "Lock to Video"
-msgstr ""
+msgstr "Bloquear a Video"
 
 #: editor_actions.cc:1500 editor_markers.cc:928 editor_markers.cc:963
 #: session_option_editor.cc:372
@@ -5286,7 +5436,7 @@ msgstr "Normalizar..."
 
 #: editor_actions.cc:1512
 msgid "Reverse"
-msgstr "Al revés"
+msgstr "Revertir"
 
 #: editor_actions.cc:1515
 msgid "Make Mono Regions"
@@ -5350,7 +5500,7 @@ msgstr "Cerrar huecos"
 
 #: editor_actions.cc:1575
 msgid "Rhythm Ferret..."
-msgstr "Rhythm Ferret..."
+msgstr "Ferret de ritmo..."
 
 #: editor_actions.cc:1578
 msgid "Export..."
@@ -5358,7 +5508,7 @@ msgstr "Exportar..."
 
 #: editor_actions.cc:1581
 msgid "Separate Under"
-msgstr "Separar debajo"
+msgstr "Separar Debajo"
 
 #: editor_actions.cc:1583 editor_actions.cc:1584
 msgid "Set Fade In Length"
@@ -5402,11 +5552,11 @@ msgstr "Descombinar"
 
 #: editor_actions.cc:1606
 msgid "Loudness Analysis..."
-msgstr "Análisis de loudness..."
+msgstr "Análisis de Sonoridad..."
 
 #: editor_actions.cc:1607
 msgid "Spectral Analysis..."
-msgstr "Análisis espectral..."
+msgstr "Análisis Espectral..."
 
 #: editor_actions.cc:1609
 msgid "Reset Envelope"
@@ -5442,7 +5592,7 @@ msgstr "Adelantar"
 
 #: editor_actions.cc:1629
 msgid "Sequence Regions"
-msgstr ""
+msgstr "Secuenciar Regiones"
 
 #: editor_actions.cc:1631
 msgid "Nudge Later by Capture Offset"
@@ -5470,7 +5620,7 @@ msgstr "Recortar a siguiente"
 
 #: editor_actions.cc:1643
 msgid "Insert Region from Source List"
-msgstr ""
+msgstr "Insertar Región Desde la Lista de Fuentes"
 
 #: editor_actions.cc:1647
 msgid "Set Sync Position"
@@ -5478,7 +5628,7 @@ msgstr "Establecer posición de sincronía"
 
 #: editor_actions.cc:1648
 msgid "Place Transient"
-msgstr "Colocar transitorio"
+msgstr "Colocar transiente"
 
 #: editor_actions.cc:1649
 msgid "Trim Start at Edit Point"
@@ -5554,6 +5704,8 @@ msgid ""
 "%1\n"
 "This audiofile cannot be embedded. It must be imported!"
 msgstr ""
+"%1\n"
+"Este archivo de audio no puede ser embebido. ¡Debe ser importado!"
 
 #: editor_audio_import.cc:647
 msgid "Cancel entire import"
@@ -5586,23 +5738,27 @@ msgstr "Embeber de todas formas"
 
 #: editor_pt_import.cc:82
 msgid "You can't import a PT session until you have a session loaded."
-msgstr "No puedes importar una sesión PT hasta tener una sesión cargada."
+msgstr "No puedes importar una sesión de PT hasta tener una sesión cargada."
 
 #: editor_pt_import.cc:96
 msgid "PT Import"
-msgstr ""
+msgstr "Importar desde PT"
 
 #: editor_pt_import.cc:112
 msgid "PT import may have missing files, check session log for details"
 msgstr ""
+"La importación de PT puede tener archivos faltantes, consulte el registro de "
+"la sesión para más detalles"
 
 #: editor_pt_import.cc:115
 msgid "PT import complete!"
-msgstr ""
+msgstr "¡Importación de PT completa!"
 
 #: editor_canvas_events.cc:1321 editor_drag.cc:1512
 msgid "Could not create new track after region placed in the drop zone"
 msgstr ""
+"No se pudo crear una nueva pista después de colocar la región en la zona de "
+"soltado"
 
 # No estoy seguro si queda bien, pero tampoco suena tan mal
 #: editor_drag.cc:1402
@@ -5611,7 +5767,7 @@ msgstr "Arrastre de región en tiempo fijado"
 
 #: editor_drag.cc:2415
 msgid "Ripple drag"
-msgstr ""
+msgstr "Arrastre en ondulación"
 
 #: editor_drag.cc:2504
 msgid "create region"
@@ -5628,18 +5784,22 @@ msgid ""
 "Locked to Video.\n"
 "The video cannot be moved."
 msgstr ""
+"Una o más regiones de audio\n"
+"están tanto bloqueadas\n"
+"como bloqueadas al video.\n"
+"El video no puede ser movido."
 
 #: editor_drag.cc:2873
 msgid "Video Start:"
-msgstr ""
+msgstr "Inicio del Video:"
 
 #: editor_drag.cc:2875
 msgid "Diff:"
-msgstr ""
+msgstr "Diff:"
 
 #: editor_drag.cc:2897
 msgid "Move Video"
-msgstr ""
+msgstr "Mover Video"
 
 #: editor_drag.cc:3356
 msgid "move meter mark"
@@ -5663,15 +5823,15 @@ msgstr "copiar marca de tempo"
 
 #: editor_drag.cc:3676
 msgid "stretch tempo"
-msgstr ""
+msgstr "estirar el tempo"
 
 #: editor_drag.cc:3825
 msgid "twist tempo"
-msgstr ""
+msgstr "retorcer el tempo"
 
 #: editor_drag.cc:3933
 msgid "stretch end tempo"
-msgstr ""
+msgstr "estirar el tempo final"
 
 #: editor_drag.cc:4254
 msgid "change fade in length"
@@ -5683,7 +5843,7 @@ msgstr "cambiar duración del fundido de salida"
 
 #: editor_drag.cc:4768
 msgid "move marker"
-msgstr "mover marca"
+msgstr "mover marcador"
 
 #: editor_drag.cc:5033 editor_drag.cc:6435
 msgid "automation range move"
@@ -5699,11 +5859,11 @@ msgstr "programming_error: %1"
 
 #: editor_drag.cc:5988 editor_drag.cc:5998
 msgid "new skip marker"
-msgstr ""
+msgstr "nuevo marcador de salto"
 
 #: editor_drag.cc:5989
 msgid "skip"
-msgstr ""
+msgstr "saltar"
 
 #: editor_drag.cc:5993 location_ui.cc:67
 msgid "CD"
@@ -5711,7 +5871,7 @@ msgstr "CD"
 
 #: editor_drag.cc:5994
 msgid "new CD marker"
-msgstr "nueva marca de CD"
+msgstr "nuevo marcador de CD"
 
 #: editor_drag.cc:5999 editor_route_groups.cc:441 mixer_ui.cc:2363
 msgid "unnamed"
@@ -5719,15 +5879,15 @@ msgstr "sin nombre"
 
 #: editor_drag.cc:6334
 msgid "Automation range drag created for invalid region type"
-msgstr ""
+msgstr "Rango de automatización creado para un tipo de región no válido"
 
 #: editor_drag.cc:6848
 msgid "Create Note"
-msgstr ""
+msgstr "Crear Nota"
 
 #: editor_drag.cc:6902
 msgid "Create Hit"
-msgstr ""
+msgstr "Crear Golpe"
 
 #: editor_route_groups.cc:102
 msgid "Col"
@@ -5803,7 +5963,7 @@ msgstr "Mon"
 
 #: editor_route_groups.cc:111
 msgid "Sharing Monitoring Choice?"
-msgstr "¿Opción de compartir monitorización?"
+msgstr "¿Opción de compartir monitoreo?"
 
 #: editor_route_groups.cc:112
 msgid "Selection|Sel"
@@ -5811,7 +5971,7 @@ msgstr "Sel"
 
 #: editor_route_groups.cc:112
 msgid "Sharing Selected/Editing Status?"
-msgstr "Sharing Selected/Editing Status?"
+msgstr "¿Compartir estado seleccionado/editar?"
 
 #: editor_route_groups.cc:113 editor_routes.cc:249
 msgid "Active|A"
@@ -5819,7 +5979,7 @@ msgstr "A"
 
 #: editor_route_groups.cc:113
 msgid "Sharing Active Status?"
-msgstr "Comparte estado de activo?"
+msgstr "¿Comparte estado de activo?"
 
 #: editor_export_audio.cc:97 editor_markers.cc:748 editor_markers.cc:845
 #: editor_markers.cc:1080 editor_markers.cc:1098 editor_markers.cc:1116
@@ -5829,7 +5989,9 @@ msgstr "Comparte estado de activo?"
 #: editor_markers.cc:1396 editor_markers.cc:1563 editor_markers.cc:1589
 #: editor_markers.cc:1785 editor_mouse.cc:2476
 msgid "programming error: marker canvas item has no marker object pointer!"
-msgstr "programming error: marker canvas item has no marker object pointer!"
+msgstr ""
+"Error de programación: ¡el elemento del lienzo del marcador no tiene un "
+"puntero de objeto de marcador!"
 
 #: editor_export_audio.cc:118
 msgid "Confirm MIDI File Overwrite"
@@ -5841,7 +6003,7 @@ msgstr "Ya existe un archivo con el mismo nombre. ¿Quieres sobreescribirlo?"
 
 #: editor_group_tabs.cc:184
 msgid "Fit to Window"
-msgstr "Encajar a ventana"
+msgstr "Ajustar a ventana"
 
 #: editor_markers.cc:148 mini_timeline.cc:568
 msgid "start"
@@ -5853,12 +6015,12 @@ msgstr "fin"
 
 #: editor_markers.cc:660
 msgid "mark"
-msgstr ""
+msgstr "marca"
 
 #: editor_markers.cc:665 editor_ops.cc:2233 editor_ops.cc:2255
 #: editor_ops.cc:2392 editor_ops.cc:2429 location_ui.cc:1073
 msgid "add marker"
-msgstr "añadir marca"
+msgstr "añadir marcador"
 
 #: editor_markers.cc:697 editor_markers.cc:1665
 msgid "set loop range"
@@ -5878,7 +6040,7 @@ msgstr "nueva marca de rango"
 
 #: editor_markers.cc:766 editor_ops.cc:2353 location_ui.cc:906
 msgid "remove marker"
-msgstr "eliminar marca"
+msgstr "eliminar marcador"
 
 #: editor_markers.cc:909
 msgid "Locate to Here"
@@ -5890,7 +6052,7 @@ msgstr "Reproducir desde aquí"
 
 #: editor_markers.cc:911
 msgid "Move Mark to Playhead"
-msgstr "Mover marca hasta cursor"
+msgstr "Mover Marcador al Cabezal de Reproducción"
 
 #: editor_markers.cc:915
 msgid "Create Range to Next Marker"
@@ -5898,20 +6060,20 @@ msgstr "Crear rango hasta marca siguiente"
 
 #: editor_markers.cc:917 editor_markers.cc:973
 msgid "Promote to Time Origin"
-msgstr ""
+msgstr "Promover a Origen de Tiempo"
 
 # chequear en contexto
 #: editor_markers.cc:953
 msgid "Locate to Marker"
-msgstr "Localizar a marca"
+msgstr "Localizar a marcador"
 
 #: editor_markers.cc:954
 msgid "Play from Marker"
-msgstr "Reproducir desde marca"
+msgstr "Reproducir desde marcador"
 
 #: editor_markers.cc:957
 msgid "Set Marker from Playhead"
-msgstr "Fijar marca en cursor"
+msgstr "Fijar marcador desde el Cabezal de Reproducción"
 
 #: editor_markers.cc:958
 msgid "Set Range from Selection"
@@ -5939,19 +6101,19 @@ msgstr "Seleccionar rango"
 
 #: editor_markers.cc:1005
 msgid "Don't Continue"
-msgstr ""
+msgstr "No Continuar"
 
 #: editor_markers.cc:1007 utils_videotl.cc:71
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: editor_markers.cc:1012
 msgid "Set Constant"
-msgstr ""
+msgstr "Establecer Constante"
 
 #: editor_markers.cc:1017
 msgid "Ramp to Next"
-msgstr ""
+msgstr "Aumentar hasta el Siguiente"
 
 #: editor_markers.cc:1022 editor_markers.cc:1047
 msgid "Lock to Music"
@@ -5969,7 +6131,7 @@ msgstr "Crear rango de pinchazo"
 
 #: editor_markers.cc:1357
 msgid "loop range from marker"
-msgstr ""
+msgstr "repetir rango desde el marcador"
 
 #: editor_markers.cc:1442
 msgid "change meter lock style"
@@ -5981,15 +6143,15 @@ msgstr "cambiar estilo de bloqueo de tempo"
 
 #: editor_markers.cc:1489
 msgid "set tempo to constant"
-msgstr ""
+msgstr "establecer el tempo como constante"
 
 #: editor_markers.cc:1508
 msgid "Clamp Tempo"
-msgstr ""
+msgstr "Anclar Tempo"
 
 #: editor_markers.cc:1545
 msgid "ramp to next tempo"
-msgstr ""
+msgstr "Incrementar hasta el siguiente tempo"
 
 #: editor_markers.cc:1616 editor_ops.cc:2181
 msgid "New Name:"
@@ -5997,7 +6159,7 @@ msgstr "Nuevo Nombre:"
 
 #: editor_markers.cc:1619
 msgid "Rename Mark"
-msgstr "Renombrar marca"
+msgstr "Renombrar marcador"
 
 #: editor_markers.cc:1621
 msgid "Rename Range"
@@ -6011,11 +6173,11 @@ msgstr "Renombrar"
 
 #: editor_markers.cc:1641
 msgid "rename marker"
-msgstr "renombrar marca"
+msgstr "renombrar marcador"
 
 #: editor_markers.cc:1798
 msgid "change marker lock style"
-msgstr ""
+msgstr "Cambiar el estilo de bloqueo de marcador"
 
 #: editor_mixer.cc:105
 msgid "This screen is not tall enough to display the editor mixer"
@@ -6029,37 +6191,40 @@ msgstr ""
 #: rc_option_editor.cc:2723 rc_option_editor.cc:2731 rc_option_editor.cc:2739
 #: rc_option_editor.cc:2747
 msgid "Editor/Snap"
-msgstr ""
+msgstr "Editor/Ajuste"
 
 #: editor_mouse.cc:1511 editor_mouse.cc:1529 editor_tempodisplay.cc:476
 msgid ""
 "programming error: tempo marker canvas item has no marker object pointer!"
 msgstr ""
-"programming error: tempo marker canvas item has no marker object pointer!"
+"Error de programación: el elemento del lienzo del marcador de tempo no tiene "
+"puntero de objeto de marcador!"
 
 #: editor_mouse.cc:1516 editor_tempodisplay.cc:481
 msgid "programming error: marker for tempo is not a tempo marker!"
-msgstr "programming error: marker for tempo is not a tempo marker!"
+msgstr ""
+"Error de programación: el marcador de tempo no es un marcador de tempo!"
 
 #: editor_mouse.cc:1534 editor_tempodisplay.cc:597
 msgid "programming error: marker for meter is not a meter marker!"
-msgstr "programming error: marker for meter is not a meter marker!"
+msgstr ""
+"Error de programación: el marcador de compás no es un marcador de compás!"
 
 #: editor_mouse.cc:2237 editor_mouse.cc:2262 editor_mouse.cc:2275
 msgid ""
 "programming error: control point canvas item has no control point object "
 "pointer!"
 msgstr ""
-"programming error: control point canvas item has no control point object "
-"pointer!"
+"Error de programación: el elemento del lienzo del punto de control no tiene "
+"puntero de objeto de punto de control!"
 
 #: editor_mouse.cc:2414
 msgid "start point trim"
-msgstr "recortar inicio"
+msgstr "recortar punto de inicio"
 
 #: editor_mouse.cc:2439
 msgid "end point trim"
-msgstr ""
+msgstr "recortar punto final"
 
 #: editor_mouse.cc:2491
 msgid "Name for region:"
@@ -6095,7 +6260,7 @@ msgstr "empujar atrás"
 
 #: editor_ops.cc:680
 msgid "sequence regions"
-msgstr ""
+msgstr "Regiones de secuencia"
 
 #: editor_ops.cc:2184 location_ui.cc:769
 msgid "New Range"
@@ -6111,11 +6276,11 @@ msgstr "Establecer inicio de sesión"
 
 #: editor_ops.cc:2392
 msgid "add markers"
-msgstr "añadir marcas"
+msgstr "añadir marcadores"
 
 #: editor_ops.cc:2496
 msgid "clear markers"
-msgstr "borrar marcas"
+msgstr "borrar marcadores"
 
 #: editor_ops.cc:2511
 msgid "clear ranges"
@@ -6163,11 +6328,11 @@ msgstr "Renombrar región"
 
 #: editor_ops.cc:2913 processor_box.cc:3384 route_ui.cc:1712
 msgid "New name:"
-msgstr "Nuevo nombre: "
+msgstr "Nuevo nombre:"
 
 #: editor_ops.cc:2949
 msgid "Rename failed. Check for characters such as '/' or ':'"
-msgstr ""
+msgstr "Renombrar fallido. Verifica si hay caracteres como '/' o ':'"
 
 #: editor_ops.cc:3209
 msgid "separate"
@@ -6175,15 +6340,15 @@ msgstr "separar"
 
 #: editor_ops.cc:3329
 msgid "separate region under"
-msgstr "separar regiones bajo"
+msgstr "separar regiones de abajo"
 
 #: editor_ops.cc:3396
 msgid "Crop Regions to Time Selection"
-msgstr ""
+msgstr "Recortar regiones a la selección de tiempo"
 
 #: editor_ops.cc:3407
 msgid "Crop Regions to Edit Range"
-msgstr ""
+msgstr "Recortar regiones al rango de edición"
 
 #: editor_ops.cc:3561
 msgid "set sync point"
@@ -6238,6 +6403,9 @@ msgid ""
 "Transport cannot be stopped, likely due to external timecode sync.\n"
 "Freezing a track requires the transport to be stopped."
 msgstr ""
+"El transporte no puede detenerse, probablemente debido a la sincronización "
+"externa de código de tiempo.\n"
+"Congelar una pista requiere que el transporte esté detenido."
 
 #: editor_ops.cc:3995 editor_ops.cc:4010
 msgid "Cannot freeze"
@@ -6265,6 +6433,13 @@ msgid ""
 "Freezing will only process the signal as far as the first send/insert/return/"
 "sidechain."
 msgstr ""
+"<b>%1</b>\n"
+"\n"
+"Esta pista tiene al menos un envío/inserción/devolución/sidechain como parte "
+"de su flujo de señal.\n"
+"\n"
+"El congelado solo procesará la señal hasta el primer envío/inserción/"
+"devolución/sidechain."
 
 #: editor_ops.cc:4020
 msgid "Freeze anyway"
@@ -6325,7 +6500,7 @@ msgstr "limpiar"
 
 #: editor_ops.cc:4249
 msgid "objects"
-msgstr ""
+msgstr "objetos"
 
 #: editor_ops.cc:4487 editor_ops.cc:4601
 msgid "remove region"
@@ -6333,7 +6508,7 @@ msgstr "eliminar región"
 
 #: editor_ops.cc:4516
 msgid "recover regions"
-msgstr ""
+msgstr "recuperar regiones"
 
 #: editor_ops.cc:5058
 msgid "duplicate range selection"
@@ -6354,11 +6529,11 @@ msgstr ""
 #: editor_ops.cc:5183 editor_ops.cc:7729 editor_regions.cc:410
 #: editor_snapshots.cc:176 editor_sources.cc:641 vca_master_strip.cc:513
 msgid "No, do nothing."
-msgstr "No, no hagas nada"
+msgstr "No, no hagas nada."
 
 #: editor_ops.cc:5184
 msgid "Yes, destroy it."
-msgstr "Sí, eliminar"
+msgstr "Sí, eliminar."
 
 #: editor_ops.cc:5186
 msgid "Destroy last capture"
@@ -6366,7 +6541,7 @@ msgstr "Destruir última captura"
 
 #: editor_ops.cc:5204
 msgid "Tag:"
-msgstr ""
+msgstr "Etiqueta:"
 
 #: editor_ops.cc:5219 session_archive_dialog.cc:53 session_archive_dialog.cc:54
 #: session_archive_dialog.cc:227 sfdb_ui.cc:1840 sfdb_ui.cc:1947
@@ -6379,7 +6554,7 @@ msgstr "normalizar"
 
 #: editor_ops.cc:5505
 msgid "reverse regions"
-msgstr "al revés"
+msgstr "revertir regiones"
 
 #: editor_ops.cc:5542
 msgid "strip silence"
@@ -6391,7 +6566,7 @@ msgstr "Ramificar región(es)"
 
 #: editor_ops.cc:5630
 msgid "Could not unlink %1"
-msgstr ""
+msgstr "No se pudo desvincular %1"
 
 #: editor_ops.cc:5900
 msgid "reset region gain"
@@ -6411,7 +6586,7 @@ msgstr "Bloqueo de video"
 
 #: editor_ops.cc:6037
 msgid "toggle region lock style"
-msgstr ""
+msgstr "Alternar estilo de bloqueo de región"
 
 #: editor_ops.cc:6062
 msgid "change region opacity"
@@ -6463,11 +6638,11 @@ msgstr "crear rango de pinchazo desde selección"
 
 #: editor_ops.cc:6699
 msgid "Auto Punch In"
-msgstr ""
+msgstr "Pinchazo Automático de Entrada"
 
 #: editor_ops.cc:6706 editor_ops.cc:6710
 msgid "Auto Punch In/Out"
-msgstr ""
+msgstr "Pinchazo Automático de Entrada/Salida"
 
 #: editor_ops.cc:6752
 msgid "set session start/end from selection"
@@ -6495,7 +6670,7 @@ msgstr "crear rango de pinchazo desde región"
 
 #: editor_ops.cc:6965
 msgid "Add new marker"
-msgstr "Añadir marca nueva"
+msgstr "Añadir marcador nueva"
 
 #: editor_ops.cc:6966
 msgid "Set global tempo"
@@ -6507,7 +6682,7 @@ msgstr "Definir un compás"
 
 #: editor_ops.cc:6970
 msgid "Do you want to set the global tempo or add a new tempo marker?"
-msgstr "¿Quieres definir el tempo global o añadir una nueva marca de tempo?"
+msgstr "¿Quieres definir el tempo global o añadir un nuevo marcador de tempo?"
 
 #: editor_ops.cc:6996
 msgid "set tempo from region"
@@ -6552,11 +6727,11 @@ msgstr "¿Excesivas divisiones?"
 
 #: editor_ops.cc:7233
 msgid "place transient"
-msgstr "place transient"
+msgstr "Colocar transiente"
 
 #: editor_ops.cc:7267
 msgid "snap regions to grid"
-msgstr "ajustar regiones a rejilla"
+msgstr "Ajustar regiones a la cuadrícula"
 
 #: editor_ops.cc:7308
 msgid "Close Region Gaps"
@@ -6580,7 +6755,7 @@ msgstr "cerrar huecos de regiones"
 
 #: editor_ops.cc:7659
 msgid "That would be bad news ...."
-msgstr "That would be bad news ...."
+msgstr "Eso serían malas noticias..."
 
 #: editor_ops.cc:7663
 msgid ""
@@ -6613,24 +6788,24 @@ msgstr[1] "buses"
 #: editor_ops.cc:7682
 msgid "VCA"
 msgid_plural "VCAs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "VCA"
+msgstr[1] "VCAs"
 
 #: editor_ops.cc:7685
 msgid "Remove various strips"
-msgstr ""
+msgstr "Eliminar varias franjas"
 
 #: editor_ops.cc:7686
 msgid "Do you really want to remove %1 %2, %3 %4 and %5 %6?"
-msgstr ""
+msgstr "¿Realmente deseas eliminar %1 %2, %3 %4 y %5 %6?"
 
 #: editor_ops.cc:7690 editor_ops.cc:7695 editor_ops.cc:7700
 msgid "Remove %1 and %2"
-msgstr ""
+msgstr "Eliminar %1 y %2"
 
 #: editor_ops.cc:7691 editor_ops.cc:7696 editor_ops.cc:7701
 msgid "Do you really want to remove %1 %2 and %3 %4?"
-msgstr ""
+msgstr "¿Realmente deseas eliminar %1 %2 y %3 %4?"
 
 #: editor_ops.cc:7705 editor_ops.cc:7710 editor_ops.cc:7715
 #: vca_master_strip.cc:508
@@ -6639,11 +6814,12 @@ msgstr "Eliminar %1"
 
 #: editor_ops.cc:7706 editor_ops.cc:7711 editor_ops.cc:7716
 msgid "Do you really want to remove %1 %2?"
-msgstr ""
+msgstr "¿Realmente deseas eliminar %1 %2?"
 
 #: editor_ops.cc:7727
 msgid "This action cannot be undone, and the session file will be overwritten!"
 msgstr ""
+"¡Esta acción no se puede deshacer y el archivo de la sesión será sobrescrito!"
 
 #: editor_ops.cc:7731
 msgid "Yes, remove them."
@@ -6651,15 +6827,15 @@ msgstr "Sí, elimínalas."
 
 #: editor_ops.cc:7733 editor_snapshots.cc:177 vca_master_strip.cc:514
 msgid "Yes, remove it."
-msgstr "Sí, elimínala"
+msgstr "Sí, elimínala."
 
 #: editor_ops.cc:7785
 msgid "You must first select some tracks to Insert Time."
-msgstr ""
+msgstr "Primero debes seleccionar algunas pistas para Insertar Tiempo."
 
 #: editor_ops.cc:7792
 msgid "You cannot insert time in Lock Edit mode."
-msgstr ""
+msgstr "No puedes insertar tiempo en el modo de edición bloqueado"
 
 #: editor_ops.cc:7867 editor_ops.cc:7889 editor_ops.cc:7930 editor_ops.cc:7940
 msgid "insert time"
@@ -6667,15 +6843,16 @@ msgstr "insertar tiempo"
 
 #: editor_ops.cc:7958
 msgid "You must first select some tracks to Remove Time."
-msgstr ""
+msgstr "Primero debes seleccionar algunas pistas para Eliminar Tiempo."
 
 #: editor_ops.cc:7965
 msgid "You cannot remove time in Lock Edit mode."
-msgstr ""
+msgstr "No puedes eliminar tiempo en el modo de edición bloqueado."
 
 #: editor_ops.cc:8002
 msgid "Cannot insert or delete time when in Lock edit."
 msgstr ""
+"No se puede insertar ni eliminar tiempo en el modo de edición bloqueado."
 
 #: editor_ops.cc:8016 editor_ops.cc:8035 editor_ops.cc:8109 editor_ops.cc:8122
 msgid "remove time"
@@ -6687,7 +6864,7 @@ msgstr "Hay demasiadas pistas para encajar en la ventana actual"
 
 #: editor_ops.cc:8257
 msgid "Sel"
-msgstr ""
+msgstr "Sel"
 
 #: editor_ops.cc:8296
 #, c-format
@@ -6720,7 +6897,7 @@ msgstr "Pulsa para desbloquear"
 
 #: editor_ops.cc:8496
 msgid "Moving embedded files into session folder"
-msgstr ""
+msgstr "Moviendo archivos embebidos a la carpeta de la sesión"
 
 #: editor_regions.cc:175
 msgid "Region name, with number of channels in []'s"
@@ -6729,7 +6906,7 @@ msgstr "Nombre de región, con número de canales en []"
 #: editor_regions.cc:176 editor_sources.cc:142 plugin_selector.cc:99
 #: plugin_selector.cc:169
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetas"
 
 #: editor_regions.cc:177 editor_regions.cc:791 midi_list_editor.cc:106
 #: time_info_box.cc:86
@@ -6754,11 +6931,11 @@ msgstr "¿Posición de región bloqueada?"
 
 #: editor_regions.cc:180
 msgid "Glued|G"
-msgstr ""
+msgstr "P"
 
 #: editor_regions.cc:180
 msgid "Region position glued to Bars|Beats time?"
-msgstr ""
+msgstr "¿La posición de la región está pegada al tiempo de Barras|Pulsos?"
 
 #: editor_regions.cc:181
 msgid "Region muted?"
@@ -6782,15 +6959,21 @@ msgstr "Posición de fin de región"
 
 #: editor_regions.cc:185
 msgid "Position of region sync point, relative to start of the region"
-msgstr "Position of region sync point, relative to start of the region"
+msgstr ""
+"Posición del punto de sincronización de la región, en relación con el inicio "
+"de la región"
 
 #: editor_regions.cc:186
 msgid "Length of region fade-in (units: secondary clock), () if disabled"
-msgstr "Length of region fade-in (units: secondary clock), () if disabled"
+msgstr ""
+"Longitud del fade-in de la región (unidades: reloj secundario), () si está "
+"deshabilitado"
 
 #: editor_regions.cc:187
 msgid "Length of region fade-out (units: secondary clock), () if disabled"
 msgstr ""
+"Longitud del fade-out de la región (unidades: reloj secundario), () si está "
+"deshabilitado"
 
 #: editor_regions.cc:407
 msgid ""
@@ -6811,6 +6994,7 @@ msgstr "Eliminar regiones no usadas"
 #: editor_regions.cc:584
 msgid "EditorRegions::format_position: negative timecode position: %1"
 msgstr ""
+"EditorRegions::format_position: posición de código de tiempo negativa: %1"
 
 #: editor_regions.cc:875
 msgid "MISSING "
@@ -6858,7 +7042,7 @@ msgstr "RS"
 
 #: editor_routes.cc:252
 msgid "Record Safe"
-msgstr ""
+msgstr "Grabación segura"
 
 #: editor_routes.cc:253
 msgid "Muted"
@@ -6911,11 +7095,11 @@ msgstr "Ocultar todas las pistas MIDI"
 
 #: editor_routes.cc:566 mixer_ui.cc:1949
 msgid "Show All Busses"
-msgstr ""
+msgstr "Mostrar todos los buses"
 
 #: editor_routes.cc:567 mixer_ui.cc:1950
 msgid "Hide All Busses"
-msgstr ""
+msgstr "Ocultar todos los buses"
 
 #: editor_routes.cc:568
 msgid "Only Show Tracks with Regions Under Playhead"
@@ -6923,7 +7107,7 @@ msgstr "Mostrar sólo las pistas con regiones bajo el cursor"
 
 #: editor_rulers.cc:218
 msgid "New location marker"
-msgstr "Nueva marca de posición"
+msgstr "Nueva marcador de posición"
 
 #: editor_rulers.cc:219
 msgid "Clear all locations"
@@ -6955,7 +7139,7 @@ msgstr "Nuevo rango de pinchazo"
 
 #: editor_rulers.cc:236
 msgid "New CD track marker"
-msgstr "Nueva marca de pista de CD"
+msgstr "Nueva marcador de pista de CD"
 
 #: editor_rulers.cc:240 tempo_dialog.cc:45
 msgid "New Tempo"
@@ -6967,51 +7151,52 @@ msgstr "Nueva métrica"
 
 #: editor_snapshots.cc:56
 msgid "Snapshot (click to load)"
-msgstr ""
+msgstr "Instantánea (haz clic para cargar)"
 
 #: editor_snapshots.cc:57
 msgid "Modified Date"
-msgstr ""
+msgstr "Fecha de modificación"
 
 #: editor_snapshots.cc:154
 msgid "Rename Snapshot"
-msgstr "Renombrar captura de sesión"
+msgstr "Renombrar captura instantánea de sesión"
 
 #: editor_snapshots.cc:156
 msgid "New name of snapshot"
-msgstr "Nuevo nombre de captura"
+msgstr "Nuevo nombre de captura instantánea"
 
 #: editor_snapshots.cc:174
 msgid ""
 "Do you really want to remove snapshot \"%1\" ?\n"
 "(which cannot be undone)"
 msgstr ""
-"¿De verdad deseas eliminar la captura \"%1\" ?\n"
+"¿De verdad deseas eliminar la captura instantánea \"%1\" ?\n"
 "(no podrás deshacer esta acción)"
 
 #: editor_snapshots.cc:179
 msgid "Remove snapshot"
-msgstr "Eliminar captura de sesión"
+msgstr "Eliminar captura instantánea de sesión"
 
 #: editor_sources.cc:141
 msgid "Source name, with number of channels in []'s"
-msgstr ""
+msgstr "Nombre de origen, con el número de canales entre corchetes []"
 
 #: editor_sources.cc:143
 msgid "Take ID"
-msgstr ""
+msgstr "ID de toma"
 
 #: editor_sources.cc:144
 msgid "Orig Pos"
-msgstr ""
+msgstr "Pos Orig"
 
 #: editor_sources.cc:144
 msgid "Original Position of the file on timeline, when it was recorded"
 msgstr ""
+"Posición original del archivo en la línea de tiempo, cuando fue grabado"
 
 #: editor_sources.cc:145
 msgid "Path (folder) of the file location"
-msgstr ""
+msgstr "Ruta (carpeta) de la ubicación del archivo"
 
 #: editor_sources.cc:371
 msgid "(MISSING) "
@@ -7020,14 +7205,15 @@ msgstr "(AUSENTE) "
 #: editor_sources.cc:531
 msgid "EditorSources::format_position: negative timecode position: %1"
 msgstr ""
+"EditorSources::format_position: posición de código de tiempo negativa: %1"
 
 #: editor_sources.cc:600
 msgid "Recover the selected Sources to their original Track & Position"
-msgstr ""
+msgstr "Recuperar las fuentes seleccionadas a su pista y posición originales"
 
 #: editor_sources.cc:603
 msgid "Remove the selected Sources"
-msgstr ""
+msgstr "Eliminar las fuentes seleccionadas"
 
 #: editor_sources.cc:637
 msgid ""
@@ -7036,22 +7222,26 @@ msgid ""
 "The source files will not actually be deleted until you execute Session-"
 ">Cleanup."
 msgstr ""
+"¿Deseas eliminar las fuentes seleccionadas?\n"
+"Esta operación no se puede deshacer.\n"
+"Los archivos fuente no se eliminarán realmente hasta que ejecutes Sesión -> "
+"Limpiar."
 
 #: editor_sources.cc:642
 msgid "Only remove the Regions that use these Sources."
-msgstr ""
+msgstr "Eliminar solo las regiones que usen estas fuentes."
 
 #: editor_sources.cc:643
 msgid "Yes, remove the Regions and Sources (cannot be undone!)"
-msgstr ""
+msgstr "Sí, eliminar las regiones y fuentes (¡no se puede deshacer!)"
 
 #: editor_sources.cc:645
 msgid "Remove selected Sources"
-msgstr ""
+msgstr "Eliminar las fuentes seleccionadas"
 
 #: editor_summary.cc:479
 msgid "Reset Summary to Extents"
-msgstr ""
+msgstr "Restablecer resumen a los límites"
 
 #: editor_tempodisplay.cc:411
 msgid "add tempo mark"
@@ -7085,7 +7275,8 @@ msgstr "eliminar marca de tempo"
 msgid ""
 "programming error: meter marker canvas item has no marker object pointer!"
 msgstr ""
-"programming error: meter marker canvas item has no marker object pointer!"
+"Error de programación: el elemento del lienzo del marcador de compás no "
+"tiene puntero de objeto de marcador!"
 
 #: editor_timefx.cc:74
 msgid "stretch/shrink"
@@ -7097,11 +7288,11 @@ msgstr "cambiar tono"
 
 #: editor_timefx.cc:324
 msgid "timefx cannot be started - thread creation error"
-msgstr "timefx cannot be started - thread creation error"
+msgstr "TimeFX no se puede iniciar: error al crear el hilo"
 
 #: engine_dialog.cc:97
 msgid "Device Control Panel"
-msgstr ""
+msgstr "Panel de control del dispositivo"
 
 #: engine_dialog.cc:98
 msgid "Midi Device Setup"
@@ -7109,15 +7300,15 @@ msgstr "Configurar dispositivo MIDI"
 
 #: engine_dialog.cc:100
 msgid "Refresh Devices"
-msgstr ""
+msgstr "Actualizar dispositivos"
 
 #: engine_dialog.cc:101
 msgid "Use Buffered I/O"
-msgstr ""
+msgstr "Usar E/S con búfer"
 
 #: engine_dialog.cc:102
 msgid "Autostart"
-msgstr ""
+msgstr "Inicio automático"
 
 #: engine_dialog.cc:103 engine_dialog.cc:3176
 msgid "Measure"
@@ -7145,6 +7336,9 @@ msgid ""
 "\n"
 "(This is a build/packaging/system error. It should never happen.)"
 msgstr ""
+"No se detectaron controladores de audio/MIDI. %1 no puede ejecutarse.\n"
+"\n"
+"(Esto es un error de compilación/embalaje/sistema. Nunca debería ocurrir.)"
 
 #: engine_dialog.cc:158
 msgid "Latency Measurement Tool"
@@ -7160,15 +7354,15 @@ msgstr ""
 
 #: engine_dialog.cc:179
 msgid "Select two channels below and connect them using a cable."
-msgstr "Selecciona dos canales y conéctalos por medio de un cable"
+msgstr "Selecciona dos canales y conéctalos por medio de un cable."
 
 #: engine_dialog.cc:184
 msgid "Output channel:"
-msgstr ""
+msgstr "Canal de salida:"
 
 #: engine_dialog.cc:196
 msgid "Input channel:"
-msgstr ""
+msgstr "Canal de entrada:"
 
 #: engine_dialog.cc:234
 msgid "Once the channels are connected, click the \"Measure\" button."
@@ -7191,10 +7385,12 @@ msgstr "Latencia"
 msgid ""
 "Always try these settings when starting %1, if the same device is available"
 msgstr ""
+"Intentar siempre estas configuraciones al iniciar %1, si el mismo "
+"dispositivo está disponible"
 
 #: engine_dialog.cc:510
 msgid "Audio System:"
-msgstr "Sistema de audio:"
+msgstr "Sistema de Audio:"
 
 #: engine_dialog.cc:554
 msgid "Driver:"
@@ -7206,7 +7402,7 @@ msgstr "Dispositivo de Entrada:"
 
 #: engine_dialog.cc:565
 msgid "Output Device:"
-msgstr "Dispositivo de salida:"
+msgstr "Dispositivo de Salida:"
 
 #: engine_dialog.cc:572
 msgid "Device:"
@@ -7215,11 +7411,11 @@ msgstr "Dispositivo:"
 #: engine_dialog.cc:600 engine_dialog.cc:717 export_report.cc:165
 #: export_report.cc:337 sfdb_ui.cc:183 sfdb_ui.cc:412 sfdb_ui.cc:417
 msgid "Sample rate:"
-msgstr "Frec. de muestreo:"
+msgstr "Frec. de Muestreo:"
 
 #: engine_dialog.cc:605 engine_dialog.cc:724
 msgid "Buffer size:"
-msgstr "Tamaño del buffer:"
+msgstr "Tamaño del Buffer:"
 
 #: engine_dialog.cc:614
 msgid "Periods:"
@@ -7227,11 +7423,11 @@ msgstr "Periodos:"
 
 #: engine_dialog.cc:631
 msgid "Input channels:"
-msgstr ""
+msgstr "Canales de entrada:"
 
 #: engine_dialog.cc:644
 msgid "Output channels:"
-msgstr ""
+msgstr "Canales de salida:"
 
 #: engine_dialog.cc:663
 msgid "Hardware input latency:"
@@ -7253,6 +7449,8 @@ msgstr "Sistema MIDI:"
 msgid ""
 "%1 is already running. %2 will connect to it and use the existing settings."
 msgstr ""
+"%1 ya está en ejecución. %2 se conectará a él y usará la configuración "
+"existente."
 
 #: engine_dialog.cc:763
 msgid ""
@@ -7276,11 +7474,11 @@ msgstr ""
 
 #: engine_dialog.cc:929
 msgid "Engine|Stop"
-msgstr ""
+msgstr "Detener"
 
 #: engine_dialog.cc:933
 msgid "Engine|Start"
-msgstr ""
+msgstr "Iniciar"
 
 #: engine_dialog.cc:1019
 msgid "MIDI Devices"
@@ -7292,7 +7490,7 @@ msgstr "Dispositivo"
 
 #: engine_dialog.cc:1027
 msgid "Systemic Latency [samples]"
-msgstr ""
+msgstr "Latencia sistémica [muestras]"
 
 #: engine_dialog.cc:1030 gain_meter.cc:802 mixer_strip.cc:191
 #: mixer_strip.cc:408 mixer_strip.cc:2532 plugin_eq_gui.cc:131
@@ -7324,15 +7522,15 @@ msgstr[1] "%1 muestras"
 #: engine_dialog.cc:1768
 #, c-format
 msgid "(%.1f ms)"
-msgstr ""
+msgstr "(%.1f ms)"
 
 #: engine_dialog.cc:2522
 msgid "Could not start backend engine %1"
-msgstr ""
+msgstr "No se pudo iniciar el motor de backend %1"
 
 #: engine_dialog.cc:2554
 msgid "Cannot set driver to %1"
-msgstr ""
+msgstr "No se puede establecer el controlador a %1"
 
 #: engine_dialog.cc:2559
 msgid "Cannot set input device name to %1"
@@ -7344,45 +7542,47 @@ msgstr "No se pudo establecer el nombre de dispositivo de salida a %1"
 
 #: engine_dialog.cc:2568
 msgid "Cannot set device name to %1"
-msgstr ""
+msgstr "No se puede establecer el nombre del dispositivo a %1"
 
 #: engine_dialog.cc:2573
 msgid "Cannot set sample rate to %1"
-msgstr ""
+msgstr "No se puede establecer la frecuencia de muestreo a %1"
 
 #: engine_dialog.cc:2577
 msgid "Cannot set buffer size to %1"
-msgstr ""
+msgstr "No se puede establecer el tamaño del búfer a %1"
 
 #: engine_dialog.cc:2581
 msgid "Cannot set periods to %1"
-msgstr "No se pudieron establecer los periodos a %1"
+msgstr "No se pudieron establecer los períodos a %1"
 
 #: engine_dialog.cc:2587
 msgid "Cannot set input channels to %1"
-msgstr ""
+msgstr "No se pueden establecer los canales de entrada a %1"
 
 #: engine_dialog.cc:2591
 msgid "Cannot set output channels to %1"
-msgstr ""
+msgstr "No se pueden establecer los canales de salida a %1"
 
 #: engine_dialog.cc:2597
 msgid "Cannot set input latency to %1"
-msgstr ""
+msgstr "No se puede establecer la latencia de entrada en %1"
 
 #: engine_dialog.cc:2601
 msgid "Cannot set output latency to %1"
-msgstr ""
+msgstr "No se puede establecer la latencia de salida en %1"
 
 #: engine_dialog.cc:3027 engine_dialog.cc:3093
 msgid "No signal detected "
-msgstr ""
+msgstr "No se detecta señal"
 
 #: engine_dialog.cc:3034
 msgid ""
 "Input signal is > -3dBFS. Lower the signal level (output gain, input gain) "
 "on the audio-interface."
 msgstr ""
+"La señal de entrada es superior a -3dBFS. Reduzca el nivel de la señal "
+"(ganancia de salida, ganancia de entrada) en la interfaz de audio."
 
 #: engine_dialog.cc:3047 engine_dialog.cc:3101 port_insert_ui.cc:74
 #: port_insert_ui.cc:102
@@ -7391,35 +7591,35 @@ msgstr "Desconectado del motor de audio"
 
 #: engine_dialog.cc:3056 engine_dialog.cc:3109
 msgid "Detected roundtrip latency: "
-msgstr ""
+msgstr "Latencia de ida y vuelta detectada: "
 
 #: engine_dialog.cc:3058 engine_dialog.cc:3111
 msgid "Systemic latency: "
-msgstr ""
+msgstr "Latencia sistémica: "
 
 #: engine_dialog.cc:3065
 msgid "(signal detection error)"
-msgstr ""
+msgstr "Error de detección de señal"
 
 #: engine_dialog.cc:3071
 msgid "(inverted - bad wiring)"
-msgstr ""
+msgstr "Invertido - mal cableado"
 
 #: engine_dialog.cc:3118
 msgid "(averaging)"
-msgstr ""
+msgstr "Promedio"
 
 #: engine_dialog.cc:3124
 msgid "(too large jitter)"
-msgstr ""
+msgstr "Jitter excesivo"
 
 #: engine_dialog.cc:3128
 msgid "(large jitter)"
-msgstr ""
+msgstr "Gran jitter"
 
 #: engine_dialog.cc:3140
 msgid "Timeout - large MIDI jitter."
-msgstr ""
+msgstr "Tiempo de espera agotado - gran jitter MIDI."
 
 #: engine_dialog.cc:3156 port_insert_ui.cc:138
 msgid "Detecting ..."
@@ -7427,11 +7627,11 @@ msgstr "Detectando..."
 
 #: engine_dialog.cc:3295
 msgid "Disconnect from %1"
-msgstr ""
+msgstr "Desconectar de %1"
 
 #: engine_dialog.cc:3300
 msgid "Running"
-msgstr ""
+msgstr "Ejecutando"
 
 #: engine_dialog.cc:3302
 msgid "Connected"
@@ -7439,7 +7639,7 @@ msgstr "Conectado"
 
 #: engine_dialog.cc:3313
 msgid "Connect to %1"
-msgstr ""
+msgstr "Conectar a %1"
 
 #: engine_dialog.cc:3317
 msgid "Stopped"
@@ -7468,19 +7668,19 @@ msgstr "Contenidos de región con fundidos y ganancia de región (canales: %1)"
 
 #: export_channel_selector.cc:544
 msgid "Apply track/bus processing"
-msgstr ""
+msgstr "Aplicar procesamiento de pista/bus"
 
 #: export_channel_selector.cc:552
 msgid "Selection Actions"
-msgstr ""
+msgstr "Acciones de Selección"
 
 #: export_channel_selector.cc:555
 msgid "Select tracks"
-msgstr ""
+msgstr "Seleccionar pistas"
 
 #: export_channel_selector.cc:556
 msgid "Select busses"
-msgstr ""
+msgstr "Seleccionar buses"
 
 #: export_channel_selector.cc:557
 msgid "Deselect all"
@@ -7488,11 +7688,11 @@ msgstr "Deseleccionar todo"
 
 #: export_channel_selector.cc:560
 msgid "Exclude Hidden"
-msgstr ""
+msgstr "Excluir Ocultos"
 
 #: export_channel_selector.cc:565
 msgid "Exclude Muted"
-msgstr ""
+msgstr "Excluir Silenciados"
 
 #: export_channel_selector.cc:600
 msgid "Track name"
@@ -7516,7 +7716,7 @@ msgstr "Formato de archivo"
 #: export_dialog.cc:189 export_timespan_selector.cc:408
 #: export_timespan_selector.cc:530
 msgid "Time Span"
-msgstr "Intervalos"
+msgstr "Intervalos de tiempo"
 
 #: export_dialog.cc:190
 msgid "Channels"
@@ -7527,8 +7727,8 @@ msgid ""
 "Export has been aborted due to an error!\n"
 "See the Log for details."
 msgstr ""
-"¡La exportación se ha estropeado debido a un error!\n"
-"Para más información ver el log."
+"¡La exportación se ha abortado debido a un error!\n"
+"Consulte el Log para obtener más detalles."
 
 #: export_dialog.cc:323
 msgid "Files that will be overwritten"
@@ -7536,7 +7736,7 @@ msgstr "Archivos que se sobrescribirán"
 
 #: export_dialog.cc:368
 msgid "Export initialization failed: %1"
-msgstr ""
+msgstr "Fallo al inicializar la exportación: %1"
 
 #: export_dialog.cc:378
 msgid "Stop Export"
@@ -7544,11 +7744,11 @@ msgstr "Cancelar Exportación"
 
 #: export_dialog.cc:415
 msgid "Writing Mixer Screenshot: %1."
-msgstr ""
+msgstr "Escribiendo captura de pantalla del mezclador: %1."
 
 #: export_dialog.cc:421
 msgid "Copying Mixer Screenshot: %1."
-msgstr ""
+msgstr "Copiando captura de pantalla del mezclador: %1."
 
 #: export_dialog.cc:439
 msgid "export"
@@ -7576,7 +7776,7 @@ msgstr "Subiendo '%3' (timespan %1 de %2)"
 
 #: export_dialog.cc:481
 msgid "Running Post Export Command for '%1'"
-msgstr ""
+msgstr "Ejecutando comando posterior a la exportación para '%1"
 
 #: export_dialog.cc:509 export_dialog.cc:511
 msgid "<span color=\"#ffa755\">Error: "
@@ -7620,7 +7820,7 @@ msgstr "Posición"
 
 #: export_file_notebook.cc:210
 msgid "Upload to Soundcloud"
-msgstr ""
+msgstr "Subir a Soundcloud"
 
 #: export_file_notebook.cc:211
 msgid "Analyze Exported Audio"
@@ -7667,7 +7867,7 @@ msgstr "Construir el nombre de archivo según estos componentes:"
 
 #: export_filename_selector.cc:52
 msgid "No Name"
-msgstr ""
+msgstr "Sin Nombre"
 
 #: export_filename_selector.cc:53 session_dialog.cc:350
 msgid "Session Name"
@@ -7675,7 +7875,7 @@ msgstr "Nombre de sesión"
 
 #: export_filename_selector.cc:54
 msgid "Snapshot Name"
-msgstr ""
+msgstr "Nombre de la captura instantánea"
 
 #: export_filename_selector.cc:235
 msgid ""
@@ -7694,14 +7894,18 @@ msgid ""
 "The filename will be chosen from the information just above the folder "
 "selector."
 msgstr ""
+"%1: esto es solo el nombre del directorio/carpeta, no el nombre del "
+"archivo.\n"
+"El nombre del archivo se elegirá a partir de la información justo encima del "
+"selector de carpeta."
 
 #: export_filename_selector.cc:409
 msgid "%1: this is not a valid directory/folder."
-msgstr ""
+msgstr "%1: esto no es un directorio/carpeta válido."
 
 #: export_filename_selector.cc:419
 msgid "Choose export folder"
-msgstr "Elije carpeta para exportaciones"
+msgstr "Elije una carpeta para exportar"
 
 #: export_format_dialog.cc:39
 msgid "New Export Format Profile"
@@ -7721,19 +7925,19 @@ msgstr "Normalizar:"
 
 #: export_format_dialog.cc:50
 msgid "Peak"
-msgstr ""
+msgstr "Pico"
 
 #: export_format_dialog.cc:51
 msgid "Loudness"
-msgstr ""
+msgstr "Sonoridad"
 
 #: export_format_dialog.cc:57
 msgid "LUFS"
-msgstr ""
+msgstr "LUFS"
 
 #: export_format_dialog.cc:58
 msgid "dBTP"
-msgstr ""
+msgstr "dBTP"
 
 #: export_format_dialog.cc:61
 msgid "Trim silence at start"
@@ -7756,6 +7960,9 @@ msgid ""
 "Command to run post-export\n"
 "(%f=file path, %d=directory, %b=basename, see tooltip for more):"
 msgstr ""
+"Comando a ejecutar después de la exportación\n"
+"(%f=ruta del archivo, %d=directorio, %b=nombre base, ver sugerencia para más "
+"información):"
 
 #: export_format_dialog.cc:72
 msgid "Compatibility"
@@ -7783,7 +7990,7 @@ msgstr "Crear archivo TOC para creación de CD/DVD disk-at-once"
 
 #: export_format_dialog.cc:87
 msgid "Create chapter mark file for MP4 chapter marks"
-msgstr ""
+msgstr "Crear archivo de marcas de capítulo para marcas de capítulo MP4"
 
 #: export_format_dialog.cc:89
 msgid "Tag file with session's metadata"
@@ -7791,7 +7998,7 @@ msgstr "Archivo de etiquetas con metadatos de sesión"
 
 #: export_format_dialog.cc:126
 msgid "∧"
-msgstr ""
+msgstr "∧"
 
 #: export_format_dialog.cc:131
 msgid ""
@@ -7799,6 +8006,10 @@ msgid ""
 "peak limit. EBU-R128 normalization is only available for mono and stereo "
 "targets, true-peak works for any channel layout."
 msgstr ""
+"Normalizar a un nivel de sonoridad objetivo EBU-R128 LUFS sin exceder el "
+"límite de pico verdadero dado. La normalización EBU-R128 solo está "
+"disponible para destinos mono y estéreo, el pico verdadero funciona para "
+"cualquier configuración de canales."
 
 #: export_format_dialog.cc:159
 msgid ""
@@ -7826,6 +8037,30 @@ msgid ""
 "%Y Year\n"
 "%Z Country"
 msgstr ""
+"%a: Nombre del artista\n"
+"%b: Nombre base del archivo (nombre del archivo sin extensión)\n"
+"%c: Derechos de autor\n"
+"%d: Directorio del archivo\n"
+"%f: Ruta absoluta completa del archivo\n"
+"%l: Letrista\n"
+"%n: Nombre de la sesión\n"
+"%o: Director\n"
+"%t: Título del archivo o pista\n"
+"%z: Organización\n"
+"%A: Nombre del álbum\n"
+"%C: Comentario o descripción\n"
+"%E: Ingeniero de sonido\n"
+"%G: Género\n"
+"%L: Número total de pistas\n"
+"%M: Mezclador\n"
+"%N: Nombre del intervalo de tiempo (por ejemplo, \"Parte 1\", \"Capítulo "
+"2\")\n"
+"%O: Compositor\n"
+"%P: Productor\n"
+"%S: Subtítulo del disco o versión\n"
+"%T: Número de pista\n"
+"%Y: Año de lanzamiento o creación\n"
+"%Z: País de origen"
 
 #: export_format_dialog.cc:559
 msgid "Best (sinc)"
@@ -7841,7 +8076,7 @@ msgstr "Rápida (sinc)"
 
 #: export_format_dialog.cc:579
 msgid "Zero order hold"
-msgstr ""
+msgstr "Mantención de orden cero"
 
 #: export_format_dialog.cc:1020
 msgid "Linear encoding options"
@@ -7861,27 +8096,27 @@ msgstr "Opciones de Broadcast Wave"
 
 #: export_format_dialog.cc:1081
 msgid "FFMPEG/MP3 options"
-msgstr ""
+msgstr "Opciones FFMPEG/MP3"
 
 #: export_format_selector.cc:133
 msgid "Do you really want to remove the format?"
-msgstr ""
+msgstr "¿De verdad quieres eliminar el formato?"
 
 #: export_preset_selector.cc:32 plugin_presets_ui.cc:69
 msgid "Preset"
-msgstr "Preset"
+msgstr "Preajuste"
 
 #: export_preset_selector.cc:103
 msgid ""
 "The selected preset did not load successfully!\n"
 "Perhaps it references a format that has been removed?"
 msgstr ""
-"¡El preset seleccionado no se cargó correctamente!\n"
+"¡El preajuste seleccionado no se cargó correctamente!\n"
 "¿Quizás se refiere a un formato que ha sido eliminado?"
 
 #: export_preset_selector.cc:155
 msgid "Do you really want to remove this preset?"
-msgstr ""
+msgstr "¿De verdad quieres eliminar este preajuste?"
 
 #: export_report.cc:57
 msgid "Export Report/Analysis"
@@ -7897,15 +8132,15 @@ msgstr "Formato:"
 
 #: export_report.cc:167 export_report.cc:337
 msgid "%1 Hz"
-msgstr ""
+msgstr "%1 Hz"
 
 #: export_report.cc:170 export_report.cc:345 transcode_video_dialog.cc:142
 msgid "Duration:"
-msgstr "Duración"
+msgstr "Duración:"
 
 #: export_report.cc:178 export_report.cc:343
 msgid "Timecode:"
-msgstr "Timecode:"
+msgstr "Código de tiempo:"
 
 #: export_report.cc:189
 msgid "Error:"
@@ -7913,15 +8148,15 @@ msgstr "Error:"
 
 #: export_report.cc:225 export_report.cc:449
 msgid "(too short integration time)"
-msgstr ""
+msgstr "(tiempo de integración demasiado corto)"
 
 #: export_report.cc:227
 msgid "-888"
-msgstr ""
+msgstr "-888"
 
 #: export_report.cc:232 export_report.cc:362
 msgid "Peak:"
-msgstr ""
+msgstr "Pico:"
 
 #: export_report.cc:233 export_report.cc:369
 msgid "%1 dBFS"
@@ -7929,11 +8164,11 @@ msgstr "%1 dBFS"
 
 #: export_report.cc:234 export_report.cc:378
 msgid "True Peak:"
-msgstr ""
+msgstr "Pico verdadero:"
 
 #: export_report.cc:235 export_report.cc:385
 msgid "%1 dBTP"
-msgstr ""
+msgstr "%1 dBTP"
 
 #: export_report.cc:236 export_report.cc:396
 msgid "Normalization Gain:"
@@ -7941,31 +8176,31 @@ msgstr "Ganancia de normalización:"
 
 #: export_report.cc:237
 msgid "+888.88 dB"
-msgstr ""
+msgstr "+888.88 dB"
 
 #: export_report.cc:239 export_report.cc:457
 msgid "Integrated Loudness:"
-msgstr ""
+msgstr "Sonoridad integrada:"
 
 #: export_report.cc:240 export_report.cc:463
 msgid "%1 LUFS"
-msgstr ""
+msgstr "%1 LUFS"
 
 #: export_report.cc:241 export_report.cc:469
 msgid "Loudness Range:"
-msgstr "Rango de loudness:"
+msgstr "Rango de sonoridad:"
 
 #: export_report.cc:242 export_report.cc:475
 msgid "%1 LU"
-msgstr ""
+msgstr "%1 LU"
 
 #: export_report.cc:252 export_report.cc:763
 msgid "100"
-msgstr ""
+msgstr "100"
 
 #: export_report.cc:287 export_report.cc:659
 msgid "00:00:00.000"
-msgstr ""
+msgstr "00:00:00.000"
 
 #: export_report.cc:293
 msgid "0|A8"
@@ -7973,7 +8208,7 @@ msgstr "A8"
 
 #: export_report.cc:403
 msgid "%1 dB"
-msgstr ""
+msgstr "%1 dB"
 
 #: export_report.cc:434 export_report.cc:442 export_report.cc:562
 msgid ""
@@ -7988,6 +8223,8 @@ msgid ""
 "LUFS\n"
 "(short)"
 msgstr ""
+"LUFS\n"
+"(corto)"
 
 #: export_report.cc:512
 msgid "Multiplicity"
@@ -8011,27 +8248,27 @@ msgstr "Rectificada"
 
 #: export_report.cc:747
 msgid "Hz"
-msgstr ""
+msgstr "Hz"
 
 #: export_report.cc:764
 msgid "500"
-msgstr ""
+msgstr "500"
 
 #: export_report.cc:765
 msgid "1K"
-msgstr ""
+msgstr "1K"
 
 #: export_report.cc:766
 msgid "5K"
-msgstr ""
+msgstr "5K"
 
 #: export_report.cc:767
 msgid "10K"
-msgstr ""
+msgstr "10K"
 
 #: export_report.cc:853
 msgid "Writing Export Analysis Image: %1."
-msgstr ""
+msgstr "Escribiendo imagen de análisis de exportación: %1."
 
 #: export_report.cc:950 sfdb_ui.cc:330 sfdb_ui.cc:489
 msgid "Could not read file: %1 (%2)."
@@ -8043,22 +8280,22 @@ msgstr "No se pudo acceder al archivo de audio: "
 
 #: export_report.cc:1212
 msgid "-36"
-msgstr ""
+msgstr "-36"
 
 #: export_report.cc:1213 export_report.cc:1217 export_report.cc:1223
 #: export_report.cc:1226
 msgid "-18"
-msgstr ""
+msgstr "-18"
 
 #: export_report.cc:1214 export_report.cc:1218 export_report.cc:1224
 #: export_report.cc:1227 export_report.cc:1230 export_report.cc:1231
 msgid "-9"
-msgstr ""
+msgstr "-9"
 
 #: export_report.cc:1215 export_report.cc:1219 export_report.cc:1225
 #: export_report.cc:1228 export_report.cc:1232 export_report.cc:1233
 msgid "-3"
-msgstr ""
+msgstr "-3"
 
 #: export_timespan_selector.cc:49
 msgid "Show Times as:"
@@ -8087,31 +8324,31 @@ msgstr "Rango"
 
 #: export_timespan_selector.cc:413 export_timespan_selector.cc:535
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #: foldback_strip.cc:101
 msgid "Pan: "
-msgstr ""
+msgstr "Paneo: "
 
 #: foldback_strip.cc:112
 msgid "Level"
-msgstr ""
+msgstr "Nivel"
 
 #: foldback_strip.cc:254
 msgid "Copy track/bus gain to send"
-msgstr ""
+msgstr "Copiar ganancia de pista/bus a envío"
 
 #: foldback_strip.cc:257
 msgid "Set send gain to -inf"
-msgstr ""
+msgstr "Establecer ganancia de envío a -inf"
 
 #: foldback_strip.cc:260
 msgid "Set send gain to 0dB"
-msgstr ""
+msgstr "Establecer ganancia de envío a 0dB"
 
 #: foldback_strip.cc:262
 msgid "Remove This Send"
-msgstr ""
+msgstr "Eliminar este envío"
 
 #: foldback_strip.cc:308 foldback_strip.cc:1138 foldback_strip.cc:1149
 #: mixer_strip.cc:119 mixer_strip.cc:152 mixer_strip.cc:413 mixer_strip.cc:1576
@@ -8121,27 +8358,28 @@ msgstr "Comentarios"
 
 #: foldback_strip.cc:328
 msgid "Previous foldback bus"
-msgstr ""
+msgstr "Bus de retorno anterior"
 
 #: foldback_strip.cc:334
 msgid "Next foldback bus"
-msgstr ""
+msgstr "Bus de retorno siguiente"
 
 #: foldback_strip.cc:340
 msgid "Hide Foldback strip"
-msgstr ""
+msgstr "Ocultar pista de retorno"
 
 #: foldback_strip.cc:353 mixer_strip.cc:800
 msgid "Show Sends"
-msgstr ""
+msgstr "Mostrar envios"
 
 #: foldback_strip.cc:354 route_ui.cc:209
 msgid "Show the strips that send to this bus, and control them from the faders"
 msgstr ""
+"Mostrar las pistas que envían a este bus y controlarlas desde los faders"
 
 #: foldback_strip.cc:396
 msgid "Level: "
-msgstr ""
+msgstr "Nivel: "
 
 #: foldback_strip.cc:747 global_port_matrix.cc:203 io_selector.cc:216
 #: mixer_strip.cc:884 mixer_strip.cc:1003 monitor_section.cc:1353
@@ -8152,7 +8390,7 @@ msgstr "Desconectar"
 #: foldback_strip.cc:778 mixer_strip.cc:949 mixer_strip.cc:1059
 #: monitor_section.cc:1389 plugin_pin_dialog.cc:1836
 msgid "Routing Grid"
-msgstr ""
+msgstr "Matriz de enrutamiento"
 
 #: foldback_strip.cc:927 mixer_strip.cc:1320 monitor_section.cc:1434
 msgid "<b>OUTPUT</b> from %1"
@@ -8173,7 +8411,7 @@ msgstr "Notas..."
 
 #: foldback_strip.cc:1184 mixer_strip.cc:1698 route_time_axis.cc:636
 msgid "Outputs..."
-msgstr ""
+msgstr "Salidas..."
 
 #: foldback_strip.cc:1188 mixer_strip.cc:1712
 msgid "Save As Template..."
@@ -8186,7 +8424,7 @@ msgstr "Activo"
 
 #: foldback_strip.cc:1200 mixer_strip.cc:1775
 msgid "Protect Against Denormals"
-msgstr "Proteger contra denormals"
+msgstr "Proteger contra subnormales"
 
 #: foldback_strip.cc:1628 route_ui.cc:1062
 msgid "Assign selected tracks (prefader)"
@@ -8210,19 +8448,19 @@ msgstr "Establecer ganancia de envíos a 0dB"
 
 #: sfdb_freesound_mootcher.cc:187 sfdb_freesound_mootcher.cc:322
 msgid "curl error %1 (%2)"
-msgstr ""
+msgstr "curl error %1 (%2)"
 
 #: sfdb_freesound_mootcher.cc:264
 msgid "getSoundResourceFile: There is no valid root in the xml file"
-msgstr ""
+msgstr "getSoundResourceFile: No hay una raíz válida en el archivo XML"
 
 #: sfdb_freesound_mootcher.cc:269
 msgid "getSoundResourceFile: root = %1, != response"
-msgstr ""
+msgstr "getSoundResourceFile: root = %1, != response"
 
 #: sfdb_freesound_mootcher.cc:408 rc_option_editor.cc:2902
 msgid "%1"
-msgstr ""
+msgstr "%1"
 
 #: gain_meter.cc:106
 msgid "pre"
@@ -8238,31 +8476,31 @@ msgstr "Modo de automatización de fader"
 
 #: gain_meter.cc:167
 msgid "dBFS - Digital Peak Hold. Click to reset."
-msgstr ""
+msgstr "dBFS - Pico digital sostenido. Haga clic para restablecer."
 
 #: gain_meter.cc:178
 msgid "Metering point"
-msgstr ""
+msgstr "Punto de medición"
 
 #: gain_meter.cc:783
 msgid "Manual|M"
-msgstr ""
+msgstr "M"
 
 #: gain_meter.cc:785
 msgid "Play|P"
-msgstr ""
+msgstr "R"
 
 #: gain_meter.cc:787
 msgid "Touch|T"
-msgstr ""
+msgstr "T"
 
 #: gain_meter.cc:789
 msgid "Latch|L"
-msgstr ""
+msgstr "L"
 
 #: gain_meter.cc:791
 msgid "Write|W"
-msgstr ""
+msgstr "E"
 
 #: gain_meter.cc:804 mixer_strip.cc:2533
 msgid "Pre Fader"
@@ -8274,7 +8512,7 @@ msgstr "Post-Fader"
 
 #: generic_pluginui.cc:89
 msgid "MIDI Keyboard"
-msgstr ""
+msgstr "Teclado MIDI"
 
 #: generic_pluginui.cc:104
 msgid "<span size=\"large\">Presets</span>"
@@ -8282,11 +8520,11 @@ msgstr "<span size=\"large\">Presets</span>"
 
 #: generic_pluginui.cc:146 patch_change_widget.cc:67
 msgid "Channel:"
-msgstr ""
+msgstr "Canal:"
 
 #: generic_pluginui.cc:148 patch_change_widget.cc:92
 msgid "Velocity:"
-msgstr ""
+msgstr "Velocidad:"
 
 #: generic_pluginui.cc:179
 msgid "All Automation"
@@ -8321,15 +8559,15 @@ msgstr "Medidores"
 
 #: generic_pluginui.cc:698
 msgid "MIDI Programs (sent to track)"
-msgstr ""
+msgstr "Programas MIDI (enviados a la pista)"
 
 #: generic_pluginui.cc:700
 msgid "MIDI Programs (volatile)"
-msgstr ""
+msgstr "Programas MIDI (volátiles)"
 
 #: generic_pluginui.cc:777
 msgid "--Unset--"
-msgstr ""
+msgstr "--No establecido--"
 
 #: generic_pluginui.cc:835
 msgid "Automation control"
@@ -8337,7 +8575,7 @@ msgstr "Control de la automatización"
 
 #: generic_pluginui.cc:1069
 msgid "This control cannot be automated"
-msgstr ""
+msgstr "Este control no se puede automatizar"
 
 #: global_port_matrix.cc:160
 msgid "Audio Connection Manager"
@@ -8377,7 +8615,7 @@ msgstr "Editar grupo..."
 
 #: group_tabs.cc:363
 msgid "Collect Group"
-msgstr ""
+msgstr "Recopilar grupo"
 
 #: group_tabs.cc:364
 msgid "Remove Group"
@@ -8385,11 +8623,11 @@ msgstr "Eiminar grupo"
 
 #: group_tabs.cc:369
 msgid "Drop Group from VCA..."
-msgstr ""
+msgstr "Eliminar grupo de VCA..."
 
 #: group_tabs.cc:378
 msgid "Assign Group to VCA..."
-msgstr ""
+msgstr "Asignar grupo a VCA..."
 
 #: group_tabs.cc:399
 msgid "Remove Subgroup Bus"
@@ -8409,19 +8647,19 @@ msgstr "Añadir nuevo bus auxiliar (post-fader)"
 
 #: group_tabs.cc:434
 msgid "Assign Selection to VCA..."
-msgstr ""
+msgstr "Asignar selección a VCA..."
 
 #: group_tabs.cc:445
 msgid "Assign Record Enabled to VCA..."
-msgstr ""
+msgstr "Asignar grabación habilitada a VCA..."
 
 #: group_tabs.cc:456
 msgid "Assign Soloed to VCA..."
-msgstr ""
+msgstr "Asignar solo a VCA..."
 
 #: group_tabs.cc:459
 msgid "Enable All Groups"
-msgstr ""
+msgstr "Habilitar todos los grupos"
 
 #: group_tabs.cc:460
 msgid "Disable All Groups"
@@ -8429,11 +8667,11 @@ msgstr "Desactivar todos los grupos"
 
 #: idleometer.cc:42
 msgid "Idle O Meter"
-msgstr ""
+msgstr "Medidor de inactividad"
 
 #: idleometer.cc:45
 msgid "<b>GUI Idle Timing Statistics</b>"
-msgstr ""
+msgstr "Estadísticas de tiempo de inactividad de la GUI"
 
 #: idleometer.cc:52 latency_gui.cc:92 panner_ui.cc:416 plugin_pin_dialog.cc:116
 #: plugin_selector.cc:271 plugin_ui.cc:470 plugin_dspload_ui.cc:37
@@ -8443,39 +8681,39 @@ msgstr "Restablecer"
 
 #: idleometer.cc:67
 msgid "Current:"
-msgstr ""
+msgstr "Actual:"
 
 #: idleometer.cc:70
 msgid "Min:"
-msgstr ""
+msgstr "Min:"
 
 #: idleometer.cc:73
 msgid "Max:"
-msgstr ""
+msgstr "Max:"
 
 #: idleometer.cc:76
 msgid "Mean:"
-msgstr ""
+msgstr "Media:"
 
 #: idleometer.cc:79
 msgid "σ:"
-msgstr ""
+msgstr "o:"
 
 #: idleometer.cc:82
 msgid "Elapsed:"
-msgstr ""
+msgstr "Transcurrido:"
 
 #: insert_remove_time_dialog.cc:61
 msgid "Remove Time starting at:"
-msgstr ""
+msgstr "Eliminar tiempo a partir de:"
 
 #: insert_remove_time_dialog.cc:61
 msgid "Insert Time starting at:"
-msgstr ""
+msgstr "Insertar tiempo a partir de:"
 
 #: insert_remove_time_dialog.cc:68
 msgid "Time to remove:"
-msgstr ""
+msgstr "Tiempo a eliminar:"
 
 #: insert_remove_time_dialog.cc:68
 msgid "Time to insert:"
@@ -8500,22 +8738,23 @@ msgstr "separarse"
 #: insert_remove_time_dialog.cc:100
 msgid "Apply to all playlists of the selected track(s)"
 msgstr ""
+"Aplicar a todas las listas de reproducción de la(s) pista(s) seleccionada(s)"
 
 #: insert_remove_time_dialog.cc:103
 msgid "Move glued-to-musical-time regions (MIDI regions)"
-msgstr ""
+msgstr "Mover regiones pegadas al tiempo musical (regiones MIDI)"
 
 #: insert_remove_time_dialog.cc:106
 msgid "Move markers"
-msgstr "Mover marcas"
+msgstr "Mover marcadores"
 
 #: insert_remove_time_dialog.cc:109
 msgid "Move glued-to-musical-time markers"
-msgstr ""
+msgstr "Mover marcadores pegados al tiempo musical"
 
 #: insert_remove_time_dialog.cc:115
 msgid "Move locked markers"
-msgstr "Mover marcas bloqueadas"
+msgstr "Mover marcadores bloqueadas"
 
 #: insert_remove_time_dialog.cc:120
 msgid ""
@@ -8536,6 +8775,8 @@ msgstr "Insertar tiempo"
 #: insert_remove_time_dialog.cc:209
 msgid "Invalid or zero duration entered. Please enter a valid duration"
 msgstr ""
+"Se ha introducido una duración no válida o cero. Por favor, introduzca una "
+"duración válida"
 
 #: instrument_selector.cc:122
 msgid "-none-"
@@ -8543,15 +8784,15 @@ msgstr "-ninguno-"
 
 #: instrument_selector.cc:135 instrument_selector.cc:145
 msgid "≤ %1 outs"
-msgstr ""
+msgstr "≤ %1 salidas"
 
 #: instrument_selector.cc:137 instrument_selector.cc:147
 msgid "%1 outs"
-msgstr ""
+msgstr "%1 salidas"
 
 #: instrument_selector.cc:150
 msgid "stereo"
-msgstr ""
+msgstr "estéreo"
 
 #: interthread_progress_window.cc:115
 msgid "Importing file: %1 of %2"
@@ -8583,11 +8824,11 @@ msgstr ""
 msgid "Key bindings file \"%1\" not found. Default bindings used instead"
 msgstr ""
 "No se pudo encontrar el archivo de combinaciones de teclas \"%1\". Se usarán "
-"las combinaciones de teclas predeterminadas."
+"las combinaciones de teclas predeterminadas"
 
 #: keyeditor.cc:73
 msgid "Colliding keybindings"
-msgstr ""
+msgstr "Combinaciones de teclas en conflicto"
 
 #: keyeditor.cc:75
 msgid ""
@@ -8595,10 +8836,13 @@ msgid ""
 "\n"
 "You can replace the existing binding or cancel this action."
 msgstr ""
+"La secuencia de teclas ya está asignada a '%1'.\n"
+"\n"
+"Puedes reemplazar la asignación existente o cancelar esta acción."
 
 #: keyeditor.cc:81 plugin_setup_dialog.cc:57
 msgid "Replace"
-msgstr ""
+msgstr "Reemplazar"
 
 #: keyeditor.cc:95
 msgid "Remove shortcut"
@@ -8610,19 +8854,21 @@ msgstr "Buscar..."
 
 #: keyeditor.cc:109
 msgid "Click to reset search string"
-msgstr ""
+msgstr "Haz clic para restablecer la cadena de búsqueda"
 
 #: keyeditor.cc:113
 msgid "To remove a shortcut, select an action then press this: "
 msgstr ""
+"Para eliminar un atajo de teclado, selecciona una acción y luego presiona "
+"esto: "
 
 #: keyeditor.cc:125
 msgid "Reset Bindings to Defaults"
-msgstr ""
+msgstr "Restablecer asignaciones a valores predeterminados"
 
 #: keyeditor.cc:128
 msgid "Print Bindings (to your web browser)"
-msgstr ""
+msgstr "Imprimir asignaciones de teclas (en tu navegador web)"
 
 #: keyeditor.cc:246 lua_script_manager.cc:54
 msgid "Action"
@@ -8634,7 +8880,7 @@ msgstr "Atajo de teclado"
 
 #: keyeditor.cc:409 luainstance.cc:505
 msgid "RegionList"
-msgstr ""
+msgstr "Lista de regiones"
 
 #: latency_gui.cc:47
 msgid "sample"
@@ -8666,7 +8912,7 @@ msgstr "Adherir"
 
 #: location_ui.cc:97
 msgid "Performer:"
-msgstr ""
+msgstr "Intérprete:"
 
 #: location_ui.cc:98
 msgid "Composer:"
@@ -8682,39 +8928,42 @@ msgstr "Eliminar este rango"
 
 #: location_ui.cc:334
 msgid "Start time - middle click to locate here"
-msgstr ""
+msgstr "Tiempo de inicio - clic central para ubicar aquí"
 
 #: location_ui.cc:335
 msgid "End time - middle click to locate here"
-msgstr ""
+msgstr "Tiempo de finalización - clic central para ubicar aquí"
 
 #: location_ui.cc:338
 msgid "Set range start from playhead location"
-msgstr "Establecer inicio de rango en posición de cursor"
+msgstr ""
+"Establecer inicio de rango desde la ubicación del cabezal de reproducción"
 
 #: location_ui.cc:339
 msgid "Set range end from playhead location"
-msgstr "Establecer fin de rango en posición de cursor"
+msgstr ""
+"Establecer final de rango desde la ubicación del cabezal de reproducción"
 
 #: location_ui.cc:343
 msgid "Remove this marker"
-msgstr "Eliminar esta marca"
+msgstr "Eliminar este marcador"
 
 #: location_ui.cc:344
 msgid "Position - middle click to locate here"
-msgstr ""
+msgstr "Posición - clic central para ubicar aquí"
 
 #: location_ui.cc:346
 msgid "Set marker time from playhead location"
-msgstr "Establecer tiempo de marca en posición de cursor"
+msgstr ""
+"Establecer tiempo de marcador desde la ubicación del cabezal de reproducción"
 
 #: location_ui.cc:542
 msgid "You cannot put a CD marker at the start of the session"
-msgstr "No puedes colocar una marca de CD al inicio de la sesión"
+msgstr "No puedes colocar un marcador de CD al inicio de la sesión"
 
 #: location_ui.cc:768
 msgid "New Marker"
-msgstr "Nueva marca"
+msgstr "Nuevo marcador"
 
 #: location_ui.cc:785
 msgid "<b>Loop/Punch Ranges</b>"
@@ -8722,7 +8971,7 @@ msgstr "<b>Rangos de bucle/pinchazo</b>"
 
 #: location_ui.cc:811
 msgid "<b>Markers (Including CD Index)</b>"
-msgstr "<b>Marcas (incluyendo índice de CD)</b>"
+msgstr "<b>Marcadores (incluyendo índice de CD)</b>"
 
 #: location_ui.cc:846
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
@@ -8730,23 +8979,23 @@ msgstr "<b>Rangos (incluyendo rangos de pistas de CD)</b>"
 
 #: location_ui.cc:1092
 msgid "add range marker"
-msgstr "añadir marca de rango"
+msgstr "añadir marcador de rango"
 
 #: lua_script_manager.cc:42
 msgid "Add/Set"
-msgstr ""
+msgstr "Agregar/Establecer"
 
 #: lua_script_manager.cc:45
 msgid "Call"
-msgstr ""
+msgstr "Llamar"
 
 #: lua_script_manager.cc:46
 msgid "New Hook"
-msgstr ""
+msgstr "Nuevo Gancho"
 
 #: lua_script_manager.cc:48 plugin_presets_ui.cc:36
 msgid "Load"
-msgstr ""
+msgstr "Cargar"
 
 #: lua_script_manager.cc:81 lua_script_manager.cc:122 lua_script_manager.cc:158
 #: plugin_presets_ui.cc:81 plugin_ui.cc:473 script_selector.cc:57
@@ -8760,10 +9009,13 @@ msgid ""
 "Action Scripts are user initiated actions (menu, shortcuts, toolbar-button) "
 "for batch processing or customized tasks."
 msgstr ""
+"Los Scripts de Acción son acciones iniciadas por el usuario (menú, atajos de "
+"teclado, botón de la barra de herramientas) para procesamiento por lotes o "
+"tareas personalizadas."
 
 #: lua_script_manager.cc:98
 msgid "Action Scripts"
-msgstr ""
+msgstr "Scripts de acción"
 
 #: lua_script_manager.cc:105
 msgid "Signal(s)"
@@ -8775,10 +9027,13 @@ msgid ""
 "Once a script is registered it is automatically triggered by events to "
 "perform some task."
 msgstr ""
+"Los ganchos de acción Lua son devoluciones de llamada activadas por eventos "
+"para la GUI del Editor/Mezclador. Una vez que se registra un script, se "
+"activa automáticamente mediante eventos para realizar alguna tarea."
 
 #: lua_script_manager.cc:139
 msgid "Action Hooks"
-msgstr ""
+msgstr "Ganchos de acción"
 
 #: lua_script_manager.cc:160
 msgid ""
@@ -8786,10 +9041,14 @@ msgid ""
 "They are called periodically at the start of every audio cycle in the "
 "realtime process context before any processing takes place."
 msgstr ""
+"Los scripts de sesión Lua se cargan en el motor de procesamiento y se "
+"ejecutan en tiempo real. Se llaman periódicamente al comienzo de cada ciclo "
+"de audio en el contexto del proceso de tiempo real antes de que se realice "
+"cualquier procesamiento."
 
 #: lua_script_manager.cc:175
 msgid "Session Scripts"
-msgstr ""
+msgstr "Scripts de sesión"
 
 #: lua_script_manager.cc:220
 msgid "Action %1"
@@ -8797,55 +9056,57 @@ msgstr "Acción %1"
 
 #: lua_script_manager.cc:225 lua_script_manager.cc:307
 msgid "Unset"
-msgstr ""
+msgstr "No establecido"
 
 #: lua_script_manager.cc:446
 msgid "Session script '%1' removal failed: %2"
-msgstr ""
+msgstr "Error al eliminar el script de sesión '%1': %2"
 
 #: luainstance.cc:499
 msgid "Main_menu"
-msgstr ""
+msgstr "Menú principal"
 
 #: luainstance.cc:501
 msgid "JACK"
-msgstr ""
+msgstr "JACK"
 
 #: luainstance.cc:503
 msgid "redirectmenu"
-msgstr ""
+msgstr "Menú de redirección"
 
 #: luainstance.cc:507
 msgid "ProcessorMenu"
-msgstr ""
+msgstr "Menú de Procesador"
 
 #: luainstance.cc:1352
 msgid "Loading user ui scripts file %1"
-msgstr ""
+msgstr "Cargando archivo de scripts de interfaz de usuario %1"
 
 #: luainstance.cc:1355
 msgid "cannot read ui scripts file \"%1\""
-msgstr ""
+msgstr "No se puede leer el archivo de scripts de interfaz de usuario \"%1\""
 
 #: luainstance.cc:1360
 msgid "user ui scripts file \"%1\" not loaded successfully."
 msgstr ""
+"El archivo de scripts de interfaz de usuario \"%1\" no se cargó "
+"correctamente."
 
 #: luainstance.cc:1385
 msgid "UI script file %1 not saved"
-msgstr ""
+msgstr "Archivo de script de interfaz de usuario %1 no guardado"
 
 #: luainstance.cc:1528
 msgid "Add Shortcut or Lua Script"
-msgstr ""
+msgstr "Agregar Atajo de Teclado o Script Lua"
 
 #: luainstance.cc:1532
 msgid "Add Lua Callback Hook"
-msgstr ""
+msgstr "Agregar Gancho de devolución de llamada Lua"
 
 #: luainstance.cc:1539
 msgid "Add Lua Session Script"
-msgstr ""
+msgstr "Agregar Script de Sesión Lua"
 
 #: luainstance.cc:1562
 msgid "Cannot read script '%1': %2"
@@ -8853,15 +9114,15 @@ msgstr "No se pudo leer script '%1': %2"
 
 #: luainstance.cc:1579
 msgid "Set Script Parameters"
-msgstr ""
+msgstr "Establecer parámetros del script"
 
 #: luainstance.cc:1604
 msgid "Session script '%1' instantiation failed: %2"
-msgstr ""
+msgstr "Error al instanciar el script de sesión '%1': %2"
 
 #: luainstance.cc:1608 luainstance.cc:1612
 msgid "Loading Session script '%1' failed: %2"
-msgstr ""
+msgstr "Error al cargar el script de sesión '%1': %2"
 
 #: luawindow.cc:98
 msgid "Run"
@@ -8873,11 +9134,11 @@ msgstr "Limpiar salida"
 
 #: luawindow.cc:103
 msgid "Revert"
-msgstr ""
+msgstr "Revertir"
 
 #: luawindow.cc:178
 msgid "Select Editor Buffer"
-msgstr ""
+msgstr "Seleccionar búfer de editor"
 
 #: luawindow.cc:266 luawindow.cc:271
 msgid "Window|Lua"
@@ -8885,15 +9146,15 @@ msgstr "Lua"
 
 #: luawindow.cc:299 luawindow.cc:323
 msgid "LuaException: %1"
-msgstr ""
+msgstr "Excepción Lua: %1"
 
 #: luawindow.cc:301 luawindow.cc:325
 msgid "Glib Exception: %1"
-msgstr ""
+msgstr "Excepción Glib: %1"
 
 #: luawindow.cc:303 luawindow.cc:305 luawindow.cc:327 luawindow.cc:329
 msgid "C++ Exception: %1"
-msgstr ""
+msgstr "Excepción C++: %1"
 
 #: luawindow.cc:380
 msgid "Deleted %1"
@@ -8901,27 +9162,32 @@ msgstr "Eliminado %1"
 
 #: luawindow.cc:383
 msgid "Failed to delete %1"
-msgstr ""
+msgstr "Error al eliminar %1"
 
 #: luawindow.cc:449
 msgid ""
 "Missing script header.\n"
 "The script requires an '{ardour}' info table and a 'factory' function."
 msgstr ""
+"Falta el encabezado del script.\n"
+"El script requiere una tabla de información '{ardour}' y una función "
+"'factory'."
 
 #: luawindow.cc:454
 msgid "Script fails to compile."
-msgstr ""
+msgstr "Script fails to compile."
 
 #: luawindow.cc:461
 msgid "Invalid or missing script-name or script-type."
-msgstr ""
+msgstr "Nombre o tipo de script inválido o faltante."
 
 #: luawindow.cc:466
 msgid ""
 "Invalid script-type.\n"
 "Valid types are 'EditorAction' and 'Snippet'."
 msgstr ""
+"Invalid script-type.\n"
+"Valid types are 'EditorAction' and 'Snippet'."
 
 #: luawindow.cc:477 luawindow.cc:529
 msgid "Saved as %1"
@@ -8936,10 +9202,12 @@ msgid ""
 "Script with given name '%1' already exists.\n"
 "Use a different name in the descriptor."
 msgstr ""
+"Ya existe un script con el nombre '%1'.\n"
+"Utilice un nombre diferente en el descriptor."
 
 #: luawindow.cc:675
 msgid "Scratch Buffer %1"
-msgstr ""
+msgstr "Búfer de Scratch %1"
 
 #: luawindow.cc:677
 msgid "Action: '%1'"
@@ -8947,7 +9215,7 @@ msgstr "Acción: '%1'"
 
 #: luawindow.cc:679
 msgid "Snippet: %1"
-msgstr ""
+msgstr "Fragmento: %1"
 
 #: luawindow.cc:691
 msgid "Save as"
@@ -8955,11 +9223,11 @@ msgstr "Guardar como"
 
 #: main.cc:100
 msgid "%1 could not connect to the audio backend."
-msgstr ""
+msgstr "%1 no pudo conectarse al backend de audio."
 
 #: main.cc:147 main.cc:163
 msgid "The audio backend (%1) has failed, or terminated"
-msgstr ""
+msgstr "El backend de audio (%1) ha fallado o se ha terminado"
 
 #: main.cc:150
 msgid ""
@@ -8969,20 +9237,28 @@ msgid ""
 "\n"
 "Click OK to exit %1."
 msgstr ""
+"%2 se ha cerrado inesperadamente y sin notificar a %1.\n"
+"\n"
+"Esto podría deberse a una configuración incorrecta o a un error dentro de "
+"%2.\n"
+"\n"
+"Haga clic en Aceptar para salir de %1."
 
 #: main.cc:164
 msgid "%2 exited unexpectedly, and without notifying %1."
-msgstr ""
+msgstr "%2 se ha cerrado inesperadamente y sin notificar a %1."
 
 #: main.cc:259
 msgid ""
 "\n"
 "   %1 could not understand your command line      "
 msgstr ""
+"\n"
+" %1 no pudo entender su línea de comandos "
 
 #: main.cc:261
 msgid "An error was encountered while launching %1"
-msgstr ""
+msgstr "Se encontró un error al iniciar %1"
 
 #: main.cc:378
 msgid " (built using "
@@ -8994,15 +9270,15 @@ msgstr " y versión de GCC "
 
 #: main.cc:391
 msgid "Copyright (C) 1999-2020 Paul Davis"
-msgstr ""
+msgstr "Copyright (C) 1999-2020 Paul Davis"
 
 #: main.cc:392
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 msgstr ""
-"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
-"Baker, Robin Gareus"
+"Algunas partes del Copyright (C) Steve Harris, Ari Johnson, Brett Viren, "
+"Joel Baker, Robin Gareus"
 
 #: main.cc:394
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
@@ -9011,7 +9287,7 @@ msgstr "%1 viene SIN GARANT�A DE NINGUNA CLASE"
 #: main.cc:395
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
-"incluidas de comerciabilidad o adecuación para un propósito determinado"
+"incluidas de comerciabilidad o adecuación para un propósito determinado."
 
 #: main.cc:396
 msgid "This is free software, and you are welcome to redistribute it "
@@ -9032,30 +9308,33 @@ msgid ""
 "Could not initialize %1 (likely due to corrupt config files).\n"
 "Run %1 from a commandline for more information."
 msgstr ""
+"No se pudo inicializar %1 (probablemente debido a archivos de configuración "
+"corruptos).\n"
+"Ejecute %1 desde una línea de comandos para obtener más información."
 
 #: main.cc:413
 msgid "Cannot xinstall SIGPIPE error handler"
-msgstr "Cannot xinstall SIGPIPE error handler"
+msgstr "No se puede instalar el manejador de errores SIGPIPE"
 
 #: main.cc:420
 msgid "Could not complete pre-GUI initialization"
-msgstr ""
+msgstr "No se pudo completar la inicialización previa a la GUI"
 
 #: main.cc:427
 msgid "could not create %1 GUI"
-msgstr "could not create %1 GUI"
+msgstr "No se pudo crear la GUI %1"
 
 #: main_clock.cc:73
 msgid "Display absolute time"
-msgstr ""
+msgstr "Mostrar tiempo absoluto"
 
 #: main_clock.cc:78
 msgid "Display delta to edit cursor"
-msgstr "Mostrar diferencia al punto de edición"
+msgstr "Mostrar delta al cursor de edición"
 
 #: main_clock.cc:83
 msgid "Display delta to origin marker"
-msgstr ""
+msgstr "Mostrar delta al marcador de origen"
 
 #: main_clock.cc:91 tempo_dialog.cc:65
 msgid "Edit Tempo"
@@ -9075,7 +9354,7 @@ msgstr "Insertar cambio de métrica"
 
 #: marker.cc:288 tempo_curve.cc:80 tempo_curve.cc:81
 msgid "MarkerText"
-msgstr "MarkerText"
+msgstr "Texto del marcador"
 
 #: midi_channel_selector.cc:164 midi_channel_selector.cc:396
 #: midi_channel_selector.cc:435 rc_option_editor.cc:3883
@@ -9173,7 +9452,7 @@ msgstr "Pulsa para forzar todos los canales de grabación a %1"
 
 #: midi_export_dialog.cc:37
 msgid "Export MIDI: %1"
-msgstr ""
+msgstr "Exportar MIDI: %1"
 
 #: midi_list_editor.cc:58
 msgid "Whole"
@@ -9181,11 +9460,11 @@ msgstr "Redonda"
 
 #: midi_list_editor.cc:59
 msgid "Half"
-msgstr ""
+msgstr "Blanca"
 
 #: midi_list_editor.cc:60
 msgid "Triplet"
-msgstr ""
+msgstr "Tresillo"
 
 #: midi_list_editor.cc:61
 msgid "Quarter"
@@ -9213,7 +9492,7 @@ msgstr "Num"
 
 #: midi_list_editor.cc:110
 msgid "Vel"
-msgstr "Int"
+msgstr "Vel"
 
 #: midi_list_editor.cc:220
 msgid "edit note start"
@@ -9229,7 +9508,7 @@ msgstr "editar número de nota"
 
 #: midi_list_editor.cc:249
 msgid "edit note velocity"
-msgstr "editar intensidad nota"
+msgstr "editar velocidad de nota"
 
 #: midi_list_editor.cc:263
 msgid "edit note length"
@@ -9253,7 +9532,7 @@ msgstr "cambiar número de notas"
 
 #: midi_list_editor.cc:631
 msgid "change note velocity"
-msgstr "cambiar intensidad de nota"
+msgstr "cambiar velocidad de nota"
 
 #: midi_list_editor.cc:701
 msgid "change note length"
@@ -9265,7 +9544,7 @@ msgstr "edición de canal"
 
 #: midi_region_view.cc:824
 msgid "velocity edit"
-msgstr "editar intensidad"
+msgstr "editar velocidad"
 
 #: midi_region_view.cc:883
 msgid "add note"
@@ -9273,7 +9552,7 @@ msgstr "añadir nota"
 
 #: midi_region_view.cc:1854
 msgid "step add"
-msgstr ""
+msgstr "agregar paso"
 
 #: midi_region_view.cc:1960 midi_region_view.cc:1984
 msgid "alter patch change"
@@ -9305,11 +9584,11 @@ msgstr "mover notas"
 
 #: midi_region_view.cc:2706
 msgid "copy notes"
-msgstr ""
+msgstr "copiar notas"
 
 #: midi_region_view.cc:3269
 msgid "change velocities"
-msgstr "cambiar intensidades"
+msgstr "cambiar velocidades"
 
 #: midi_region_view.cc:3335
 msgid "transpose"
@@ -9329,11 +9608,11 @@ msgstr "cambiar canal"
 
 #: midi_region_view.cc:3492
 msgid "Bank "
-msgstr "Banco"
+msgstr "Banco "
 
 #: midi_region_view.cc:3494
 msgid "Channel "
-msgstr "Canal"
+msgstr "Canal "
 
 #: midi_region_view.cc:3695
 msgid "paste"
@@ -9341,15 +9620,15 @@ msgstr "pegar"
 
 #: midi_streamview.cc:191
 msgid "attempt to display MIDI region with no source"
-msgstr ""
+msgstr "Intento de mostrar región MIDI sin fuente"
 
 #: midi_streamview.cc:201
 msgid "attempt to display MIDI region with no model"
-msgstr ""
+msgstr "Intento de mostrar región MIDI sin modelo"
 
 #: midi_streamview.cc:525
 msgid "failed to create MIDI region"
-msgstr ""
+msgstr "Error al crear región MIDI"
 
 #: midi_time_axis.cc:257
 msgid "External MIDI Device"
@@ -9362,7 +9641,7 @@ msgstr "Modo de dispositivo externo"
 #: midi_time_axis.cc:371 midi_time_axis.cc:377 midi_time_axis.cc:393
 #: midi_time_axis.cc:475
 msgid "Plugin Provided"
-msgstr ""
+msgstr "Proporcionado por Plugin"
 
 #: midi_time_axis.cc:607
 msgid "Show Full Range"
@@ -9382,11 +9661,11 @@ msgstr "Modo de notas"
 
 #: midi_time_axis.cc:618
 msgid "Channel Selector..."
-msgstr ""
+msgstr "Selector de Canal..."
 
 #: midi_time_axis.cc:621 mixer_strip.cc:1764 route_time_axis.cc:789
 msgid "Patch Selector..."
-msgstr ""
+msgstr "Selector de Patch."
 
 #: midi_time_axis.cc:624
 msgid "Color Mode"
@@ -9406,7 +9685,7 @@ msgstr "Controladores"
 
 #: midi_time_axis.cc:695
 msgid "Polyphonic Pressure"
-msgstr ""
+msgstr "Presión Polifónica"
 
 #: midi_time_axis.cc:700
 msgid "No MIDI Channels selected"
@@ -9454,7 +9733,7 @@ msgstr "Color de pista"
 
 #: midi_tracer.cc:51
 msgid "Line history: "
-msgstr "Historia de líneas:"
+msgstr "Historia de líneas: "
 
 # podría ser "desplazar", chequear contexto
 #: midi_tracer.cc:59
@@ -9488,34 +9767,40 @@ msgid ""
 "fine grained control. Right-click to set display range. The display unit is "
 "defined by the primary clock."
 msgstr ""
+"<b>Línea de tiempo de navegación</b>. Use el botón izquierdo del ratón para "
+"ubicarse en una posición de tiempo o un marcador; la rueda del ratón para "
+"saltar, mantenga %1 para un control más preciso y %2 + %3 para un control "
+"extrafino. Haga clic con el botón derecho para establecer el rango de "
+"visualización. La unidad de visualización está definida por el reloj "
+"principal."
 
 #: mini_timeline.cc:678 rc_option_editor.cc:1151
 msgid "30 sec"
-msgstr ""
+msgstr "30 seg"
 
 #: mini_timeline.cc:679 rc_option_editor.cc:1152
 msgid "1 min"
-msgstr ""
+msgstr "1 min"
 
 #: mini_timeline.cc:680 rc_option_editor.cc:1153
 msgid "2 mins"
-msgstr ""
+msgstr "2 mins"
 
 #: mini_timeline.cc:681 rc_option_editor.cc:1156
 msgid "5 mins"
-msgstr ""
+msgstr "5 mins"
 
 #: mini_timeline.cc:682
 msgid "10 mins"
-msgstr ""
+msgstr "10 mins"
 
 #: mini_timeline.cc:683
 msgid "20 mins"
-msgstr ""
+msgstr "20 mins"
 
 #: missing_file_dialog.cc:40
 msgid "Missing File"
-msgstr ""
+msgstr "Archivo faltante"
 
 #: missing_file_dialog.cc:43
 msgid "Select a folder to search"
@@ -9553,6 +9838,14 @@ msgid ""
 "\t\t\t\t\t<tt>%4</tt>\n"
 "\n"
 msgstr ""
+"%1 no puede encontrar el archivo %2\n"
+"\n"
+"<i>%3</i>\n"
+"\n"
+"en ninguna de estas carpetas:\n"
+"\n"
+"\t\t\t\t\t<tt>%4</tt>\n"
+"\n"
 
 #: missing_file_dialog.cc:113
 msgid "Click to choose an additional folder"
@@ -9560,7 +9853,7 @@ msgstr "Pulsa para elegir una carpeta adicional"
 
 #: missing_filesource_dialog.cc:33
 msgid "Missing Source Files"
-msgstr ""
+msgstr "Archivos Fuente Faltantes"
 
 #: missing_filesource_dialog.cc:40 missing_plugin_dialog.cc:39
 #: transcode_video_dialog.cc:63
@@ -9573,6 +9866,9 @@ msgid ""
 "They have been replaced with silence:\n"
 "\n"
 msgstr ""
+"Esta sesión no encuentra los siguientes archivos %1.\n"
+"Han sido reemplazados por silencio:\n"
+"\n"
 
 #: missing_filesource_dialog.cc:52
 msgid ""
@@ -9581,6 +9877,10 @@ msgid ""
 "If this is unexpected, manually locate the files and restore them in the "
 "session folder.\n"
 msgstr ""
+"\n"
+"Se han conservado las regiones y las ediciones.\n"
+"Si esto es inesperado, localice manualmente los archivos y restáurelos en la "
+"carpeta de la sesión.\n"
 
 #: missing_filesource_dialog.cc:56
 msgid ""
@@ -9588,6 +9888,10 @@ msgid ""
 "disable this warning,\n"
 "but also prevent future recovery of the original in the exising region(s).\n"
 msgstr ""
+"Editar los archivos MIDI agregando nuevo contenido volverá a crear el "
+"archivo y desactivará esta advertencia,\n"
+"pero también evitará la recuperación futura del original en la(s) región(es) "
+"existente(s).\n"
 
 #: missing_plugin_dialog.cc:32
 msgid "Missing Plugins"
@@ -9599,6 +9903,9 @@ msgid ""
 "system:\n"
 "\n"
 msgstr ""
+"Esta sesión contiene los siguientes plugins que no se pueden encontrar en "
+"este sistema:\n"
+"\n"
 
 #: missing_plugin_dialog.cc:51
 msgid ""
@@ -9608,6 +9915,11 @@ msgid ""
 "session.\n"
 "(also check the blacklist, Window > Log and Preferences > Plugins)"
 msgstr ""
+"\n"
+"Estos plugins serán reemplazados por stubs inactivos.\n"
+"Se recomienda instalar los plugins faltantes y volver a cargar la sesión.\n"
+"(también verifique la lista negra, Ventana > Registro y Preferencias > "
+"Plugins)"
 
 #: mixer_strip.cc:176
 msgid "Click to toggle the width of this mixer strip."
@@ -9639,7 +9951,7 @@ msgstr "Lock"
 
 #: mixer_strip.cc:219 mixer_strip.cc:2275
 msgid "Iso"
-msgstr ""
+msgstr "Iso"
 
 #: mixer_strip.cc:268
 msgid "Mix group"
@@ -9647,7 +9959,7 @@ msgstr "Grupo de mezcla"
 
 #: mixer_strip.cc:280
 msgid "Trim: "
-msgstr "Recortar:"
+msgstr "Recortar: "
 
 #: mixer_strip.cc:409 rc_option_editor.cc:4001
 msgid "Phase Invert"
@@ -9663,11 +9975,11 @@ msgstr "Solo Iso / Lock"
 
 #: mixer_strip.cc:414 rc_option_editor.cc:4006
 msgid "VCA Assigns"
-msgstr ""
+msgstr "Asignaciones de VCA"
 
 #: mixer_strip.cc:591
 msgid "Show/Hide Monitoring Section"
-msgstr "Mostrar/Ocultar sección de monitorización"
+msgstr "Mostrar/Ocultar sección de monitoreo"
 
 #: mixer_strip.cc:626
 msgid "Enable/Disable MIDI input"
@@ -9700,7 +10012,7 @@ msgstr "Color..."
 
 #: mixer_strip.cc:1696 route_time_axis.cc:634
 msgid "Inputs..."
-msgstr ""
+msgstr "Entradas..."
 
 #: mixer_strip.cc:1739 plugin_pin_dialog.cc:1028
 msgid "Strict I/O"
@@ -9708,19 +10020,19 @@ msgstr "E/S estricto"
 
 #: mixer_strip.cc:1749
 msgid "Record Pre-Fader"
-msgstr ""
+msgstr "Grabar Pre-Fader"
 
 #: mixer_strip.cc:1750
 msgid "Record Post-Fader"
-msgstr ""
+msgstr "Grabar Post-Fader"
 
 #: mixer_strip.cc:1751
 msgid "Custom Record+Playback Positions"
-msgstr ""
+msgstr "Posiciones personalizadas de grabación y reproducción"
 
 #: mixer_strip.cc:1753
 msgid "Disk I/O..."
-msgstr ""
+msgstr "E/S de disco..."
 
 #: mixer_strip.cc:1760 processor_box.cc:3919
 msgid "Pin Connections..."
@@ -9728,11 +10040,11 @@ msgstr "Pin Connections..."
 
 #: mixer_strip.cc:1770
 msgid "Fan out to Busses"
-msgstr ""
+msgstr "Ventilar a Buses"
 
 #: mixer_strip.cc:1771
 msgid "Fan out to Tracks"
-msgstr ""
+msgstr "Ventilar a Pistas"
 
 #: mixer_strip.cc:1792 route_time_axis.cc:850
 msgid "Duplicate..."
@@ -9740,31 +10052,31 @@ msgstr "Duplicar..."
 
 #: mixer_strip.cc:2063
 msgid "Pre"
-msgstr ""
+msgstr "Pre"
 
 #: mixer_strip.cc:2067
 msgid "Post"
-msgstr ""
+msgstr "Post"
 
 #: mixer_strip.cc:2083
 msgid "Meter|In"
-msgstr ""
+msgstr "En"
 
 #: mixer_strip.cc:2087
 msgid "Meter|Pr"
-msgstr ""
+msgstr "Pr"
 
 #: mixer_strip.cc:2091
 msgid "Meter|Po"
-msgstr ""
+msgstr "Po"
 
 #: mixer_strip.cc:2095
 msgid "Meter|O"
-msgstr ""
+msgstr "O"
 
 #: mixer_strip.cc:2100
 msgid "Meter|C"
-msgstr ""
+msgstr "C"
 
 #: mixer_strip.cc:2253 route_ui.cc:219
 msgid "Disk"
@@ -9784,11 +10096,11 @@ msgstr "PFL"
 
 #: mixer_strip.cc:2281 meter_strip.cc:395
 msgid "MonitorInput|I"
-msgstr ""
+msgstr "E"
 
 #: mixer_strip.cc:2282 meter_strip.cc:396
 msgid "MonitorDisk|D"
-msgstr ""
+msgstr "D"
 
 #: mixer_strip.cc:2284
 msgid "Mon|O"
@@ -9797,31 +10109,31 @@ msgstr "O"
 #: mixer_strip.cc:2297 meter_strip.cc:387 route_time_axis.cc:2554
 #: vca_master_strip.cc:217 vca_time_axis.cc:273
 msgid "AfterFader|A"
-msgstr ""
+msgstr "Po"
 
 #: mixer_strip.cc:2300
 msgid "Prefader|P"
-msgstr ""
+msgstr "Pr"
 
 #: mixer_strip.cc:2305
 msgid "SoloIso|I"
-msgstr ""
+msgstr "I"
 
 #: mixer_strip.cc:2306
 msgid "SoloLock|L"
-msgstr ""
+msgstr "B"
 
 #: mixer_strip.cc:2578 meter_strip.cc:876
 msgid "Change all in Group to %1"
-msgstr ""
+msgstr "Cambiar todo en Grupo a %1"
 
 #: mixer_strip.cc:2580 meter_strip.cc:878
 msgid "Change all to %1"
-msgstr ""
+msgstr "Cambiar todo a %1"
 
 #: mixer_strip.cc:2582 meter_strip.cc:880
 msgid "Change same track-type to %1"
-msgstr ""
+msgstr "Cambiar el mismo tipo de pista a %1"
 
 #: mixer_ui.cc:197 route_time_axis.cc:810
 msgid "Group"
@@ -9833,21 +10145,25 @@ msgstr "Plugins favoritos"
 
 #: mixer_ui.cc:673
 msgid "Error adding GUI elements for new tracks/busses %1"
-msgstr ""
+msgstr "Error al agregar elementos de la GUI para nuevas pistas/buses %1"
 
 #: mixer_ui.cc:950
 msgid ""
 "The Plugin's number of audio outputs ports (%1) does not match the Tracks's "
 "number of audio outputs (%2). Cannot fan out."
 msgstr ""
+"El número de puertos de salida de audio del plugin (%1) no coincide con el "
+"número de salidas de audio de la pista (%2). No se puede ventilar."
 
 #: mixer_ui.cc:968
 msgid "Instrument has only 1 output bus. Nothing to fan out."
-msgstr ""
+msgstr "El instrumento solo tiene 1 bus de salida. Nada que ventilar."
 
 #: mixer_ui.cc:1992
 msgid "track display list item for renamed strip not found!"
 msgstr ""
+"¡No se encontró el elemento de la lista de visualización de la pista para la "
+"tira renombrada!"
 
 #: mixer_ui.cc:2090
 msgid "-all-"
@@ -9900,15 +10216,16 @@ msgstr ""
 
 #: mixer_ui.cc:3520
 msgid "Decrease Gain on Mixer-Selected Tracks/Busses"
-msgstr ""
+msgstr "Disminuir ganancia en pistas/buses seleccionados en el mezclador"
 
 #: mixer_ui.cc:3521
 msgid "Increase Gain on Mixer-Selected Tracks/Busses"
-msgstr ""
+msgstr "Aumentar ganancia en pistas/buses seleccionados en el mezclador"
 
 #: mixer_ui.cc:3522
 msgid "Set Gain to 0dB on Mixer-Selected Tracks/Busses"
 msgstr ""
+"Establecer ganancia a 0dB en pistas/buses seleccionados en el mezclador"
 
 #: mixer_ui.cc:3525
 msgid "Copy Selected Processors"
@@ -9944,19 +10261,19 @@ msgstr "Deselect all strips and processors"
 
 #: mixer_ui.cc:3534
 msgid "Select Next Mixer Strip"
-msgstr ""
+msgstr "Seleccionar siguiente canal de mezclador"
 
 #: mixer_ui.cc:3535
 msgid "Select Previous Mixer Strip"
-msgstr ""
+msgstr "Seleccionar canal de mezclador anterior"
 
 #: mixer_ui.cc:3537
 msgid "Scroll Mixer Window to the left"
-msgstr ""
+msgstr "Desplazar ventana del mezclador hacia la izquierda"
 
 #: mixer_ui.cc:3538
 msgid "Scroll Mixer Window to the right"
-msgstr ""
+msgstr "Desplazar ventana del mezclador hacia la derecha"
 
 #: mixer_ui.cc:3540
 msgid "Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"
@@ -9965,104 +10282,104 @@ msgstr ""
 
 #: mixer_ui.cc:3543
 msgid "Mixer: Show Mixer List"
-msgstr ""
+msgstr "Mezclador: Mostrar Lista de Mezcladores"
 
 #: mixer_ui.cc:3545
 msgid "Mixer: Show VCAs"
-msgstr ""
+msgstr "Mezclador: Mostrar VCAs"
 
 #: mixer_ui.cc:3548
 msgid "Mixer: Show Mixbusses"
-msgstr ""
+msgstr "Mezclador: Mostrar Mixbuses"
 
 #: mixer_ui.cc:3551
 msgid "Mixer: Show Monitor Section"
-msgstr ""
+msgstr "Mezclador: Mostrar Sección de Monitoreo"
 
 #: mixer_ui.cc:3553
 msgid "Mixer: Show Foldback Strip"
-msgstr ""
+msgstr "Mezclador: Mostrar Pista de Retorno"
 
 #: mixer_ui.cc:3555
 msgid "Toggle Disk Monitoring"
-msgstr ""
+msgstr "Activar/Desactivar Monitoreo de Disco"
 
 #: mixer_ui.cc:3556
 msgid "Toggle Input Monitoring"
-msgstr ""
+msgstr "Activar/Desactivar Monitoreo de Entrada"
 
 #: meter_strip.cc:171
 msgid "Reset Peak"
-msgstr ""
+msgstr "Restablecer Pico"
 
 #: meter_strip.cc:390 route_time_axis.cc:2558 vca_master_strip.cc:221
 #: vca_time_axis.cc:277
 msgid "PreFader|P"
-msgstr ""
+msgstr "P"
 
 #: meter_strip.cc:911
 msgid "Variable height"
-msgstr ""
+msgstr "Altura variable"
 
 #: meter_strip.cc:912
 msgid "Short"
-msgstr ""
+msgstr "Bajo"
 
 #: meter_strip.cc:913
 msgid "Tall"
-msgstr ""
+msgstr "Alto"
 
 #: meter_strip.cc:914
 msgid "Grande"
-msgstr ""
+msgstr "Muy alto"
 
 #: meter_strip.cc:915
 msgid "Venti"
-msgstr ""
+msgstr "Enorme"
 
 #: meter_patterns.cc:86
 msgid "Peak (+6dBFS)"
-msgstr ""
+msgstr "Pico (+6dBFS)"
 
 #: meter_patterns.cc:89
 msgid "Peak (0dBFS)"
-msgstr ""
+msgstr "Pico (0dBFS)"
 
 #: meter_patterns.cc:92
 msgid "RMS + Peak"
-msgstr ""
+msgstr "RMS + Pico"
 
 #: meter_patterns.cc:95
 msgid "IEC1/DIN"
-msgstr ""
+msgstr "IEC1/DIN"
 
 #: meter_patterns.cc:98
 msgid "IEC1/Nordic"
-msgstr ""
+msgstr "IEC1/Nordic"
 
 #: meter_patterns.cc:101
 msgid "IEC2/BBC"
-msgstr ""
+msgstr "IEC2/BBC"
 
 #: meter_patterns.cc:104
 msgid "IEC2/EBU"
-msgstr ""
+msgstr "IEC2/EBU"
 
 #: meter_patterns.cc:107
 msgid "K20/RMS"
-msgstr ""
+msgstr "K20/RMS"
 
 #: meter_patterns.cc:110
 msgid "K14/RMS"
-msgstr ""
+msgstr "K14/RMS"
 
 #: meter_patterns.cc:113
 msgid "K12/RMS"
-msgstr ""
+msgstr "K12/RMS"
 
 #: meter_patterns.cc:116
 msgid "VU"
-msgstr ""
+msgstr "VU"
 
 #: monitor_section.cc:90
 msgid "SiP"
@@ -10074,11 +10391,11 @@ msgstr "Solos"
 
 #: monitor_section.cc:125
 msgid "Isolated"
-msgstr ""
+msgstr "Aislados"
 
 #: monitor_section.cc:129
 msgid "Auditioning"
-msgstr ""
+msgstr "Audición"
 
 #: monitor_section.cc:138
 msgid ""
@@ -10110,7 +10427,7 @@ msgstr "Los controles de solo conmutan escucha-pre-fader"
 
 #: monitor_section.cc:176
 msgid "Excl. Solo"
-msgstr ""
+msgstr "Excl. Solo"
 
 #: monitor_section.cc:178
 msgid "Exclusive solo means that only 1 solo is active at a time"
@@ -10119,7 +10436,7 @@ msgstr ""
 
 #: monitor_section.cc:185
 msgid "Solo » Mute"
-msgstr ""
+msgstr "Solo » Mudo"
 
 #: monitor_section.cc:187
 msgid ""
@@ -10135,7 +10452,7 @@ msgstr "Procesadores"
 
 #: monitor_section.cc:194
 msgid "Allow one to add monitor effect processors"
-msgstr ""
+msgstr "Permitir añadir procesadores de efectos de monitor"
 
 #: monitor_section.cc:209 monitor_section.cc:212
 msgid "Gain increase for soloed signals (0dB is normal)"
@@ -10144,45 +10461,47 @@ msgstr "Incremento de ganancia para señales en solo (0dB es normal)"
 #: monitor_section.cc:215 monitor_section.cc:233 monitor_section.cc:252
 #: monitor_section.cc:298
 msgid "0 dB"
-msgstr ""
+msgstr "0 dB"
 
 #: monitor_section.cc:216
 msgid "3 dB"
-msgstr ""
+msgstr "3 dB"
 
 #: monitor_section.cc:217
 msgid "6 dB"
-msgstr ""
+msgstr "6 dB"
 
 #: monitor_section.cc:218
 msgid "10 dB"
-msgstr ""
+msgstr "10 dB"
 
 #: monitor_section.cc:220
 msgid "Solo Boost"
-msgstr ""
+msgstr "Solo Boost"
 
 #: monitor_section.cc:227 monitor_section.cc:230
 msgid ""
 "Gain reduction non-soloed signals\n"
 "A value above -inf dB causes \"solo-in-front\""
 msgstr ""
+"Reducción de ganancia de señales no soloadas\n"
+"Un valor superior a -inf dB provoca \"solo-en-primer-plano\""
 
 #: monitor_section.cc:234 monitor_section.cc:254 monitor_section.cc:300
 msgid "-6 dB"
-msgstr ""
+msgstr "-6 dB"
 
 #: monitor_section.cc:235 monitor_section.cc:255 monitor_section.cc:301
 msgid "-12 dB"
-msgstr ""
+msgstr "-12 dB"
 
 #: monitor_section.cc:236 monitor_section.cc:256 monitor_section.cc:302
 msgid "-20 dB"
-msgstr ""
+msgstr "-20 dB"
 
 #: monitor_section.cc:237
 msgid "OFF"
-msgstr ""
+msgstr "APAGADO"
 
 #: monitor_section.cc:239
 msgid "SiP Cut"
@@ -10190,11 +10509,11 @@ msgstr "Cortar SiP"
 
 #: monitor_section.cc:246 monitor_section.cc:249
 msgid "Gain reduction to use when dimming monitor outputs"
-msgstr ""
+msgstr "Reducción de ganancia a utilizar al atenuar las salidas de monitor"
 
 #: monitor_section.cc:253 monitor_section.cc:299
 msgid "-3 dB"
-msgstr ""
+msgstr "-3 dB"
 
 #: monitor_section.cc:258 monitor_section.cc:272 monitor_section.cc:331
 #: monitor_section.cc:960
@@ -10215,31 +10534,31 @@ msgstr "Monitorizar"
 
 #: monitor_section.cc:948
 msgid "Use Monitor Section"
-msgstr ""
+msgstr "Usar Sección de Monitor"
 
 #: monitor_section.cc:962
 msgid "Toggle Monitor Section Processor Box"
-msgstr "Toggle Monitor Section Processor Box"
+msgstr "Activar/Desactivar el cuadro de Procesadores de la Sección de Monitor"
 
 #: monitor_section.cc:969
 msgid "Cut monitor channel %1"
-msgstr "Cortar canal de monitorización %1"
+msgstr "Cortar canal de monitoreo %1"
 
 #: monitor_section.cc:974
 msgid "Dim monitor channel %1"
-msgstr "Atenuar canal de monitorización %1"
+msgstr "Atenuar canal de monitoreo %1"
 
 #: monitor_section.cc:979
 msgid "Solo monitor channel %1"
-msgstr "Poner en solo canal de monitorización %1"
+msgstr "Poner en solo canal de monitoreo %1"
 
 #: monitor_section.cc:984
 msgid "Invert monitor channel %1"
-msgstr "Invertir canal de monitorización %1"
+msgstr "Invertir canal de monitoreo %1"
 
 #: monitor_section.cc:993
 msgid "In-place solo"
-msgstr ""
+msgstr "Solo en su lugar"
 
 #: monitor_section.cc:995
 msgid "After Fade Listen (AFL) solo"
@@ -10259,38 +10578,38 @@ msgstr "Mudo anula solo"
 
 #: monitor_section.cc:1336
 msgid "No session - no I/O changes are possible"
-msgstr ""
+msgstr "Sin sesión - no es posible realizar cambios de E/S"
 
 #: monitor_selector.cc:200
 msgid "Monitor output selector"
-msgstr ""
+msgstr "Selector de salida de monitor"
 
 #: mono_panner.cc:107 stereo_panner.cc:120
 msgid "bypassed"
-msgstr ""
+msgstr "obviado"
 
 #: mono_panner.cc:121
 #, c-format
 msgid "L:%3d R:%3d"
-msgstr ""
+msgstr "I:%3d D:%3d"
 
 #: mono_panner.cc:202 panner2d.cc:286 stereo_panner.cc:255 stereo_panner.cc:278
 msgid "Panner|L"
-msgstr ""
+msgstr "I"
 
 #: mono_panner.cc:219 panner2d.cc:287 stereo_panner.cc:253 stereo_panner.cc:280
 msgid "Panner|R"
-msgstr ""
+msgstr "D"
 
 # Aquí estaaba panorámica, pero pan se entiende perfectamente y es mucho más corto
 #: mono_panner_editor.cc:36
 msgid "Mono Panner"
-msgstr "Pan mono"
+msgstr "Paneo mono"
 
 #: mono_panner_editor.cc:47 mono_panner_editor.cc:52 stereo_panner_editor.cc:47
 #: stereo_panner_editor.cc:52
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #: nag.cc:41
 msgid "Support %1 Development"
@@ -10298,7 +10617,7 @@ msgstr "Colabora con el desarrollo de %1"
 
 #: nag.cc:42
 msgid "I'd like to make a one-time donation"
-msgstr "Quisiera hacer una donación eventual"
+msgstr "Me gustaría hacer una donación de una única vez"
 
 #: nag.cc:43
 msgid "Tell me more about becoming a subscriber"
@@ -10372,7 +10691,7 @@ msgstr "Nombre del nuevo preset"
 
 #: new_plugin_preset_dialog.cc:43
 msgid "New Favorite Only"
-msgstr ""
+msgstr "Solo Favorito Nuevo"
 
 #: new_user_wizard.cc:76
 msgid ""
@@ -10380,7 +10699,7 @@ msgid ""
 "%1 will play NO role in monitoring"
 msgstr ""
 "Usar un mezclador externo o el mezclador hardware de tu interfaz de audio.\n"
-"%1 no tomará parte en la monitorización"
+"%1 no tomará parte en el monitoreo"
 
 #: new_user_wizard.cc:78
 msgid "Ask %1 to play back material as it is being recorded"
@@ -10402,7 +10721,7 @@ msgstr ""
 " nuevas ideas sobre música y sonido.\n"
 "\n"
 "Hay unas pocas cosas que hace falta configurar antes de que empieces\n"
-"a usar el programa.</span>"
+"a usar el programa.</span> "
 
 #: new_user_wizard.cc:155
 msgid "GUI and Font scaling:"
@@ -10413,23 +10732,25 @@ msgid ""
 "<small><i>This can later be changed in Preferences &gt; Appearance.</i></"
 "small>"
 msgstr ""
+"<small><i>Esto se puede cambiar más tarde en Preferencias &gt; Apariencia.</"
+"i></small>"
 
 #: new_user_wizard.cc:160 new_user_wizard.cc:164 rc_option_editor.cc:1110
 #: rc_option_editor.cc:2504
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
 #: new_user_wizard.cc:161
 msgid "150%"
-msgstr ""
+msgstr "150%"
 
 #: new_user_wizard.cc:162
 msgid "200%"
-msgstr ""
+msgstr "200%"
 
 #: new_user_wizard.cc:163
 msgid "250%"
-msgstr ""
+msgstr "250%"
 
 #: new_user_wizard.cc:191
 msgid "Welcome to %1"
@@ -10474,7 +10795,7 @@ msgid ""
 "<i>If you do not understand what this is about, just accept the default.</i>"
 msgstr ""
 "Cuando se graba voz o instrumentos, es posible que quieras escuchar\n"
-"la señal al tiempo que la grabas. Esto se llama \"monitorización\". Existen\n"
+"la señal al tiempo que la grabas. Esto se llama \"monitoreo\". Existen\n"
 "diferentes formas de monitorizar según el equipo que tengas y la "
 "configuración\n"
 "de dicho equipo. Aquí presentamos las dos formas más comunes.\n"
@@ -10487,7 +10808,7 @@ msgstr ""
 
 #: new_user_wizard.cc:333
 msgid "Monitoring Choices"
-msgstr "Opciones de monitorización"
+msgstr "Opciones de monitoreo"
 
 #: new_user_wizard.cc:359
 msgid "Use a Master bus directly"
@@ -10503,16 +10824,15 @@ msgstr ""
 
 #: new_user_wizard.cc:370
 msgid "Use an additional Monitor bus"
-msgstr "Usar un bus de monitorización adicional"
+msgstr "Usar un bus de monitoreo adicional"
 
 #: new_user_wizard.cc:373
 msgid ""
 "Use a Monitor bus between Master bus and hardware outputs for \n"
 "greater control in monitoring without affecting the mix."
 msgstr ""
-"Usar un bus de monitorización entre el bus Master y las salidas de "
-"hardware \n"
-"para mayor control de la monitorización, sin afectar a la mezcla."
+"Usar un bus de monitoreo entre el bus Master y las salidas de hardware \n"
+"para mayor control de la monitoreo, sin afectar a la mezcla."
 
 #: new_user_wizard.cc:395
 msgid ""
@@ -10523,14 +10843,14 @@ msgid ""
 msgstr ""
 "<i>Puedes cambiar esta preferencia en cualquier momento, a través del "
 "diálogo Preferencias.\n"
-" También puedes añadir o eliminar la sección de monitorización a o desde "
+" También puedes añadir o eliminar la sección de monitoreo a o desde "
 "cualquier sesión.</i>\n"
 "\n"
 "<i>En caso de duda, acepta la opción predeterminada.</i>"
 
 #: new_user_wizard.cc:515 startup_fsm.cc:839
 msgid "Copied Demo Session %1."
-msgstr ""
+msgstr "Copiada sesión de demostración %1."
 
 #: normalize_dialog.cc:38
 msgid "Normalize regions"
@@ -10542,7 +10862,7 @@ msgstr "Normalizar región"
 
 #: normalize_dialog.cc:53
 msgid "Constrain RMS to:"
-msgstr ""
+msgstr "Restringir RMS a:"
 
 #: normalize_dialog.cc:60
 msgid "Normalize to:"
@@ -10570,65 +10890,82 @@ msgstr "Uso: "
 
 #: opts.cc:67
 msgid " [ OPTIONS ] [ SESSION-NAME ]"
-msgstr ""
+msgstr " [OPCIONES] [NOMBRE-DE-SESIÓN]"
 
 #: opts.cc:69
 msgid ""
 "Ardour is a multichannel hard disk recorder (HDR) and digital audio "
 "workstation (DAW)."
 msgstr ""
+"Ardour es un grabador de disco duro multicanal (HDR) y una estación de "
+"trabajo de audio digital (DAW)."
 
 #: opts.cc:71
 msgid "Options:\n"
-msgstr ""
+msgstr "Opciones:\n"
 
 #: opts.cc:72
 msgid ""
 "  -a, --no-announcements      Do not contact website for announcements\n"
 msgstr ""
+" -a, --no-announcements      No contactar con el sitio web para anuncios\n"
 
 #: opts.cc:73
 msgid "  -A, --actions               Print all possible menu action names\n"
 msgstr ""
+" -A, --actions               Imprimir todos los nombres de acciones de menú "
+"posibles\n"
 
 #: opts.cc:74
 msgid "  -b, --bindings              Display all current key bindings\n"
 msgstr ""
+" -b, --bindings              Mostrar todas las combinaciones de teclas "
+"actuales\n"
 
 #: opts.cc:75
 msgid ""
 "  -B, --bypass-plugins        Bypass all plugins in an existing session\n"
 msgstr ""
-"  -B, --bypass-plugins        Baipasar todos los plugins en una sesión "
+"- B, --bypass-plugins        Omitir todos los plugins en una sesión "
 "existente\n"
+"\n"
 
 #: opts.cc:76
 msgid ""
 "  -c, --name <name>           Use a specific backend client name, default is "
 "ardour\n"
 msgstr ""
+" -c, --name <name>           Usar un nombre de cliente de backend "
+"específico, el predeterminado es ardour\n"
 
 #: opts.cc:77
 msgid "  -d, --disable-plugins       Disable all plugins (safe mode)\n"
 msgstr ""
+" -d, --disable-plugins       Deshabilitar todos los plugins (modo seguro)\n"
 
 #: opts.cc:79
 msgid ""
 "  -D, --debug <options>       Set debug flags. Use \"-D list\" to see "
 "available options\n"
 msgstr ""
+" -D, --debug <options>       Establecer banderas de depuración. Use \"-D "
+"list\" para ver las opciones disponibles\n"
 
 #: opts.cc:81
 msgid "  -h, --help                  Print this message\n"
-msgstr "  -h, --help                Muestra este mensaje\n"
+msgstr ""
+" -h, --help                  Imprimir este mensaje\n"
+"\n"
 
 #: opts.cc:82
 msgid "  -k, --keybindings <file>    Path to the key bindings file to load\n"
 msgstr ""
+" -k, --keybindings <file>    Ruta al archivo de combinaciones de teclas a "
+"cargar\n"
 
 #: opts.cc:83
 msgid "  -m, --menus file            Use \"file\" to define menus\n"
-msgstr "  -m, --menus file               Usar \"file\" para definir menús\n"
+msgstr " -m, --menus file            Usar \"file\" para definir menús\n"
 
 #: opts.cc:84
 msgid "  -n, --no-splash             Do not show splash screen\n"
@@ -10649,31 +10986,31 @@ msgstr ""
 
 #: opts.cc:87
 msgid "  -P, --no-connect-ports      Do not connect any ports at startup\n"
-msgstr ""
+msgstr " -P, --no-connect-ports      No conectar ningún puerto al inicio\n"
 
 #: opts.cc:88
 msgid "  -S, --sync                  Draw the GUI synchronously\n"
-msgstr ""
+msgstr " -S, --sync  Dibujar la GUI de forma síncrona\n"
 
 #: opts.cc:89
 msgid "  -T, --template <name>       Use given template for new session\n"
-msgstr ""
+msgstr " -T, --template <name>       Usar plantilla dada para nueva sesión\n"
 
 #: opts.cc:90
 msgid "  -v, --version               Print version and exit\n"
-msgstr ""
+msgstr " -v, --version               Imprimir versión y salir\n"
 
 #: opts.cc:92
 msgid "  -V, --novst                 Disable WindowsVST support\n"
-msgstr ""
+msgstr " -V, --novst                 Deshabilitar soporte para WindowsVST\n"
 
 #: opts.cc:95
 msgid "Report bugs to http://tracker.ardour.org\n"
-msgstr ""
+msgstr "Reportar errores a http://tracker.ardour.org\n"
 
 #: opts.cc:96
 msgid "Website http://ardour.org\n"
-msgstr ""
+msgstr "Sitio web http://ardour.org\n"
 
 #: panner2d.cc:907
 msgid "Panner (2D)"
@@ -10690,7 +11027,7 @@ msgstr "Paner"
 
 #: panner_ui.cc:79
 msgid "Pan automation mode"
-msgstr "Modo de automatización de panorámica"
+msgstr "Modo de automatización de paneo"
 
 #: panner_ui.cc:182
 msgid "Abs"
@@ -10698,57 +11035,59 @@ msgstr "Abs"
 
 #: panner_ui.cc:423 processor_box.cc:842
 msgid "Link panner controls"
-msgstr ""
+msgstr "Vincular controles de paneo"
 
 #: patch_change_widget.cc:57
 msgid "Audition on Change"
-msgstr ""
+msgstr "Audición al cambiar"
 
 #: patch_change_widget.cc:69
 msgid "Bank:"
-msgstr ""
+msgstr "Banco:"
 
 #: patch_change_widget.cc:71
 msgid "MSB:"
-msgstr ""
+msgstr "MSB:"
 
 #: patch_change_widget.cc:73
 msgid "LSB:"
-msgstr ""
+msgstr "LSB:"
 
 #: patch_change_widget.cc:82
 msgid ""
 "Note: Patch Selection is volatile (only Midi-Tracks retain bank/patch "
 "selection)."
 msgstr ""
+"Nota: La selección de patch es volátil (solo las pistas MIDI retienen la "
+"selección de banco/patch)."
 
 #: patch_change_widget.cc:88
 msgid "Start Note:"
-msgstr ""
+msgstr "Nota de inicio:"
 
 #: patch_change_widget.cc:90
 msgid "End Note:"
-msgstr ""
+msgstr "Nota final:"
 
 #: patch_change_widget.cc:284 patch_change_widget.cc:343
 msgid "%1 (Pgm-%2)"
-msgstr ""
+msgstr "%1 (Pgm-%2)"
 
 #: patch_change_widget.cc:304 patch_change_widget.cc:328
 msgid "Bank %1"
-msgstr ""
+msgstr "Banco %1"
 
 #: patch_change_widget.cc:356
 msgid "Pgm-%1"
-msgstr ""
+msgstr "Pgm-%1"
 
 #: patch_change_widget.cc:635 patch_change_widget.cc:648
 msgid "Select Patch for \"%1\""
-msgstr ""
+msgstr "Seleccionar patch para \"%1\""
 
 #: playlist_selector.cc:45
 msgid "Playlists"
-msgstr "Listas de reproducción"
+msgstr "Listas de Reproducción"
 
 #: playlist_selector.cc:56
 msgid "Playlists grouped by track"
@@ -10776,23 +11115,23 @@ msgstr "Rango:"
 
 #: plugin_eq_gui.cc:129
 msgid "Off"
-msgstr ""
+msgstr "Apagado"
 
 #: plugin_eq_gui.cc:130
 msgid "Output / Input"
-msgstr ""
+msgstr "Salida / Entrada"
 
 #: plugin_eq_gui.cc:133
 msgid "Input +40dB"
-msgstr ""
+msgstr "Entrada +40dB"
 
 #: plugin_eq_gui.cc:134
 msgid "Output +40dB"
-msgstr ""
+msgstr "Salida +40dB"
 
 #: plugin_eq_gui.cc:137
 msgid "Live signal:"
-msgstr ""
+msgstr "Señal en vivo:"
 
 #: plugin_eq_gui.cc:144
 msgid "Show phase"
@@ -10804,7 +11143,7 @@ msgstr "Configuración manual"
 
 #: plugin_pin_dialog.cc:63
 msgid "Sidechain"
-msgstr ""
+msgstr "Sidechain"
 
 #: plugin_pin_dialog.cc:64 plugin_pin_dialog.cc:66 plugin_pin_dialog.cc:68
 #: plugin_pin_dialog.cc:70 plugin_pin_dialog.cc:72 step_entry.cc:86
@@ -10815,39 +11154,40 @@ msgstr "+"
 #: plugin_pin_dialog.cc:65 plugin_pin_dialog.cc:67 plugin_pin_dialog.cc:69
 #: plugin_pin_dialog.cc:71 plugin_pin_dialog.cc:73
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: plugin_pin_dialog.cc:155
 msgid "Audio Input Pins"
-msgstr ""
+msgstr "Pines de entrada de audio"
 
 #: plugin_pin_dialog.cc:164
 msgid "MIDI Input Pins"
-msgstr ""
+msgstr "Pines de entrada de MIDI"
 
 #: plugin_pin_dialog.cc:173
 msgid "Instances"
-msgstr ""
+msgstr "Instancias"
 
 #: plugin_pin_dialog.cc:183
 msgid "Audio Out"
-msgstr ""
+msgstr "Salida de Audio"
 
 #: plugin_pin_dialog.cc:192
 msgid "MIDI Out"
-msgstr ""
+msgstr "Salida de MIDI"
 
 #: plugin_pin_dialog.cc:199
 msgid "Output Presets"
-msgstr ""
+msgstr "Presets de Salida"
 
 #: plugin_pin_dialog.cc:215
 msgid "Add Sidechain Input"
-msgstr ""
+msgstr "Agregar Entrada Sidechain"
 
 #: plugin_pin_dialog.cc:313
 msgid "Cannot perform operation while actively recording."
 msgstr ""
+"No se puede realizar la operación mientras se está grabando activamente."
 
 #: plugin_pin_dialog.cc:350
 msgid "Manual"
@@ -10866,47 +11206,47 @@ msgstr[1] "%1 Canales"
 
 #: plugin_pin_dialog.cc:658 processor_box.cc:244
 msgid "Send"
-msgstr ""
+msgstr "Envío"
 
 #: plugin_pin_dialog.cc:1014
 msgid "Latency %1 spl%2 %3"
-msgstr ""
+msgstr "Latencia %1 spl%2 %3"
 
 #: plugin_pin_dialog.cc:1014 plugin_pin_dialog.cc:1018
 msgid "no-inplace"
-msgstr ""
+msgstr "no en su lugar"
 
 #: plugin_pin_dialog.cc:1016
 msgid "Latency %1 spl"
-msgstr ""
+msgstr "Latencia %1 spl"
 
 #: plugin_pin_dialog.cc:1072
 msgid "Instance #%1"
-msgstr ""
+msgstr "Instancia #%1"
 
 #: plugin_pin_dialog.cc:1570
 msgid "Failed to toggle sidechain."
-msgstr ""
+msgstr "Error al alternar el sidechain."
 
 #: plugin_pin_dialog.cc:1600
 msgid "Failed to reset plugin configuration."
-msgstr ""
+msgstr "Error al restablecer la configuración del plugin."
 
 #: plugin_pin_dialog.cc:1615
 msgid "Failed to change channel preset."
-msgstr ""
+msgstr "Error al cambiar el preset de canal."
 
 #: plugin_pin_dialog.cc:1626
 msgid "Failed to change instance count"
-msgstr ""
+msgstr "Error al cambiar el número de instancias"
 
 #: plugin_pin_dialog.cc:1638
 msgid "Failed to alter plugin output configuration."
-msgstr ""
+msgstr "Error al modificar la configuración de salida del plugin."
 
 #: plugin_pin_dialog.cc:1650
 msgid "Failed to alter plugin input configuration."
-msgstr ""
+msgstr "Error al modificar la configuración de entrada del plugin."
 
 #: plugin_pin_dialog.cc:1750 processor_box.cc:2719
 msgid "Cannot set up new send: %1"
@@ -10914,32 +11254,32 @@ msgstr "No se pudo configurar el nuevo envío: %1"
 
 #: plugin_pin_dialog.cc:1757
 msgid "SC %1 (%2)"
-msgstr ""
+msgstr "SC %1 (%2)"
 
 #: plugin_pin_dialog.cc:2003 plugin_pin_dialog.cc:2011
 msgid "Pin Configuration: %1"
-msgstr "Pin Configuration: %1"
+msgstr "Configuración de pines: %1"
 
 #: plugin_presets_ui.cc:44
 msgid "Bank/Vendor"
-msgstr ""
+msgstr "Banco/Proveedor"
 
 #: plugin_presets_ui.cc:55
 msgid "Type/Category"
-msgstr ""
+msgstr "Tipo/Categoría"
 
 #: plugin_presets_ui.cc:122 plugin_presets_ui.cc:123 plugin_presets_ui.cc:158
 #: plugin_presets_ui.cc:182 plugin_presets_ui.cc:221 plugin_presets_ui.cc:234
 msgid "-All-"
-msgstr ""
+msgstr "-Todo-"
 
 #: plugin_presets_ui.cc:125 plugin_presets_ui.cc:126 plugin_presets_ui.cc:224
 msgid "-User-"
-msgstr ""
+msgstr "-Usuario-"
 
 #: plugin_presets_ui.cc:307
 msgid "(user preset)"
-msgstr ""
+msgstr "(preajuste de usuario)"
 
 #: plugin_scan_dialog.cc:43
 msgid "Scanning for plugins"
@@ -10947,15 +11287,15 @@ msgstr "Buscando plugins"
 
 #: plugin_scan_dialog.cc:44
 msgid "Stop Timeout"
-msgstr ""
+msgstr "Detener tiempo de espera"
 
 #: plugin_scan_dialog.cc:45
 msgid "Cancel Plugin Scan"
-msgstr ""
+msgstr "Cancelar escaneo de plugins"
 
 #: plugin_scan_dialog.cc:66
 msgid "Scan Timeout"
-msgstr ""
+msgstr "Tiempo de espera de escaneo"
 
 #: plugin_setup_dialog.cc:32
 msgid "Plugin Setup"
@@ -10963,27 +11303,27 @@ msgstr "Configuración de plugin"
 
 #: plugin_setup_dialog.cc:35
 msgid "Copy I/O Map"
-msgstr ""
+msgstr "Copiar mapa de E/S"
 
 #: plugin_setup_dialog.cc:36
 msgid "Fan out"
-msgstr ""
+msgstr "Ventilar"
 
 #: plugin_setup_dialog.cc:53
 msgid "An Instrument plugin is already present."
-msgstr ""
+msgstr "Ya está presente un plugin de instrumento."
 
 #: plugin_setup_dialog.cc:63
 msgid "with"
-msgstr ""
+msgstr "con"
 
 #: plugin_setup_dialog.cc:73
 msgid "I/O Pin Mapping"
-msgstr ""
+msgstr "Mapeo de pines de E/S"
 
 #: plugin_setup_dialog.cc:82
 msgid "Configure Plugin '%1'"
-msgstr ""
+msgstr "Configurar Plugin '%1'"
 
 #: plugin_setup_dialog.cc:94
 msgid "Output Configuration"
@@ -10991,7 +11331,7 @@ msgstr "Configuración de salida"
 
 #: plugin_selector.cc:69
 msgid "Plugin Manager"
-msgstr "Administrador de plugins"
+msgstr "Administrador de Plugins"
 
 #: plugin_selector.cc:96
 msgid "Fav"
@@ -11008,11 +11348,11 @@ msgstr "Tipo"
 
 #: plugin_selector.cc:102
 msgid "Audio I/O"
-msgstr ""
+msgstr "E/S de Audio"
 
 #: plugin_selector.cc:103
 msgid "MIDI I/O"
-msgstr ""
+msgstr "E/S de MIDI"
 
 #: plugin_selector.cc:134
 msgid "Plugins to be connected"
@@ -11028,15 +11368,15 @@ msgstr "Eliminar plugin de la lista de efectos"
 
 #: plugin_selector.cc:173
 msgid "Ignore Filters when searching"
-msgstr ""
+msgstr "Ignorar filtros al buscar"
 
 #: plugin_selector.cc:178
 msgid "All search terms must be matched."
-msgstr ""
+msgstr "Todos los términos de búsqueda deben coincidir."
 
 #: plugin_selector.cc:181
 msgid "Ex: \"ess dyn\" will find \"dynamic de-esser\" but not \"de-esser\"."
-msgstr ""
+msgstr "Ej.: \"ess dyn\" encontrará \"dynamic de-esser\" pero no \"de-esser\"."
 
 #: plugin_selector.cc:197 sfdb_ui.cc:630 sfdb_ui.cc:632
 msgid "Search"
@@ -11044,47 +11384,49 @@ msgstr "Buscar"
 
 #: plugin_selector.cc:209
 msgid "Show Effects Only"
-msgstr ""
+msgstr "Mostrar solo efectos"
 
 #: plugin_selector.cc:210
 msgid "Show Instruments Only"
-msgstr ""
+msgstr "Mostrar solo instrumentos"
 
 #: plugin_selector.cc:211
 msgid "Show Utilities Only"
-msgstr ""
+msgstr "Mostrar solo utilidades"
 
 #: plugin_selector.cc:212
 msgid "Show Favorites Only"
-msgstr ""
+msgstr "Mostrar solo favoritos"
 
 #: plugin_selector.cc:213
 msgid "Show Hidden Only"
-msgstr ""
+msgstr "Mostrar solo ocultos"
 
 #: plugin_selector.cc:217 plugin_selector.cc:227
 msgid "Show All Formats"
-msgstr ""
+msgstr "Mostrar todos los formatos"
 
 #: plugin_selector.cc:248
 msgid "Filter"
-msgstr ""
+msgstr "Filtrar"
 
 #: plugin_selector.cc:275
 msgid "Enter space-separated, one-word Tags for the selected plugin."
 msgstr ""
+"Introduzca etiquetas de una palabra separadas por espacios para el plugin "
+"seleccionado."
 
 #: plugin_selector.cc:278
 msgid "You can include dashes, colons or underscores in a Tag."
-msgstr ""
+msgstr "Puedes incluir guiones, dos puntos o guiones bajos en una etiqueta."
 
 #: plugin_selector.cc:281
 msgid "Ex: \"dynamic de-esser vocal\" applies 3 Tags."
-msgstr ""
+msgstr "Ej.: \"dynamic de-esser vocal\" aplica 3 etiquetas."
 
 #: plugin_selector.cc:292
 msgid "Tags for Selected Plugin"
-msgstr ""
+msgstr "Etiquetas para el Plugin Seleccionado"
 
 #: plugin_selector.cc:330
 msgid "Insert Plugin(s)"
@@ -11092,7 +11434,7 @@ msgstr "Insertar plugin/s"
 
 #: plugin_selector.cc:473 plugin_selector.cc:1072 plugin_selector.cc:1073
 msgid "Show All Creators"
-msgstr ""
+msgstr "Mostrar todos los autores"
 
 #: plugin_selector.cc:795
 msgid ""
@@ -11118,7 +11460,7 @@ msgstr "Por autor"
 
 #: plugin_selector.cc:1014
 msgid "By Tags"
-msgstr ""
+msgstr "Por etiqueta"
 
 #: plugin_ui.cc:132
 msgid "Eh? LADSPA plugins don't have editors!"
@@ -11149,10 +11491,12 @@ msgid ""
 "unknown type of editor-supplying plugin (note: no MacVST support in this "
 "version of %1)"
 msgstr ""
+"Tipo desconocido de plugin que suministra el editor (nota: no hay soporte "
+"para MacVST en esta versión de %1)"
 
 #: plugin_ui.cc:378
 msgid "create_lv2_editor called on non-LV2 plugin"
-msgstr ""
+msgstr "create_lv2_editor llamado en un plugin que no es LV2"
 
 #: plugin_ui.cc:466 transport_masters_dialog.cc:757
 msgid "Add"
@@ -11160,11 +11504,11 @@ msgstr "Añadir"
 
 #: plugin_ui.cc:469
 msgid "Preset Browser"
-msgstr ""
+msgstr "Navegador de Presets"
 
 #: plugin_ui.cc:472
 msgid "Pinout"
-msgstr ""
+msgstr "Asignación de pines"
 
 #: plugin_ui.cc:474
 msgid "Plugin analysis"
@@ -11172,46 +11516,50 @@ msgstr "Análisis de plugin"
 
 #: plugin_ui.cc:475
 msgid "CPU Profile"
-msgstr ""
+msgstr "Perfil de CPU"
 
 #: plugin_ui.cc:485
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
+"Preajustes (si los hay) para este plugin\n"
+"(Tanto de fábrica como creados por el usuario)"
 
 #: plugin_ui.cc:486
 msgid "Save a new preset"
-msgstr "Guadar un preset nuevo"
+msgstr "Guadar un preajuste nuevo"
 
 #: plugin_ui.cc:487
 msgid "Save the current preset"
-msgstr ""
+msgstr "Guardar el preajuste actualGuardar el preajuste actual"
 
 #: plugin_ui.cc:488
 msgid "Delete the current preset"
-msgstr ""
+msgstr "Borrar el preajuste actual"
 
 #: plugin_ui.cc:489
 msgid "Show Preset Browser Dialog"
-msgstr ""
+msgstr "Mostrar diálogo del navegador de preajustes"
 
 #: plugin_ui.cc:490
 msgid ""
 "Reset parameters to default (if no parameters are in automation play mode)"
 msgstr ""
+"Restablecer parámetros a valores predeterminados (si no hay parámetros en "
+"modo de reproducción de automatización)"
 
 #: plugin_ui.cc:491
 msgid "Show Plugin Pin Management Dialog"
-msgstr ""
+msgstr "Mostrar diálogo de gestión de pines del plugin"
 
 #: plugin_ui.cc:492
 msgid "Disable signal processing by the plugin"
-msgstr ""
+msgstr "Desactivar el procesamiento de señal por el plugin"
 
 #: plugin_ui.cc:493
 msgid "Edit Plugin Delay/Latency Compensation"
-msgstr ""
+msgstr "Editar Compensación de Retardo/Latencia del Plugin"
 
 #: plugin_ui.cc:548 plugin_ui.cc:764
 msgid ""
@@ -11231,11 +11579,11 @@ msgstr "Editar latencia"
 
 #: plugin_ui.cc:650
 msgid "New Preset"
-msgstr "Nuevo preset"
+msgstr "Nuevo preajuste"
 
 #: plugin_ui.cc:721
 msgid "Select Preset"
-msgstr ""
+msgstr "Seleccionar preajuste"
 
 #: plugin_ui.cc:771
 msgid "Click to allow normal use of %1 keyboard shortcuts"
@@ -11248,43 +11596,43 @@ msgstr "(ninguno)"
 #: plugin_dspload_ui.cc:43 plugin_dspload_ui.cc:86 plugin_dspload_ui.cc:87
 #: plugin_dspload_ui.cc:88 plugin_dspload_ui.cc:89 plugin_dspload_ui.cc:90
 msgid "%1 [ms]"
-msgstr ""
+msgstr "%1 [ms]"
 
 #: plugin_dspload_ui.cc:46
 msgid "Minimum"
-msgstr ""
+msgstr "Minimo"
 
 #: plugin_dspload_ui.cc:48
 msgid "Maximum"
-msgstr ""
+msgstr "Maximo"
 
 #: plugin_dspload_ui.cc:50
 msgid "Average"
-msgstr ""
+msgstr "Promedio"
 
 #: plugin_dspload_ui.cc:52
 msgid "Std.Dev"
-msgstr ""
+msgstr "Desv. est"
 
 #: plugin_dspload_ui.cc:217
 msgid "[ms]"
-msgstr ""
+msgstr "[ms]"
 
 #: plugin_dspload_window.cc:35
 msgid "Reset All Stats"
-msgstr ""
+msgstr "Restablecer todas las estadísticas"
 
 #: plugin_dspload_window.cc:36
 msgid "Sort by Average Load"
-msgstr ""
+msgstr "Ordenar por carga promedio"
 
 #: plugin_dspload_window.cc:37
 msgid "Sort by Worst-Case Load"
-msgstr ""
+msgstr "Ordenar por carga máxima"
 
 #: plugin_dspload_window.cc:187
 msgid "No Plugins"
-msgstr ""
+msgstr "Sin Plugins"
 
 #: port_group.cc:347
 msgid "%1 Busses"
@@ -11296,7 +11644,7 @@ msgstr "Pistas %1"
 
 #: port_group.cc:349
 msgid "%1 Sidechains"
-msgstr ""
+msgstr "Sidechains %1"
 
 #: port_group.cc:350
 msgid "Hardware"
@@ -11312,11 +11660,11 @@ msgstr "Otro"
 
 #: port_group.cc:462 port_group.cc:463
 msgid "LTC Out"
-msgstr ""
+msgstr "Salida LTC"
 
 #: port_group.cc:516
 msgid "Virtual MIDI"
-msgstr ""
+msgstr "MIDI Virtual"
 
 #: port_group.cc:543
 msgid "MMC in"
@@ -11336,7 +11684,7 @@ msgstr "Salida MMC"
 
 #: port_group.cc:646
 msgid "Scene "
-msgstr ""
+msgstr "Escena "
 
 #: port_insert_ui.cc:43
 msgid "Measure Latency"
@@ -11356,7 +11704,7 @@ msgstr "No se ha detectado señal"
 
 #: port_insert_ui.cc:169
 msgid "Port Insert "
-msgstr "Inserción puerto"
+msgstr "Inserción de puerto "
 
 #: port_matrix.cc:353 port_matrix.cc:379
 msgid "<b>Sources</b>"
@@ -11395,23 +11743,23 @@ msgstr "Mostrar puertos individuales"
 
 #: port_matrix.cc:557
 msgid "Flip"
-msgstr ""
+msgstr "Voltear"
 
 #: port_matrix.cc:744
 msgid "It is not possible to add a port here."
-msgstr ""
+msgstr "No es posible agregar un puerto aquí."
 
 #: port_matrix.cc:745
 msgid "Cannot add port"
-msgstr ""
+msgstr "No se puede agregar puerto"
 
 #: port_matrix.cc:769
 msgid "The last port cannot be removed"
-msgstr ""
+msgstr "No se puede eliminar el último puerto"
 
 #: port_matrix.cc:772
 msgid "This port cannot be removed."
-msgstr ""
+msgstr "No se puede eliminar este puerto."
 
 #: port_matrix.cc:777
 msgid "Port removal not allowed"
@@ -11441,23 +11789,27 @@ msgstr "No hay %1 puertos para conectar."
 
 #: processor_box.cc:246
 msgid "Return"
-msgstr ""
+msgstr "Volver"
 
 #: processor_box.cc:347
 msgid "New Favorite Preset for \"%1\""
-msgstr ""
+msgstr "Nuevo Preset Favorito para \"%1\""
 
 #: processor_box.cc:539 processor_box.cc:1660
 msgid ""
 "\n"
 "%1+double-click to toggle inline-display"
 msgstr ""
+"\n"
+"%1+doble clic para alternar la visualización en línea"
 
 #: processor_box.cc:543
 msgid ""
 "\n"
 "This plugin has been replicated %1 times."
 msgstr ""
+"\n"
+"Este plugin se ha replicado %1 veces."
 
 #: processor_box.cc:548 processor_box.cc:1664
 msgid ""
@@ -11465,12 +11817,17 @@ msgid ""
 "Double-click to show GUI.\n"
 "%2+double-click to show generic GUI.%3"
 msgstr ""
+"<b>%1</b>\n"
+"Doble clic para mostrar GUI.\n"
+"%2+doble clic para mostrar GUI genérica.%3"
 
 #: processor_box.cc:551 processor_box.cc:1667
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI.%2"
 msgstr ""
+"<b>%1</b>\n"
+"Doble clic para mostrar GUI genérica.%2"
 
 #: processor_box.cc:557
 msgid ""
@@ -11478,10 +11835,13 @@ msgid ""
 "The Plugin is not available on this system\n"
 "and has been replaced by a stub."
 msgstr ""
+"<b>%1</b>\n"
+"El plugin no está disponible en este sistema \n"
+"y ha sido reemplazado por un stub."
 
 #: processor_box.cc:783
 msgid "Inline Display"
-msgstr ""
+msgstr "Visualización en línea"
 
 #: processor_box.cc:796
 msgid "Show All Controls"
@@ -11493,7 +11853,7 @@ msgstr "Ocultar todos los controles"
 
 #: processor_box.cc:850
 msgid "Allow Feedback Loop"
-msgstr ""
+msgstr "Permitir bucle de realimentación"
 
 #: processor_box.cc:1865
 msgid ""
@@ -11586,10 +11946,12 @@ msgstr "Renombrar procesador"
 #: processor_box.cc:3414
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
+"Existen al menos 100 objetos de E/S con un nombre como %1 - nombre no "
+"cambiado"
 
 #: processor_box.cc:3578
 msgid "plugin insert constructor failed"
-msgstr ""
+msgstr "Error al construir el inserto de plugin"
 
 #: processor_box.cc:3589
 msgid ""
@@ -11652,15 +12014,15 @@ msgstr "Nuevo envío auxiliar..."
 
 #: processor_box.cc:3871
 msgid "New Foldback Send ..."
-msgstr ""
+msgstr "Nuevo envío de retorno ..."
 
 #: processor_box.cc:3872
 msgid "Remove Foldback Send ..."
-msgstr ""
+msgstr "Eliminar envío de retorno ..."
 
 #: processor_box.cc:3875
 msgid "Send Options"
-msgstr ""
+msgstr "Opciones de envío"
 
 #: processor_box.cc:3877
 msgid "Clear (all)"
@@ -11690,19 +12052,19 @@ msgstr "Plugins A/B"
 
 #: processor_box.cc:3923
 msgid "Disk I/O ..."
-msgstr ""
+msgstr "E/S de disco ..."
 
 #: processor_box.cc:3924
 msgid "Pre-Fader"
-msgstr ""
+msgstr "Pre-Fader"
 
 #: processor_box.cc:3925
 msgid "Post-Fader"
-msgstr ""
+msgstr "Post-Fader"
 
 #: processor_box.cc:3934
 msgid "Edit with generic controls..."
-msgstr ""
+msgstr "Editar con controles genéricos..."
 
 #: processor_box.cc:4288
 msgid "%1: %2 (by %3)"
@@ -11710,7 +12072,7 @@ msgstr "%1: %2 (a %3)"
 
 #: processor_box.cc:4290
 msgid "%1 (by %2)"
-msgstr ""
+msgstr "%1 (por %2)"
 
 #: patch_change_dialog.cc:52
 msgid "Patch Change"
@@ -11732,19 +12094,19 @@ msgstr "Programa"
 
 #: patch_change_dialog.cc:110
 msgid "Bank MSB"
-msgstr ""
+msgstr "Banco MSB"
 
 #: patch_change_dialog.cc:115
 msgid "Bank LSB"
-msgstr ""
+msgstr "Banco LSB"
 
 #: pt_import_selector.cc:41
 msgid "Import PT Session"
-msgstr "Importar sesión PT"
+msgstr "Importar sesión de PT"
 
 #: pt_import_selector.cc:69
 msgid "All PT sessions"
-msgstr ""
+msgstr "Todas las sesiones de PT"
 
 #: pt_import_selector.cc:131
 msgid ""
@@ -11762,6 +12124,18 @@ msgid ""
 "%7 active midi regions\n"
 "\n"
 msgstr ""
+"Sesión PT [V�LIDA]\n"
+"\n"
+"Información de la sesión:\n"
+"\n"
+"PT v%1 Sesión a %2Hz\n"
+"\n"
+"%3 archivos de audio\n"
+"%4 regiones de audio\n"
+"%5 regiones de audio activas\n"
+"%6 regiones MIDI\n"
+"%7 regiones MIDI activas\n"
+"\n"
 
 #: pt_import_selector.cc:141
 msgid ""
@@ -11770,10 +12144,14 @@ msgid ""
 "Sample rate mismatch,\n"
 "will be resampling\n"
 msgstr ""
+"%1ADVERTENCIA:\n"
+"\n"
+"Desajuste de frecuencia de muestreo,\n"
+"se volverá a muestrear\n"
 
 #: quantize_dialog.cc:39
 msgid "Main Grid"
-msgstr ""
+msgstr "Cuadrícula principal"
 
 #: quantize_dialog.cc:78
 msgid "Strength"
@@ -11801,31 +12179,31 @@ msgstr "Explorar..."
 
 #: rc_option_editor.cc:102
 msgid "Emphasis on first beat"
-msgstr ""
+msgstr "Énfasis en el primer tiempo"
 
 #: rc_option_editor.cc:109
 msgid "Use built-in default sounds"
-msgstr ""
+msgstr "Usar sonidos predeterminados integrados"
 
 #: rc_option_editor.cc:116
 msgid "Audio file:"
-msgstr ""
+msgstr "Archivo de audio:"
 
 #: rc_option_editor.cc:124
 msgid "Emphasis audio file:"
-msgstr ""
+msgstr "Archivo de audio de énfasis:"
 
 #: rc_option_editor.cc:134
 msgid "Gain level"
-msgstr ""
+msgstr "Nivel de ganancia"
 
 #: rc_option_editor.cc:181
 msgid "Choose Click"
-msgstr "Elige claqueta"
+msgstr "Elige Click"
 
 #: rc_option_editor.cc:204
 msgid "Choose Click Emphasis"
-msgstr "Elige claqueta acentuada"
+msgstr "Elige click acentuado"
 
 #: rc_option_editor.cc:266
 msgid "Limit undo history to"
@@ -11844,10 +12222,13 @@ msgid ""
 "\n"
 "Changes to this setting will only persist after your project has been saved."
 msgstr ""
+"\n"
+"Los cambios a esta configuración solo se mantendrán después de que su "
+"proyecto haya sido guardado."
 
 #: rc_option_editor.cc:436 rc_option_editor.cc:491
 msgid "<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"
-msgstr ""
+msgstr "<b>Recomendación: %1 + botón 3 (botón derecho del ratón)</b>%2"
 
 #: rc_option_editor.cc:443
 msgid "Select Keyboard layout:"
@@ -11871,7 +12252,7 @@ msgstr "Eliminar usando:"
 
 #: rc_option_editor.cc:514
 msgid "<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%2"
-msgstr ""
+msgstr "<b>Recomendación: %1 + botón 1 (botón izquierdo del ratón)</b>%2"
 
 #: rc_option_editor.cc:516
 msgid "Insert note using:"
@@ -11894,7 +12275,7 @@ msgstr "Copiar elementos usando:"
 
 #: rc_option_editor.cc:574
 msgid "Constrain drag using:"
-msgstr ""
+msgstr "Restringir arrastre usando:"
 
 #: rc_option_editor.cc:591
 msgid "Push points using:"
@@ -11946,43 +12327,48 @@ msgstr "Ajuste fino usando:"
 
 #: rc_option_editor.cc:765
 msgid "Reset to recommended defaults"
-msgstr ""
+msgstr "Restablecer a valores predeterminados recomendados"
 
 #: rc_option_editor.cc:1104
 msgid "GUI and Font scaling"
-msgstr ""
+msgstr "Escala de interfáz gráfica y fuente"
 
 #: rc_option_editor.cc:1127
 msgid ""
 "Adjusting the scale requires an application restart for fully accurate re-"
 "layout."
 msgstr ""
+"El ajuste de la escala requiere un reinicio de la aplicación para un "
+"rediseño completamente preciso."
 
 #: rc_option_editor.cc:1142
 msgid "Scan Time Out"
-msgstr ""
+msgstr "Tiempo de espera de escaneo"
 
 #: rc_option_editor.cc:1150
 msgid "∞"
-msgstr ""
+msgstr "∞"
 
 #: rc_option_editor.cc:1154
 msgid "3 mins"
-msgstr ""
+msgstr "3 mins"
 
 #: rc_option_editor.cc:1155
 msgid "4 mins"
-msgstr ""
+msgstr "4 mins"
 
 #: rc_option_editor.cc:1159
 msgid ""
 "Specify the default timeout for plugin instantiation. Plugins that require "
 "more time to load will be blacklisted. A value of 0 disables the timeout."
 msgstr ""
+"Especificar el tiempo de espera predeterminado para la creación de "
+"instancias de plugins. Los plugins que requieran más tiempo de carga serán "
+"incluidos en la lista negra. Un valor de 0 desactiva el tiempo de espera."
 
 #: rc_option_editor.cc:1168
 msgid "Waveform Clip Level (dBFS):"
-msgstr ""
+msgstr "Nivel de recorte de forma de onda (dBFS):"
 
 #: rc_option_editor.cc:1199 export_video_dialog.cc:172
 msgid "Preset:"
@@ -11990,11 +12376,11 @@ msgstr "Preset:"
 
 #: rc_option_editor.cc:1200
 msgid "Playback (seconds of buffering)"
-msgstr ""
+msgstr "Reproducción (segundos de almacenamiento en búfer)"
 
 #: rc_option_editor.cc:1204
 msgid "Recording (seconds of buffering)"
-msgstr ""
+msgstr "Grabación (segundos de almacenamiento en búfer)"
 
 #: rc_option_editor.cc:1213
 msgid "Small sessions (4-16 tracks)"
@@ -12002,41 +12388,45 @@ msgstr "Sesiones pequeñas (4-16 pistas)"
 
 #: rc_option_editor.cc:1214
 msgid "Medium sessions (16-64 tracks)"
-msgstr ""
+msgstr "Sesiones medianas (16-64 pistas)"
 
 #: rc_option_editor.cc:1215
 msgid "Large sessions (64+ tracks)"
-msgstr ""
+msgstr "Sesiones grandes (64+ pistas)"
 
 #: rc_option_editor.cc:1216
 msgid "Custom (set by sliders below)"
 msgstr ""
+"Personalizado (establecido por los controles deslizantes a continuación)"
 
 #: rc_option_editor.cc:1294
 msgid "programming error: unknown buffering preset string, index = %1"
 msgstr ""
+"Error de programación: cadena de preajuste de búfer desconocida, índice = %1"
 
 #: rc_option_editor.cc:1312
 msgid "LTC Output Port:"
-msgstr ""
+msgstr "Puerto de salida LTC:"
 
 #: rc_option_editor.cc:1319
 msgid ""
 "The LTC generator output will be auto-connected to this port when a session "
 "is loaded."
 msgstr ""
+"La salida del generador LTC se conectará automáticamente a este puerto "
+"cuando se cargue una sesión."
 
 #: rc_option_editor.cc:1495
 msgid "Enable"
-msgstr ""
+msgstr "Habilitar"
 
 #: rc_option_editor.cc:1496
 msgid "Control Surface Protocol"
-msgstr ""
+msgstr "Protocolo de superficie de control"
 
 #: rc_option_editor.cc:1505
 msgid "Edit the settings for selected protocol (it must be ENABLED first):"
-msgstr ""
+msgstr "Edit the settings for selected protocol (it must be ENABLED first):"
 
 #: rc_option_editor.cc:1509
 msgid "Show Protocol Settings"
@@ -12044,11 +12434,11 @@ msgstr "Mostrar ajustes de protocolo"
 
 #: rc_option_editor.cc:1634
 msgid "Configuration"
-msgstr "Configuración:"
+msgstr "Configuración"
 
 #: rc_option_editor.cc:1641
 msgid "Control Protocol Settings"
-msgstr ""
+msgstr "Configuración del protocolo de control"
 
 #: rc_option_editor.cc:1685
 msgid "Show Video Export Info before export"
@@ -12067,18 +12457,25 @@ msgid ""
 "<b>When enabled</b> an information window with details is displayed before "
 "the video-export dialog."
 msgstr ""
+"<b>Cuando está habilitado</b> se muestra una ventana de información con "
+"detalles antes del diálogo de exportación de video."
 
 #: rc_option_editor.cc:1702
 msgid ""
 "<b>When enabled</b> the video server is never launched automatically without "
 "confirmation"
 msgstr ""
+"<b>Cuando está habilitado</b> el servidor de video nunca se inicia "
+"automáticamente sin confirmación"
 
 #: rc_option_editor.cc:1708
 msgid ""
 "<b>When enabled</b> you can specify a custom video-server URL and docroot. - "
 "Do not enable this option unless you know what you are doing."
 msgstr ""
+"<b>Cuando está habilitado</b> puede especificar una URL de servidor de video "
+"personalizada y una raíz de documentos. - No habilite esta opción a menos "
+"que sepa lo que está haciendo."
 
 #: rc_option_editor.cc:1711
 msgid "Video Server URL:"
@@ -12090,6 +12487,9 @@ msgid ""
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
 "the video-server is running locally"
 msgstr ""
+"URL base del servidor de vídeo incluyendo el prefijo http. Esta es "
+"usualmente 'http://hostname.example.org:1554/' y por defecto es 'http://"
+"localhost:1554/' cuando el servidor de vídeo se está ejecutando localmente"
 
 #: rc_option_editor.cc:1719
 msgid "Video Folder:"
@@ -12103,64 +12503,81 @@ msgid ""
 "docroot or be left empty if it is unavailable. It is used for the local "
 "video-monitor and file-browsing when opening/adding a video file."
 msgstr ""
+"Ruta local a la raíz de documentos del servidor de vídeo. Solo los archivos "
+"debajo de este directorio serán accesibles por el servidor de vídeo. Si el "
+"servidor se ejecuta en un host remoto, debe apuntar a una carpeta montada en "
+"red de la raíz de documentos del servidor o dejarse vacía si no está "
+"disponible. Se utiliza para el monitor de vídeo local y la exploración de "
+"archivos al abrir/añadir un archivo de vídeo."
 
 #: rc_option_editor.cc:1737
 msgid "Custom Path to Video Monitor (%1) - leave empty for default:"
 msgstr ""
+"Ruta personalizada al monitor de vídeo (%1) - deje vacío para el valor "
+"predeterminado:"
 
 #: rc_option_editor.cc:1751
 msgid ""
 "Set a custom path to the Video Monitor Executable, changing this requires a "
 "restart."
 msgstr ""
+"Establecer una ruta personalizada al ejecutable del Monitor de Vídeo, "
+"cambiar esto requiere un reinicio."
 
 #: rc_option_editor.cc:1797
 msgid "Set Video Monitor Executable"
-msgstr ""
+msgstr "Establecer ejecutable del Monitor de Vídeo"
 
 #: rc_option_editor.cc:1870
 msgid "Column %1 (Actions %2 + %3)"
-msgstr ""
+msgstr "Columna %1 (Acciones %2 + %3)"
 
 #: rc_option_editor.cc:1994
 msgid "MIDI Inputs"
-msgstr ""
+msgstr "Entradas MIDI"
 
 #: rc_option_editor.cc:2005
 msgid "MIDI Outputs"
-msgstr ""
+msgstr "Salidas MIDI"
 
 #: rc_option_editor.cc:2114
 msgid "Name (click twice to edit)"
-msgstr ""
+msgstr "Nombre (haz doble clic para editar)"
 
 #: rc_option_editor.cc:2118
 msgid "Music Data"
-msgstr ""
+msgstr "Datos Musicales"
 
 #: rc_option_editor.cc:2119
 msgid ""
 "If ticked, %1 will consider this port to be a source of music performance "
 "data."
 msgstr ""
+"Si está marcada, %1 considerará que este puerto es una fuente de datos de "
+"interpretación musical."
 
 #: rc_option_editor.cc:2126
 msgid "Control Data"
-msgstr ""
+msgstr "Datos de Control"
 
 #: rc_option_editor.cc:2127
 msgid "If ticked, %1 will consider this port to be a source of control data."
 msgstr ""
+"Si está marcada, %1 considerará que este puerto es una fuente de datos de "
+"control."
 
 #: rc_option_editor.cc:2133 rc_option_editor.cc:2135
 msgid "Follow Selection"
-msgstr ""
+msgstr "Seguir Selección"
 
 #: rc_option_editor.cc:2136
 msgid ""
 "If ticked, and \"MIDI input follows selection\" is enabled,\n"
 "%1 will automatically connect the first selected MIDI track to this port.\n"
 msgstr ""
+"Si está marcada, y \"Entrada MIDI sigue selección\" está habilitada,\n"
+"%1 conectará automáticamente la primera pista MIDI seleccionada a este "
+"puerto.\n"
 
 #: rc_option_editor.cc:2288
 msgid "%1 Preferences"
@@ -12168,7 +12585,7 @@ msgstr "Preferencias de %1"
 
 #: rc_option_editor.cc:2290
 msgid "preferences"
-msgstr ""
+msgstr "preferencias"
 
 #: rc_option_editor.cc:2302 rc_option_editor.cc:2320 rc_option_editor.cc:2324
 #: rc_option_editor.cc:2336 rc_option_editor.cc:2338 rc_option_editor.cc:2340
@@ -12199,8 +12616,8 @@ msgstr "todos los procesadores disponibles"
 #: rc_option_editor.cc:2315
 msgid "%1 processor"
 msgid_plural "%1 processors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "procesador %1"
+msgstr[1] "procesadores %1"
 
 #: rc_option_editor.cc:2318
 msgid "This setting will only take effect when %1 is restarted."
@@ -12208,25 +12625,27 @@ msgstr "Esta configuración sólo tendrá efecto después de reiniciar %1."
 
 #: rc_option_editor.cc:2324
 msgid "Memory Usage"
-msgstr ""
+msgstr "Uso de Memoria"
 
 #: rc_option_editor.cc:2327
 msgid "Waveform image cache size (megabytes)"
-msgstr ""
+msgstr "Tamaño de la caché de imágenes de forma de onda (megabytes)"
 
 #: rc_option_editor.cc:2335
 msgid ""
 "Increasing the cache size uses more memory to store waveform images, which "
 "can improve graphical performance."
 msgstr ""
+"Aumentar el tamaño de la caché utiliza más memoria para almacenar imágenes "
+"de forma de onda, lo que puede mejorar el rendimiento gráfico."
 
 #: rc_option_editor.cc:2338
 msgid "Engine"
-msgstr ""
+msgstr "Motor"
 
 #: rc_option_editor.cc:2343
 msgid "Try to auto-launch audio/midi engine"
-msgstr ""
+msgstr "Intentar iniciar automáticamente el motor de audio/MIDI"
 
 #: rc_option_editor.cc:2353
 msgid "Thinning factor (larger value => less data)"
@@ -12238,7 +12657,7 @@ msgstr "Intervalo de sampleado de automatización (milisegundos)"
 
 #: rc_option_editor.cc:2372
 msgid "Allow non quarter-note pulse"
-msgstr ""
+msgstr "Permitir pulso que no sea de nota negra"
 
 #: rc_option_editor.cc:2377
 msgid ""
@@ -12247,44 +12666,50 @@ msgid ""
 "<b>When disabled</b> %1 will only allow tempo to be expressed in quarter "
 "notes per minute"
 msgstr ""
+"<b>Cuando está habilitado</b> %1 permitirá que el tempo se exprese en "
+"divisiones por minuto\n"
+"<b>Cuando está deshabilitado</b> %1 solo permitirá que el tempo se exprese "
+"en negras por minuto"
 
 #: rc_option_editor.cc:2383
 msgid "GUI Lock"
-msgstr ""
+msgstr "Bloqueo de Interfaz gráfica"
 
 #: rc_option_editor.cc:2387
 msgid "Lock timeout (seconds)"
-msgstr ""
+msgstr "Tiempo de espera de bloqueo (segundos)"
 
 #: rc_option_editor.cc:2395
 msgid "Lock GUI after this many idle seconds (zero to never lock)"
 msgstr ""
+"Bloquear interfaz gráfica después de tantos segundos de inactividad (cero "
+"para nunca bloquear)"
 
 #: rc_option_editor.cc:2400
 msgid "System Screensaver Mode"
-msgstr ""
+msgstr "Modo de protector de pantalla del sistema"
 
 #: rc_option_editor.cc:2405
 msgid "Never Inhibit"
-msgstr ""
+msgstr "Nunca inhibir"
 
 #: rc_option_editor.cc:2406
 msgid "Inhibit while Recording"
-msgstr ""
+msgstr "Inhibir durante la grabación"
 
 #: rc_option_editor.cc:2407
 msgid "Inhibit while %1 is running"
-msgstr ""
+msgstr "Inhibir mientras %1 está funcionando"
 
 #: rc_option_editor.cc:2414 rc_option_editor.cc:2416 rc_option_editor.cc:2418
 #: rc_option_editor.cc:2426 rc_option_editor.cc:2428 rc_option_editor.cc:2436
 #: rc_option_editor.cc:2444 rc_option_editor.cc:2451
 msgid "General/Session"
-msgstr ""
+msgstr "General/Sesión"
 
 #: rc_option_editor.cc:2414
 msgid "Options|Undo"
-msgstr "Opciones de deshacer"
+msgstr "Deshacer"
 
 #: rc_option_editor.cc:2421
 msgid "Verify removal of last capture"
@@ -12301,6 +12726,7 @@ msgstr "Hacer copias de seguridad periódicas del archivo de sesión"
 #: rc_option_editor.cc:2439
 msgid "Drag and drop import always copies files to session"
 msgstr ""
+"La importación por arrastrar y soltar siempre copia archivos a la sesión"
 
 #: rc_option_editor.cc:2446
 msgid "Default folder for new sessions:"
@@ -12312,25 +12738,27 @@ msgstr "Número máximo de sesiones recientes"
 
 #: rc_option_editor.cc:2463 rc_option_editor.cc:2474
 msgid "General/Translation"
-msgstr ""
+msgstr "General/Traducción"
 
 #: rc_option_editor.cc:2463
 msgid "Internationalization"
-msgstr ""
+msgstr "Internacionalización"
 
 #: rc_option_editor.cc:2467
 msgid "Use translations"
-msgstr ""
+msgstr "Usar traducciones"
 
 #: rc_option_editor.cc:2472
 msgid ""
 "These settings will only take effect after %1 is restarted (if available for "
 "your language preferences)."
 msgstr ""
+"Estos ajustes solo tendrán efecto después de reiniciar %1 (si está "
+"disponible para sus preferencias de idioma)."
 
 #: rc_option_editor.cc:2486
 msgid "Prompt for new marker names"
-msgstr ""
+msgstr "Solicitar nombres nuevos para los marcadores"
 
 #: rc_option_editor.cc:2491
 msgid ""
@@ -12348,62 +12776,66 @@ msgstr ""
 #: rc_option_editor.cc:2496
 msgid "Auto-scroll speed when dragging playhead (%)"
 msgstr ""
+"Velocidad de desplazamiento automático al arrastrar el cabezal de "
+"reproducción (%)"
 
 #: rc_option_editor.cc:2500
 msgid "5%"
-msgstr ""
+msgstr "5%"
 
 #: rc_option_editor.cc:2501
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
 #: rc_option_editor.cc:2502
 msgid "25%"
-msgstr ""
+msgstr "25%"
 
 #: rc_option_editor.cc:2503
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #: rc_option_editor.cc:2509
 msgid "Limit zooming & summary view to X minutes beyond session extents"
 msgstr ""
+"Limitar el zoom y la vista de resumen a X minutos más allá de los límites de "
+"la sesión"
 
 #: rc_option_editor.cc:2513
 msgid "1 minute"
-msgstr ""
+msgstr "1 minuto"
 
 #: rc_option_editor.cc:2514
 msgid "2 minutes"
-msgstr ""
+msgstr "2 minutos"
 
 #: rc_option_editor.cc:2515
 msgid "20 minutes"
-msgstr ""
+msgstr "20 minutos"
 
 #: rc_option_editor.cc:2516
 msgid "1 hour"
-msgstr ""
+msgstr "1 hora"
 
 #: rc_option_editor.cc:2517
 msgid "2 hours"
-msgstr ""
+msgstr "2 horas"
 
 #: rc_option_editor.cc:2518
 msgid "24 hours"
-msgstr ""
+msgstr "24 horas"
 
 #: rc_option_editor.cc:2526
 msgid "Zoom to mouse position when zooming with scroll wheel"
-msgstr ""
+msgstr "Acercar a la posición del ratón al hacer zoom con la rueda del ratón"
 
 #: rc_option_editor.cc:2535
 msgid "Zoom with vertical drag in rulers"
-msgstr ""
+msgstr "Acercar con arrastre vertical en las reglas"
 
 #: rc_option_editor.cc:2543
 msgid "Double click zooms to selection"
-msgstr ""
+msgstr "Doble clic para acercar a la selección"
 
 #: rc_option_editor.cc:2551
 msgid "Update editor window during drags of the summary"
@@ -12438,12 +12870,17 @@ msgstr "Mover automatización relevante al desplazar regiones de audio"
 #: rc_option_editor.cc:2586
 msgid "Ignore Y-axis click position when adding new automation-points"
 msgstr ""
+"Ignorar la posición del clic en el eje Y al agregar nuevos puntos de "
+"automatización"
 
 #: rc_option_editor.cc:2592
 msgid ""
 "<b>When enabled</b> the new points drawn in any automation lane will be "
 "placed on the existing line, regardless of mouse y-axis position."
 msgstr ""
+"<b>Cuando está habilitado</b> los nuevos puntos dibujados en cualquier línea "
+"de automatización se colocarán en la línea existente, independientemente de "
+"la posición del eje y del ratón."
 
 #: rc_option_editor.cc:2596
 msgid "Default fade shape"
@@ -12459,7 +12896,7 @@ msgstr "cuando se solapan en el tiempo"
 
 #: rc_option_editor.cc:2620
 msgid "if either encloses the other"
-msgstr ""
+msgstr "Si uno encierra al otro"
 
 #: rc_option_editor.cc:2621
 msgid "only if they have identical length, position and origin"
@@ -12467,7 +12904,7 @@ msgstr "sólo si tienen la misma duración, posición y origen"
 
 #: rc_option_editor.cc:2622
 msgid "only if they have identical length, position and layer"
-msgstr ""
+msgstr "solo si tienen la misma duración, posición y capa"
 
 #: rc_option_editor.cc:2628
 msgid "Layering model"
@@ -12483,92 +12920,102 @@ msgstr "superposición manual"
 
 #: rc_option_editor.cc:2641
 msgid "After a Separate operation, in Range mode"
-msgstr ""
+msgstr "Después de una operación Separar, en modo de Rango"
 
 #: rc_option_editor.cc:2645
 msgid "Clear the Range Selection"
-msgstr ""
+msgstr "Limpiar la selección de rango"
 
 #: rc_option_editor.cc:2646
 msgid "Preserve the Range Selection"
-msgstr ""
+msgstr "Preservar la selección de rango"
 
 #: rc_option_editor.cc:2647
 msgid ""
 "Force-Select the regions under the range. (this might cause a tool change)"
 msgstr ""
+"Forzar la selección de las regiones bajo el rango. (esto puede causar un "
+"cambio de herramienta)"
 
 #: rc_option_editor.cc:2652
 msgid "After a Split operation, in Object mode"
-msgstr ""
+msgstr "Después de una operación Dividir, en modo Objeto"
 
 #: rc_option_editor.cc:2657
 msgid "Clear the Region Selection"
-msgstr ""
+msgstr "Limpiar la selección de región"
 
 #: rc_option_editor.cc:2658
 msgid "Select only the newly-created regions BEFORE the split point"
 msgstr ""
+"Seleccionar solo las regiones recién creadas ANTES del punto de división"
 
 #: rc_option_editor.cc:2659
 msgid "Select only the newly-created regions AFTER the split point"
 msgstr ""
+"Seleccionar solo las regiones recién creadas DESPUÉS del punto de división"
 
 #: rc_option_editor.cc:2660
 msgid "Select the newly-created regions"
-msgstr ""
+msgstr "Seleccionar las regiones recién creadas"
 
 #: rc_option_editor.cc:2664
 msgid "Preserve the existing selection, AND select all newly-created regions"
 msgstr ""
+"Preservar la selección existente Y seleccionar todas las regiones recién "
+"creadas"
 
 #: rc_option_editor.cc:2668
 msgid "General Snap options:"
-msgstr ""
+msgstr "Opciones generales de ajuste:"
 
 #: rc_option_editor.cc:2673
 msgid "Snap Threshold (pixels)"
-msgstr ""
+msgstr "Umbral de ajuste (píxeles)"
 
 #: rc_option_editor.cc:2683
 msgid "Show \"snapped cursor\""
-msgstr ""
+msgstr "Mostrar \"cursor ajustado\""
 
 #: rc_option_editor.cc:2691
 msgid "Snap rubberband selection to grid"
-msgstr ""
+msgstr "Ajustar la selección de banda elástica a la cuadrícula"
 
 #: rc_option_editor.cc:2699
 msgid "Grid switches to alternate selection for Internal Edit tools"
 msgstr ""
+"La cuadrícula cambia a la selección alternativa para las herramientas de "
+"edición interna"
 
 #: rc_option_editor.cc:2707
 msgid "Rulers automatically change to follow the Grid mode selection"
 msgstr ""
+"Las reglas cambian automáticamente para seguir la selección del modo de "
+"cuadrícula"
 
 #: rc_option_editor.cc:2712
 msgid "When \"Snap\" is enabled, snap to:"
-msgstr ""
+msgstr "Cuando \"Ajustar\" está habilitado, ajustar a:"
 
 #: rc_option_editor.cc:2726
 msgid "Region Sync Points"
-msgstr ""
+msgstr "Puntos de sincronización de región"
 
 #: rc_option_editor.cc:2734
 msgid "Region Starts"
-msgstr ""
+msgstr "Inicios de región"
 
 #: rc_option_editor.cc:2742
 msgid "Region Ends"
-msgstr ""
+msgstr "Finales de región"
 
 #: rc_option_editor.cc:2755 rc_option_editor.cc:2756 rc_option_editor.cc:2757
 msgid "Editor/Modifiers"
-msgstr ""
+msgstr "Editor/Modificadores"
 
 #: rc_option_editor.cc:2755
 msgid "Keyboard Modifiers"
-msgstr ""
+msgstr "Modificadores de teclado"
 
 #: rc_option_editor.cc:2766
 msgid "Solo controls are Listen controls"
@@ -12628,7 +13075,7 @@ msgstr "después de procesadores post-fader (antes de pan)"
 
 #: rc_option_editor.cc:2841
 msgid "Default Track / Bus Muting Options"
-msgstr ""
+msgstr "Opciones predeterminadas de silencio de pista/bus"
 
 #: rc_option_editor.cc:2846
 msgid "Mute affects pre-fader sends"
@@ -12660,7 +13107,7 @@ msgstr ""
 #: rc_option_editor.cc:2920 rc_option_editor.cc:2928 rc_option_editor.cc:2944
 #: rc_option_editor.cc:2957 rc_option_editor.cc:2966
 msgid "Signal Flow"
-msgstr ""
+msgstr "Flujo de señal"
 
 #: rc_option_editor.cc:2891
 msgid "Record monitoring handled by"
@@ -12668,7 +13115,7 @@ msgstr "Monitorización de la grabación manejado por"
 
 #: rc_option_editor.cc:2897
 msgid "via Audio Driver"
-msgstr ""
+msgstr "a través del controlador de audio"
 
 #: rc_option_editor.cc:2903
 msgid "audio hardware"
@@ -12676,21 +13123,26 @@ msgstr "hardware de audio"
 
 #: rc_option_editor.cc:2909
 msgid "Auto Input does 'talkback'"
-msgstr ""
+msgstr "Entrada automática hace 'talkback'"
 
 #: rc_option_editor.cc:2915
 msgid ""
 "<b>When enabled</b>, and Transport->Auto-Input is enabled, %1 will always "
 "monitor audio inputs when transport is stopped, even if tracks aren't armed."
 msgstr ""
+"<b>Cuando está habilitado</b>, y Transport->Entrada automática está "
+"habilitado, %1 siempre monitorizará las entradas de audio cuando el "
+"transporte esté detenido, incluso si las pistas no están armadas."
 
 #: rc_option_editor.cc:2920
 msgid "Track and Bus Connections"
-msgstr ""
+msgstr "Conexiones de Pista y Bus"
 
 #: rc_option_editor.cc:2924
 msgid "Auto-connect main output (master or monitor) bus to physical ports"
 msgstr ""
+"Conectar automáticamente el bus de salida principal (principal o monitor) a "
+"los puertos físicos"
 
 #: rc_option_editor.cc:2930
 msgid ""
@@ -12699,6 +13151,11 @@ msgid ""
 "is connected to the hardware playback ports, otherwise the master-bus output "
 "is directly used for playback."
 msgstr ""
+"<b>Cuando está habilitado</b>, el bus de salida principal se conecta "
+"automáticamente a los primeros N puertos físicos. Si la sesión tiene una "
+"sección de monitor, la salida del bus de monitor se conecta a los puertos de "
+"reproducción de hardware, de lo contrario, la salida del bus maestro se "
+"utiliza directamente para la reproducción."
 
 #: rc_option_editor.cc:2936
 msgid "Connect track inputs"
@@ -12726,19 +13183,19 @@ msgstr "automáticamente al bus master"
 
 #: rc_option_editor.cc:2961
 msgid "Use 'Strict-I/O' for new tracks or busses"
-msgstr ""
+msgstr "Usar 'E/S Estrictas' para nuevas pistas o buses"
 
 #: rc_option_editor.cc:2975
 msgid "Buffering"
-msgstr "Buffering"
+msgstr "Almacenamiento en búfer"
 
 #: rc_option_editor.cc:2979
 msgid "Denormals"
-msgstr "Denormals"
+msgstr "Subnormales"
 
 #: rc_option_editor.cc:2984
 msgid "Use DC bias to protect against denormals"
-msgstr "Usar DC bias para proteger contra denormals"
+msgstr "Usar polarización de CC para proteger contra subnormales"
 
 #: rc_option_editor.cc:2991
 msgid "Processor handling"
@@ -12763,6 +13220,7 @@ msgstr "usar FlushToZero y DenormalsAreZero"
 #: rc_option_editor.cc:3026
 msgid "Changes may not be effective until audio-engine restart."
 msgstr ""
+"Los cambios pueden no ser efectivos hasta que se reinicie el motor de audio."
 
 #: rc_option_editor.cc:3035
 msgid "Enable automatic analysis of audio"
@@ -12782,49 +13240,51 @@ msgstr "Las notas MIDI suenan al ser seleccionadas"
 
 #: rc_option_editor.cc:3075
 msgid "Virtual Keyboard Layout"
-msgstr ""
+msgstr "Diseño de teclado virtual"
 
 #: rc_option_editor.cc:3080
 msgid "QWERTY"
-msgstr ""
+msgstr "QWERTY"
 
 #: rc_option_editor.cc:3081
 msgid "QWERTZ"
-msgstr ""
+msgstr "QWERTZ"
 
 #: rc_option_editor.cc:3082
 msgid "AZERTY"
-msgstr ""
+msgstr "AZERTY"
 
 #: rc_option_editor.cc:3083
 msgid "DVORAK"
-msgstr ""
+msgstr "DVORAK"
 
 #: rc_option_editor.cc:3084
 msgid "QWERTY Single"
-msgstr ""
+msgstr "QWERTY Simple"
 
 #: rc_option_editor.cc:3085
 msgid "QWERTZ Single"
-msgstr ""
+msgstr "QWERTZ simple"
 
 #: rc_option_editor.cc:3090
 msgid "MIDI Port Options"
-msgstr ""
+msgstr "Opciones de Puerto MIDI"
 
 #: rc_option_editor.cc:3095
 msgid "MIDI input follows MIDI track selection"
-msgstr ""
+msgstr "La entrada MIDI sigue la selección de la pista MIDI"
 
 #: rc_option_editor.cc:3111
 msgid "Enable metronome only while recording"
-msgstr ""
+msgstr "Habilitar metrónomo solo durante la grabación"
 
 #: rc_option_editor.cc:3117
 msgid ""
 "<b>When enabled</b> the metronome will remain silent if %1 is <b>not "
 "recording</b>."
 msgstr ""
+"<b>Cuando está habilitado</b> el metrónomo permanecerá en silencio si %1 "
+"<b>no está grabando</b>."
 
 #: rc_option_editor.cc:3124 rc_option_editor.cc:3138 rc_option_editor.cc:3155
 #: rc_option_editor.cc:3171 rc_option_editor.cc:3187 rc_option_editor.cc:3201
@@ -12832,11 +13292,11 @@ msgstr ""
 #: rc_option_editor.cc:3254 rc_option_editor.cc:3265 rc_option_editor.cc:3267
 #: rc_option_editor.cc:3269 rc_option_editor.cc:3277
 msgid "Preferences|Metering"
-msgstr ""
+msgstr "Medición"
 
 #: rc_option_editor.cc:3128
 msgid "Peak hold time"
-msgstr ""
+msgstr "Tiempo de retención de pico"
 
 #: rc_option_editor.cc:3134
 msgid "short"
@@ -12852,129 +13312,138 @@ msgstr "largo"
 
 #: rc_option_editor.cc:3142
 msgid "DPM fall-off"
-msgstr ""
+msgstr "Caída de DPM"
 
 #: rc_option_editor.cc:3148
 msgid "slowest [6.6dB/sec]"
-msgstr ""
+msgstr "más lento [6.6dB/seg]"
 
 #: rc_option_editor.cc:3149
 msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
-msgstr ""
+msgstr "lento [8.6dB/seg] (BBC PPM, EBU PPM)"
 
 #: rc_option_editor.cc:3150
 msgid "moderate [12.0dB/sec] (DIN)"
-msgstr ""
+msgstr "moderado [12.0dB/seg] (DIN)"
 
 #: rc_option_editor.cc:3151
 msgid "medium [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
-msgstr ""
+msgstr "medio [13.3dB/seg] (EBU Digi PPM, IRT Digi PPM)"
 
 #: rc_option_editor.cc:3152
 msgid "fast [20dB/sec]"
-msgstr ""
+msgstr "rápido [20dB/seg]"
 
 #: rc_option_editor.cc:3153
 msgid "very fast [32dB/sec]"
-msgstr ""
+msgstr "muy rápido [32dB/seg]"
 
 #: rc_option_editor.cc:3159
 msgid "Meter line-up level; 0dBu"
-msgstr ""
+msgstr "Nivel de alineación del medidor; 0dBu"
 
 #: rc_option_editor.cc:3164 rc_option_editor.cc:3180
 msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
-msgstr ""
+msgstr "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
 
 #: rc_option_editor.cc:3165 rc_option_editor.cc:3181
 msgid "-20dBFS (SMPTE RP.0155)"
-msgstr ""
+msgstr "-20dBFS (SMPTE RP.0155)"
 
 #: rc_option_editor.cc:3166 rc_option_editor.cc:3182
 msgid "-18dBFS (EBU, BBC)"
-msgstr ""
+msgstr "-18dBFS (EBU, BBC)"
 
 #: rc_option_editor.cc:3167 rc_option_editor.cc:3183
 msgid "-15dBFS (DIN)"
-msgstr ""
+msgstr "-15dBFS (DIN)"
 
 #: rc_option_editor.cc:3169
 msgid ""
 "Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
 "level for IEC1/Nordic, IEC2 PPM and VU meter."
 msgstr ""
+"Configurar marcas de medidor y punto de rodilla de color para DPM de escala "
+"dBFS, establecer nivel de referencia para medidores IEC1/Nórdico, IEC2 PPM y "
+"VU."
 
 #: rc_option_editor.cc:3175
 msgid "IEC1/DIN Meter line-up level; 0dBu"
-msgstr ""
+msgstr "Nivel de alineación del medidor IEC1/DIN; 0dBu"
 
 #: rc_option_editor.cc:3185
 msgid "Reference level for IEC1/DIN meter."
-msgstr ""
+msgstr "Nivel de referencia para medidor IEC1/DIN."
 
 #: rc_option_editor.cc:3191
 msgid "VU Meter standard"
-msgstr ""
+msgstr "Estándar de medidor VU"
 
 #: rc_option_editor.cc:3196
 msgid "0VU = -2dBu (France)"
-msgstr ""
+msgstr "0VU = -2dBu (Francia)"
 
 #: rc_option_editor.cc:3197
 msgid "0VU = 0dBu (North America, Australia)"
-msgstr ""
+msgstr "0VU = 0dBu (América del Norte, Australia)"
 
 #: rc_option_editor.cc:3198
 msgid "0VU = +4dBu (standard)"
-msgstr ""
+msgstr "0VU = +4dBu (estándar)"
 
 #: rc_option_editor.cc:3199
 msgid "0VU = +8dBu"
-msgstr ""
+msgstr "0VU = +8dBu"
 
 #: rc_option_editor.cc:3204
 msgid "Peak indicator threshold [dBFS]"
-msgstr ""
+msgstr "Umbral del indicador de pico [dBFS]"
 
 #: rc_option_editor.cc:3212
 msgid ""
 "Specify the audio signal level in dBFS at and above which the meter-peak "
 "indicator will flash red."
 msgstr ""
+"Especificar el nivel de señal de audio en dBFS a partir del cual el "
+"indicador de pico del medidor parpadeará en rojo."
 
 #: rc_option_editor.cc:3216
 msgid "Default Meter Types"
-msgstr ""
+msgstr "Tipos de Medidor Predeterminados"
 
 #: rc_option_editor.cc:3217
 msgid ""
 "These settings apply to newly created tracks and busses. For the Master bus, "
 "this will be when a new session is created."
 msgstr ""
+"Estos ajustes se aplican a las pistas y buses recién creados. Para el bus "
+"principal, esto será cuando se cree una nueva sesión."
 
 #: rc_option_editor.cc:3223
 msgid "Default Meter Type for Master Bus"
-msgstr ""
+msgstr "Tipo de medidor predeterminado para el bus principal"
 
 #: rc_option_editor.cc:3241
 msgid "Default meter type for busses"
-msgstr ""
+msgstr "Tipo de medidor predeterminado para buses"
 
 #: rc_option_editor.cc:3258
 msgid "Default meter type for tracks"
-msgstr ""
+msgstr "Tipo de medidor predeterminado para pistas"
 
 #: rc_option_editor.cc:3267
 msgid "Post Export Analysis"
-msgstr ""
+msgstr "Análisis Post Exportación"
 
 #: rc_option_editor.cc:3272
 msgid "Save loudness analysis as image file after export"
 msgstr ""
+"Guardar análisis de sonoridad como archivo de imagen después de la "
+"exportación"
 
 #: rc_option_editor.cc:3280
 msgid "Save Mixer screenshot after export"
-msgstr ""
+msgstr "Guardar captura del mezclador después de la exportación"
 
 #: rc_option_editor.cc:3291
 msgid "Stop at the end of the session"
@@ -12988,11 +13457,10 @@ msgid ""
 "<b>When disabled</b> %1 will continue to roll past the session end marker at "
 "all times"
 msgstr ""
-"Si está <b>habilitado</b> y %1 <b>no está grabando</b>, el transporte se "
-"detendrá cuando alcance la marca de fin de sesión\n"
-"\n"
-"Si está <b>deshabilitado</b> %1 seguirá adelante al alcanzar la marca de fin "
-"de sesión, en todo caso"
+"<b>Cuando está habilitado</b>, si %1 <b>no está grabando</b>, detendrá el "
+"transporte cuando llegue al marcador de final de sesión actual.\n"
+"<b>Cuando está deshabilitado</b>, %1 continuará pasando el marcador de final "
+"de sesión en todo momento"
 
 #: rc_option_editor.cc:3304
 msgid "Keep record-enable engaged on stop"
@@ -13005,6 +13473,10 @@ msgid ""
 "<b>When disabled</b> master record will be disabled when the transport "
 "transitions to stop."
 msgstr ""
+"<b>Cuando está habilitado</b>, la grabación maestra permanecerá activada "
+"cuando el transporte pase a detenerse.\n"
+"<b>Cuando está deshabilitado</b>, la grabación maestra se desactivará cuando "
+"el transporte pase a detenerse."
 
 #: rc_option_editor.cc:3314
 msgid "Disable per-track record disarm while rolling"
@@ -13015,6 +13487,8 @@ msgid ""
 "<b>When enabled</b> this will prevent you from accidentally stopping "
 "specific tracks recording during a take."
 msgstr ""
+"<b>Cuando está habilitado</b> esto evitará que detengas accidentalmente la "
+"grabación de pistas específicas durante una toma."
 
 #: rc_option_editor.cc:3323
 msgid "12dB gain reduction during fast-forward and fast-rewind"
@@ -13026,11 +13500,14 @@ msgid ""
 "volume that occurs when fast-forwarding or rewinding through some kinds of "
 "audio"
 msgstr ""
+"<b>Cuando está habilitado</b> esto reducirá el desagradable aumento de "
+"volumen percibido que se produce al avanzar o retroceder rápidamente a "
+"través de algunos tipos de audio"
 
 # podría ser "desplazar", chequear contexto
 #: rc_option_editor.cc:3334
 msgid "Preroll"
-msgstr ""
+msgstr "Pre-rollo"
 
 #: rc_option_editor.cc:3339
 msgid ""
@@ -13040,50 +13517,55 @@ msgid ""
 "If <b>Follow Edits</b> is enabled, the preroll is applied to the playhead "
 "position when a region is selected or trimmed."
 msgstr ""
+"La cantidad de pre-rollo que se aplicará cuando se inicie <b>Reproducir con "
+"pre-rollo</b> o <b>Grabar con pre-rollo</b>.\n"
+" Si <b>Seguir ediciones</b> está habilitado, el pre-rollo se aplicará a la "
+"posición de la cabeza de reproducción cuando se seleccione o recorte una "
+"región."
 
 #: rc_option_editor.cc:3341
 msgid "4 Bars"
-msgstr ""
+msgstr "4 Compases"
 
 #: rc_option_editor.cc:3342
 msgid "2 Bars"
-msgstr ""
+msgstr "2 compases"
 
 #: rc_option_editor.cc:3343
 msgid "1 Bar"
-msgstr ""
+msgstr "1 compás"
 
 #: rc_option_editor.cc:3344
 msgid "0 (no pre-roll)"
-msgstr ""
+msgstr "0 (sin pre-rollo)"
 
 #: rc_option_editor.cc:3345
 msgid "0.1 second"
-msgstr ""
+msgstr "0,1 segundos"
 
 #: rc_option_editor.cc:3346
 msgid "0.25 second"
-msgstr ""
+msgstr "0,25 segundos"
 
 #: rc_option_editor.cc:3347
 msgid "0.5 second"
-msgstr ""
+msgstr "0,5 segundos"
 
 #: rc_option_editor.cc:3348
 msgid "1.0 second"
-msgstr ""
+msgstr "1,0 segundos"
 
 #: rc_option_editor.cc:3349
 msgid "2.0 seconds"
-msgstr ""
+msgstr "2,0 segundos"
 
 #: rc_option_editor.cc:3353
 msgid "Looping"
-msgstr ""
+msgstr "Repetición (bucle)"
 
 #: rc_option_editor.cc:3357
 msgid "Play loop is a transport mode"
-msgstr ""
+msgstr "La reproducción en bucle es un modo de transporte"
 
 #: rc_option_editor.cc:3362
 msgid ""
@@ -13097,35 +13579,36 @@ msgstr ""
 "bucle no inicia la reproducción\n"
 "\n"
 "<b>Si está deshabilitado</b> el botón de bucle inicia la reproducción del "
-"rango de bucle pero se para al finalizar éste."
+"rango de bucle pero se para al finalizar éste"
 
 #: rc_option_editor.cc:3371
 msgid "Loop Fades"
-msgstr ""
+msgstr "Fundidos de Bucle"
 
 #: rc_option_editor.cc:3375
 msgid "No fades at loop boundaries"
-msgstr ""
+msgstr "Sin fundidos en los límites del bucle"
 
 #: rc_option_editor.cc:3376
 msgid "Fade out at loop end"
-msgstr ""
+msgstr "Fundido de salida al final del bucle"
 
 #: rc_option_editor.cc:3377
 msgid "Fade in at loop start & Fade out at loop end"
 msgstr ""
+"Fundido de entrada al inicio del bucle y fundido de salida al final del bucle"
 
 #: rc_option_editor.cc:3378
 msgid "Cross-fade loop end and start"
-msgstr ""
+msgstr "Cruzar el fundido del final y el principio del bucle"
 
 #: rc_option_editor.cc:3380
 msgid "Options for fades/crossfades at loop boundaries"
-msgstr ""
+msgstr "Opciones para fundidos/cruzados en los límites del bucle"
 
 #: rc_option_editor.cc:3382
 msgid "Dropout (xrun) Handling"
-msgstr ""
+msgstr "Manejo de caídas de audio (xrun)"
 
 #: rc_option_editor.cc:3385
 msgid "Stop recording when an xrun occurs"
@@ -13145,11 +13628,13 @@ msgstr "Crear marca en posición de xrun"
 
 #: rc_option_editor.cc:3404
 msgid "Reset x-run counter when starting to record"
-msgstr ""
+msgstr "Restablecer el contador de x-run al comenzar a grabar"
 
 #: rc_option_editor.cc:3417
 msgid "Match session video frame rate to external timecode"
 msgstr ""
+"Ajustar la tasa de fotogramas del video de la sesión al código de tiempo "
+"externo"
 
 #: rc_option_editor.cc:3423
 msgid ""
@@ -13164,62 +13649,79 @@ msgid ""
 "indication in the main clock will flash red and %1 will convert between the "
 "external timecode standard and the session standard."
 msgstr ""
+"Esta opción controla el valor de la tasa de fotogramas del video <i>mientras "
+"se sigue</i> una fuente de código de tiempo externa.\n"
+"\n"
+"<b>Cuando está habilitada</b> la tasa de fotogramas del video de la sesión "
+"se cambiará para coincidir con la de la fuente de código de tiempo externa "
+"seleccionada.\n"
+"\n"
+"<b>Cuando está deshabilitada</b> la tasa de fotogramas del video de la "
+"sesión no se cambiará para coincidir con la de la fuente de código de tiempo "
+"externa seleccionada. En su lugar, la indicación de la tasa de fotogramas en "
+"el reloj principal parpadeará en rojo y %1 convertirá entre el estándar de "
+"código de tiempo externo y el estándar de la sesión."
 
 #: rc_option_editor.cc:3431 rc_option_editor.cc:3433 rc_option_editor.cc:3450
 #: rc_option_editor.cc:3462 rc_option_editor.cc:3464
 msgid "Transport/LTC"
-msgstr ""
+msgstr "Transporte/LTC"
 
 #: rc_option_editor.cc:3431
 msgid "Linear Timecode (LTC) Generator"
-msgstr ""
+msgstr "Generador de Código de Tiempo Lineal (LTC)"
 
 #: rc_option_editor.cc:3436
 msgid "Enable LTC generator"
-msgstr "Habilitar generador LTC"
+msgstr "Habilitar generador LTC (Código de Tiempo)"
 
 #: rc_option_editor.cc:3443
 msgid "Send LTC while stopped"
-msgstr ""
+msgstr "Enviar LTC (Código de Tiempo) mientras está detenido"
 
 #: rc_option_editor.cc:3449
 msgid ""
 "<b>When enabled</b> %1 will continue to send LTC information even when the "
 "transport (playhead) is not moving"
 msgstr ""
+"<b>Cuando está habilitado</b> %1 continuará enviando información de LTC "
+"(Código de Tiempo) incluso cuando el transporte (cabezal de reproducción) no "
+"esté en movimiento"
 
 #: rc_option_editor.cc:3452
 msgid "LTC generator level [dBFS]"
-msgstr ""
+msgstr "Nivel del generador de LTC (Código de Tiempo) [dBFS]"
 
 #: rc_option_editor.cc:3460
 msgid ""
 "Specify the Peak Volume of the generated LTC signal in dBFS. A good value "
 "is  0dBu ^= -18dBFS in an EBU calibrated system"
 msgstr ""
+"Especifica el volumen pico de la señal LTC generada en dBFS. Un valor "
+"recomendado es 0 dBu ^= -18 dBFS en un sistema calibrado según la norma EBU"
 
 #: rc_option_editor.cc:3466 rc_option_editor.cc:3468 rc_option_editor.cc:3476
 #: rc_option_editor.cc:3478 rc_option_editor.cc:3486 rc_option_editor.cc:3495
 #: rc_option_editor.cc:3497 rc_option_editor.cc:3505 rc_option_editor.cc:3513
 #: rc_option_editor.cc:3522
 msgid "Transport/MIDI"
-msgstr ""
+msgstr "Transporte/MIDI"
 
 #: rc_option_editor.cc:3466
 msgid "MIDI Beat Clock (Mclk) Generator"
-msgstr ""
+msgstr "Generador de Reloj de Pulso MIDI (MCLK)"
 
 #: rc_option_editor.cc:3471
 msgid "Enable Mclk generator"
-msgstr ""
+msgstr "Habilitar generador de MCLK"
 
 #: rc_option_editor.cc:3476
 msgid "MIDI Time Code (MTC) Generator"
-msgstr ""
+msgstr "Generador de Código de Tiempo MIDI (MTC)"
 
 #: rc_option_editor.cc:3481
 msgid "Enable MTC Generator"
-msgstr ""
+msgstr "Habilitar generador de MTC"
 
 #: rc_option_editor.cc:3489
 msgid "Percentage either side of normal transport speed to transmit MTC"
@@ -13229,15 +13731,15 @@ msgstr ""
 
 #: rc_option_editor.cc:3495
 msgid "MIDI Machine Control (MMC)"
-msgstr ""
+msgstr "Control de Máquinas MIDI (MMC)"
 
 #: rc_option_editor.cc:3500
 msgid "Respond to MMC commands"
-msgstr ""
+msgstr "Responder a los comandos MMC"
 
 #: rc_option_editor.cc:3508
 msgid "Send MMC commands"
-msgstr ""
+msgstr "Enviar comandos MMC"
 
 #: rc_option_editor.cc:3516
 msgid "Inbound MMC device ID"
@@ -13249,7 +13751,7 @@ msgstr "ID del dispositivo MMC de salida"
 
 #: rc_option_editor.cc:3541
 msgid "Scan/Discover"
-msgstr ""
+msgstr "Escanear/Descubrir"
 
 #: rc_option_editor.cc:3543 rc_option_editor.cc:3603 rc_option_editor.cc:3685
 msgid "Scan for Plugins"
@@ -13264,6 +13766,9 @@ msgid ""
 "<b>When enabled</b> a popup window showing plugin scan progress is displayed "
 "for indexing (cache load) and discovery (detect new plugins)"
 msgstr ""
+"<b>Cuando está habilitado</b> se muestra una ventana emergente que muestra "
+"el progreso del escaneo del plugin para la indexación (carga de caché) y el "
+"descubrimiento (detección de nuevos plugins)."
 
 #: rc_option_editor.cc:3564
 msgid "Silence plugins when the transport is stopped"
@@ -13276,6 +13781,12 @@ msgid ""
 "\n"
 "This mostly affects plugins with a \"tail\" like Reverbs."
 msgstr ""
+"<b>Cuando está habilitado</b>, los plugins se restablecerán al detener el "
+"transporte. Cuando está deshabilitado, los plugins permanecerán sin cambios "
+"al detener el transporte.\n"
+"\n"
+"Esto afecta principalmente a plugins con un \"tail\" (decadencia), como los "
+"reverberadores."
 
 #: rc_option_editor.cc:3574
 msgid "Make new plugins active"
@@ -13287,34 +13798,37 @@ msgid ""
 "busses. When disabled plugins will be left inactive when they are added to "
 "tracks/busses"
 msgstr ""
+"<b>Cuando está habilitado</b>, los plugins se activarán cuando se añadan a "
+"las pistas/buses. Cuando está deshabilitado, los plugins permanecerán "
+"inactivos cuando se añadan a las pistas/buses"
 
 #: rc_option_editor.cc:3584
 msgid "Limit automatable parameters per plugin"
-msgstr ""
+msgstr "Limitar los parámetros automatizables por plugin"
 
 #: rc_option_editor.cc:3588 rc_option_editor.cc:4031
 msgid "Unlimited"
-msgstr ""
+msgstr "Sin límites"
 
 #: rc_option_editor.cc:3589 rc_option_editor.cc:4034
 msgid "64 parameters"
-msgstr ""
+msgstr "64 parámetros"
 
 #: rc_option_editor.cc:3590 rc_option_editor.cc:4035
 msgid "128 parameters"
-msgstr ""
+msgstr "128 parámetros"
 
 #: rc_option_editor.cc:3591
 msgid "256 parameters"
-msgstr ""
+msgstr "256 parámetros"
 
 #: rc_option_editor.cc:3592
 msgid "512 parameters"
-msgstr ""
+msgstr "512 parámetros"
 
 #: rc_option_editor.cc:3593
 msgid "999 parameters"
-msgstr ""
+msgstr "999 parámetros"
 
 #: rc_option_editor.cc:3596
 msgid ""
@@ -13328,6 +13842,16 @@ msgid ""
 "Note: This only affects newly added plugins and is applied to plugin on "
 "session-reload. Already automated parameters are retained."
 msgstr ""
+"Algunos plugins exponen una cantidad excesiva de entradas de control. Esta "
+"opción limita el número de parámetros que se pueden listar como "
+"automatizables sin restringir la cantidad total de controles.\n"
+"\n"
+"Esto reduce la latencia en la interfaz gráfica de usuario y acorta las "
+"listas desplegables excesivamente largas de plugins con un gran número de "
+"puertos de control.\n"
+"\n"
+"Nota: Esto solo afecta a los plugins añadidos recientemente y se aplica al "
+"plugin al recargar la sesión. Los parámetros ya automatizados se mantienen."
 
 #: rc_option_editor.cc:3600 rc_option_editor.cc:3602 rc_option_editor.cc:3614
 #: rc_option_editor.cc:3623 rc_option_editor.cc:3635 rc_option_editor.cc:3640
@@ -13342,11 +13866,11 @@ msgstr "VST"
 
 #: rc_option_editor.cc:3610
 msgid "Enable Mac VST support (requires restart or re-scan)"
-msgstr ""
+msgstr "Habilitar soporte para VST en Mac (requiere reinicio o re-escanear)"
 
 #: rc_option_editor.cc:3619
 msgid "Scan for [new] VST Plugins on Application Start"
-msgstr "Buscar plugins VST al arrancar la aplicación "
+msgstr "Buscar plugins VST al arrancar la aplicación"
 
 #: rc_option_editor.cc:3625
 msgid ""
@@ -13354,16 +13878,22 @@ msgid ""
 "cache index on application start. When disabled new plugins will only be "
 "available after triggering a 'Scan' manually"
 msgstr ""
+"<b>Cuando está habilitado</b> los nuevos plugins VST se buscarán, probarán y "
+"agregarán al índice de caché al iniciar la aplicación. Cuando está "
+"deshabilitado, los nuevos plugins solo estarán disponibles después de "
+"realizar un 'Escaneo' manualmente"
 
 #: rc_option_editor.cc:3631
 msgid "Verbose Plugin Scan"
-msgstr ""
+msgstr "Escaneo de Plugins Detallado"
 
 #: rc_option_editor.cc:3637
 msgid ""
 "<b>When enabled</b> additional information for every plugin is added to the "
 "Log Window."
 msgstr ""
+"<b>Cuando está habilitado</b> se agrega información adicional de cada plugin "
+"a la ventana de registro."
 
 #: rc_option_editor.cc:3645
 msgid "VST Cache:"
@@ -13371,11 +13901,11 @@ msgstr "VST Cache:"
 
 #: rc_option_editor.cc:3650
 msgid "VST Blacklist:"
-msgstr "VST Blacklist:"
+msgstr "Lista negra de VST:"
 
 #: rc_option_editor.cc:3657
 msgid "Linux VST Path:"
-msgstr ""
+msgstr "Ruta de VST en Linux:"
 
 #: rc_option_editor.cc:3662 rc_option_editor.cc:3675
 msgid "Path:"
@@ -13383,7 +13913,7 @@ msgstr "Ruta:"
 
 #: rc_option_editor.cc:3671
 msgid "Windows VST Path:"
-msgstr ""
+msgstr "Ruta de VST en Windows:"
 
 #: rc_option_editor.cc:3682 rc_option_editor.cc:3684 rc_option_editor.cc:3695
 #: rc_option_editor.cc:3699 rc_option_editor.cc:3704
@@ -13397,6 +13927,7 @@ msgstr "Audio Unit"
 #: rc_option_editor.cc:3691
 msgid "Scan for [new] AudioUnit Plugins on Application Start"
 msgstr ""
+"Escanear en busca de [nuevos] plugins AudioUnit al iniciar la aplicación"
 
 #: rc_option_editor.cc:3697
 msgid ""
@@ -13405,6 +13936,11 @@ msgid ""
 "manually. The first successful scan will enable AU auto-scan, Any crash "
 "during plugin discovery will disable it."
 msgstr ""
+"<b>Cuando está habilitado</b> los plugins AudioUnit se detectarán al iniciar "
+"la aplicación. Cuando está deshabilitado, los plugins AU solo estarán "
+"disponibles después de realizar un 'Escaneo' manualmente. El primer escaneo "
+"exitoso habilitará el auto-escaneo de AU. Cualquier fallo durante el "
+"descubrimiento de plugins deshabilitará esta función."
 
 #: rc_option_editor.cc:3702
 msgid "AU Cache:"
@@ -13412,19 +13948,19 @@ msgstr "AU Cache:"
 
 #: rc_option_editor.cc:3707
 msgid "AU Blacklist:"
-msgstr "AU Blacklist:"
+msgstr "Lista negra de AU:"
 
 #: rc_option_editor.cc:3711
 msgid "LV1/LV2"
-msgstr ""
+msgstr "LV1/LV2"
 
 #: rc_option_editor.cc:3715
 msgid "Conceal LADSPA (LV1) Plugins if matching LV2 exists"
-msgstr ""
+msgstr "Ocultar plugins LADSPA (LV1) si existe un plugin LV2 correspondiente"
 
 #: rc_option_editor.cc:3722
 msgid "Plugin GUI"
-msgstr "Plugin GUI"
+msgstr "Interfaz gráfica de Plugin"
 
 #: rc_option_editor.cc:3726
 msgid "Automatically open the plugin GUI when adding a new plugin"
@@ -13461,10 +13997,12 @@ msgid ""
 "<b>When enabled</b> show a dialog to select instrument channel configuration "
 "before adding a multichannel plugin."
 msgstr ""
+"<b>Cuando está habilitado</b> se mostrará un diálogo para seleccionar la "
+"configuración del canal de instrumento antes de añadir un plugin multicanal."
 
 #: rc_option_editor.cc:3774
 msgid "Graphics Acceleration"
-msgstr ""
+msgstr "Aceleración Gráfica"
 
 #: rc_option_editor.cc:3780
 msgid "Disable Graphics Hardware Acceleration (requires restart)"
@@ -13476,10 +14014,13 @@ msgid ""
 "using 2D-graphics acceleration.\n"
 "This requires restarting %1 before having an effect"
 msgstr ""
+"Renderizar partes grandes de la interfaz de usuario de la aplicación en "
+"software, en lugar de utilizar aceleración gráfica 2D.\n"
+"Esto requiere reiniciar %1 para que tenga efecto"
 
 #: rc_option_editor.cc:3793
 msgid "Possibly improve slow graphical performance (requires restart)"
-msgstr ""
+msgstr "Posiblemente mejorar el rendimiento gráfico lento (requiere reinicio)."
 
 #: rc_option_editor.cc:3798
 msgid ""
@@ -13487,14 +14028,17 @@ msgid ""
 "gradients patch\").\n"
 "This requires restarting %1 before having an effect"
 msgstr ""
+"Desactiva el renderizado de gradientes por hardware en controladores de "
+"video defectuosos (\"parche de gradientes defectuosos\").\n"
+"Esto requiere reiniciar %1 para que tenga efecto"
 
 #: rc_option_editor.cc:3801
 msgid "Graphical User Interface"
-msgstr ""
+msgstr "Interfaz Gráfica de Usuario (GUI)"
 
 #: rc_option_editor.cc:3806
 msgid "Highlight widgets on mouseover"
-msgstr ""
+msgstr "Resaltar widgets al pasar el ratón por encima"
 
 #: rc_option_editor.cc:3814
 msgid "Show tooltips if mouse hovers over a control"
@@ -13502,7 +14046,7 @@ msgstr "Mostrar descripciones emergentes al colocar el ratón sobre un control"
 
 #: rc_option_editor.cc:3821
 msgid "Update clocks at TC Frame rate"
-msgstr ""
+msgstr "Actualizar relojes a la tasa de fotogramas del código de tiempo (TC)"
 
 #: rc_option_editor.cc:3826
 msgid ""
@@ -13510,14 +14054,19 @@ msgid ""
 "\n"
 "<b>When disabled</b> clock displays are updated only every 100ms."
 msgstr ""
+"<b>Cuando está habilitado</b> las pantallas de reloj se actualizan en cada "
+"fotograma de código de tiempo (fps).\n"
+"\n"
+"<b>Cuando está deshabilitado</b> las pantallas de reloj se actualizan solo "
+"cada 100 ms."
 
 #: rc_option_editor.cc:3834
 msgid "Blink Rec-Arm buttons"
-msgstr ""
+msgstr "Parpadear al grabar-Armar botones"
 
 #: rc_option_editor.cc:3842
 msgid "Blink Alert Indicators"
-msgstr ""
+msgstr "Hacer parpadear los indicadores de alerta"
 
 #: rc_option_editor.cc:3852 rc_option_editor.cc:3853 rc_option_editor.cc:3861
 #: rc_option_editor.cc:3869 rc_option_editor.cc:3886 rc_option_editor.cc:3888
@@ -13527,7 +14076,7 @@ msgstr ""
 #: rc_option_editor.cc:3960 rc_option_editor.cc:3962 rc_option_editor.cc:3970
 #: rc_option_editor.cc:3979 rc_option_editor.cc:3987 rc_option_editor.cc:3995
 msgid "Appearance/Editor"
-msgstr ""
+msgstr "Apariencia/Editor"
 
 #: rc_option_editor.cc:3856
 msgid "Use name highlight bars in region displays (requires a restart)"
@@ -13535,15 +14084,15 @@ msgstr "Usar barras de resaltado para el nombre de región (requiere reiniciar)"
 
 #: rc_option_editor.cc:3864
 msgid "Region color follows track color"
-msgstr ""
+msgstr "El color de la región sigue el color de la pista"
 
 #: rc_option_editor.cc:3872
 msgid "Show Region Names"
-msgstr ""
+msgstr "Mostrar nombres de las regiones"
 
 #: rc_option_editor.cc:3879
 msgid "Add a visual gap below Audio Regions"
-msgstr ""
+msgstr "Agregar un espacio visual debajo de las regiones de audio"
 
 #: rc_option_editor.cc:3888
 msgid "Waveforms"
@@ -13555,11 +14104,11 @@ msgstr "Mostrar formas de onda en regiones"
 
 #: rc_option_editor.cc:3903
 msgid "Show waveforms while recording"
-msgstr ""
+msgstr "Mostrar formas de onda mientras se graba"
 
 #: rc_option_editor.cc:3911
 msgid "Show waveform clipping"
-msgstr "Mostrar clipping en la onda"
+msgstr "Mostrar recortes de la forma de onda"
 
 #: rc_option_editor.cc:3920
 msgid "Waveform scale"
@@ -13592,15 +14141,15 @@ msgstr "Medidores de Editor"
 
 #: rc_option_editor.cc:3947
 msgid "Show meters in track headers"
-msgstr ""
+msgstr "Mostrar medidores en los encabezados de pista"
 
 #: rc_option_editor.cc:3955
 msgid "Limit track header meters to stereo"
-msgstr ""
+msgstr "Limitar los medidores en los encabezados de pista a estéreo"
 
 #: rc_option_editor.cc:3960
 msgid "MIDI Regions"
-msgstr ""
+msgstr "Regiones MIDI"
 
 #: rc_option_editor.cc:3965
 msgid "Display first MIDI bank/program as 0"
@@ -13608,20 +14157,20 @@ msgstr "Mostrar el primer banco o programa MIDI como 0"
 
 #: rc_option_editor.cc:3973
 msgid "Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"
-msgstr ""
+msgstr "No mostrar mensajes SysEx periódicos (MTC, MMC) en las regiones MIDI"
 
 #: rc_option_editor.cc:3982
 msgid "Show velocity horizontally inside notes"
-msgstr ""
+msgstr "Mostrar la velocidad horizontalmente dentro de las notas"
 
 #: rc_option_editor.cc:3990
 msgid "Use colors to show note velocity"
-msgstr ""
+msgstr "Usar colores para mostrar la velocidad de las notas"
 
 #: rc_option_editor.cc:4008 rc_option_editor.cc:4017 rc_option_editor.cc:4036
 #: rc_option_editor.cc:4038
 msgid "Appearance/Mixer"
-msgstr ""
+msgstr "Apariencia/Mezclador"
 
 #: rc_option_editor.cc:4010
 msgid "Mixer Strip"
@@ -13629,68 +14178,68 @@ msgstr "Canal de Mezclador"
 
 #: rc_option_editor.cc:4020
 msgid "Use narrow strips in the mixer for new strips by default"
-msgstr ""
+msgstr "Usar tiras estrechas en el mezclador para las nuevas tiras por defecto"
 
 #: rc_option_editor.cc:4027
 msgid "Limit inline-mixer-strip controls per plugin"
-msgstr ""
+msgstr "Limitar los controles de la tira de mezclador en línea por plugin"
 
 #: rc_option_editor.cc:4032
 msgid "16 parameters"
-msgstr ""
+msgstr "16 parámetros"
 
 #: rc_option_editor.cc:4033
 msgid "32 parameters"
-msgstr ""
+msgstr "32 parámetros"
 
 #: rc_option_editor.cc:4040 rc_option_editor.cc:4042 rc_option_editor.cc:4050
 #: rc_option_editor.cc:4058 rc_option_editor.cc:4066 rc_option_editor.cc:4075
 #: rc_option_editor.cc:4084 rc_option_editor.cc:4092 rc_option_editor.cc:4100
 #: rc_option_editor.cc:4107
 msgid "Appearance/Toolbar"
-msgstr ""
+msgstr "Apariencia/Barra de herramientas"
 
 #: rc_option_editor.cc:4040
 msgid "Main Transport Toolbar Items"
-msgstr ""
+msgstr "Elementos de la barra de herramientas del transporte principal"
 
 #: rc_option_editor.cc:4045
 msgid "Display Record/Punch Options"
-msgstr ""
+msgstr "Mostrar opciones de grabación/punch"
 
 #: rc_option_editor.cc:4053
 msgid "Display Monitor Options"
-msgstr ""
+msgstr "Mostrar opciones de monitoreo"
 
 #: rc_option_editor.cc:4061
 msgid "Display Latency Compensation Info"
-msgstr ""
+msgstr "Mostrar información de compensación de latencia"
 
 #: rc_option_editor.cc:4069
 msgid "Display Selection Clock"
-msgstr ""
+msgstr "Mostrar reloj de selección"
 
 #: rc_option_editor.cc:4078
 msgid "Display Secondary Clock"
-msgstr ""
+msgstr "Mostrar reloj secundario"
 
 #: rc_option_editor.cc:4087
 msgid "Display Navigation Timeline"
-msgstr ""
+msgstr "Mostrar línea de tiempo de navegación"
 
 #: rc_option_editor.cc:4095
 msgid "Display Master Level Meter"
-msgstr ""
+msgstr "Mostrar medidor de nivel maestro"
 
 #: rc_option_editor.cc:4102
 msgid "Display Action-Buttons"
-msgstr ""
+msgstr "Mostrar botones de acción"
 
 #: rc_option_editor.cc:4112 rc_option_editor.cc:4114 rc_option_editor.cc:4121
 #: rc_option_editor.cc:4128 rc_option_editor.cc:4144 rc_option_editor.cc:4154
 #: rc_option_editor.cc:4166
 msgid "Appearance/Theme"
-msgstr ""
+msgstr "Apariencia/Tema"
 
 #: rc_option_editor.cc:4112
 msgid "Theme"
@@ -13702,11 +14251,11 @@ msgstr "Mostrar botones \"planos\""
 
 #: rc_option_editor.cc:4123
 msgid "Draw \"boxy\" buttons"
-msgstr ""
+msgstr "Dibujar botones \"cuadrados\""
 
 #: rc_option_editor.cc:4130
 msgid "LED meter style"
-msgstr ""
+msgstr "Estilo de medidor LED"
 
 #: rc_option_editor.cc:4138
 msgid "Waveforms color gradient depth"
@@ -13718,19 +14267,19 @@ msgstr "Gradiente de color de la línea de tiempo"
 
 #: rc_option_editor.cc:4159
 msgid "Icon Set"
-msgstr ""
+msgstr "Conjunto de iconos"
 
 #: rc_option_editor.cc:4169 rc_option_editor.cc:4170 rc_option_editor.cc:4171
 msgid "Appearance/Colors"
-msgstr ""
+msgstr "Apariencia/Colores"
 
 #: rc_option_editor.cc:4169
 msgid "Colors"
-msgstr ""
+msgstr "Colores"
 
 #: rc_option_editor.cc:4175
 msgid "Various Workarounds for Windowing Systems"
-msgstr ""
+msgstr "Varias Soluciones Alternativas para Sistemas de Ventanas"
 
 #: rc_option_editor.cc:4177
 msgid ""
@@ -13743,52 +14292,73 @@ msgid ""
 "These settings will only take effect after %1 is restarted.\n"
 "\t"
 msgstr ""
+"Las reglas para cerrar, minimizar, maximizar y mantener en la parte superior "
+"pueden variar con cada versión de tu sistema operativo y con las "
+"preferencias que hayas configurado en tu sistema operativo.\n"
+"\n"
+"Puedes ajustar las opciones a continuación para cambiar el comportamiento de "
+"las ventanas y diálogos de las aplicaciones.\n"
+"\n"
+"\n"
+"Estas configuraciones solo tendrán efecto después de reiniciar %1..\n"
+"\t"
 
 #: rc_option_editor.cc:4183 rc_option_editor.cc:4193 rc_option_editor.cc:4204
 #: rc_option_editor.cc:4214 rc_option_editor.cc:4226 rc_option_editor.cc:4229
 msgid "Appearance/Quirks"
-msgstr ""
+msgstr "Apariencia/Rarezas"
 
 #: rc_option_editor.cc:4187
 msgid "Use visibility information provided by your Window Manager/Desktop"
 msgstr ""
+"Utiliza la información de visibilidad proporcionada por tu Gestor de "
+"Ventanas/Escritorio"
 
 #: rc_option_editor.cc:4192
 msgid ""
 "If you have trouble toggling between hidden Editor and Mixer windows, try "
 "changing this setting."
 msgstr ""
+"Si tienes problemas para alternar entre las ventanas ocultas del Editor y el "
+"Mezclador, intenta cambiar esta configuración."
 
 #: rc_option_editor.cc:4198
 msgid "All floating windows are dialogs"
-msgstr ""
+msgstr "Todas las ventanas flotantes son diálogos"
 
 #: rc_option_editor.cc:4203
 msgid ""
-"Mark all floating windows to be type \"Dialog\" rather than using \"Utility"
-"\" for some.\n"
+"Mark all floating windows to be type \"Dialog\" rather than using "
+"\"Utility\" for some.\n"
 "This may help with some window managers."
 msgstr ""
+"Marca todas las ventanas flotantes como tipo \"Diálogo\" en lugar de usar "
+"\"Utilidad\" para algunas.\n"
+"Esto puede ayudar con algunos gestores de ventanas."
 
 #: rc_option_editor.cc:4208
 msgid "Transient windows follow front window."
-msgstr ""
+msgstr "Las ventanas transitorias siguen a la ventana frontal."
 
 #: rc_option_editor.cc:4213
 msgid ""
 "Make transient windows follow the front window when toggling between the "
 "editor and mixer."
 msgstr ""
+"Hacer que las ventanas transitorias seguir la ventana frontal al alternar "
+"entre el editor y el mezclador."
 
 #: rc_option_editor.cc:4220
 msgid "Float detached monitor-section window"
-msgstr ""
+msgstr "Flotar ventana de sección de monitor desprendida"
 
 #: rc_option_editor.cc:4225
 msgid ""
 "When detaching the monitoring section, mark it as \"Utility\" window to stay "
 "in front."
 msgstr ""
+"Al desacoplar la sección de monitoreo, marcarla como ventana de \"Utilidad\" "
+"para que permanezca al frente."
 
 #: rc_option_editor.cc:4232
 msgid "Video Server"
@@ -13800,7 +14370,7 @@ msgstr "Establecer ruta de búsqueda de plugins Linux VST"
 
 #: rc_option_editor.cc:4327 rc_option_editor.cc:4348
 msgid "Re-scan Plugins now?"
-msgstr ""
+msgstr "¿Volver a escanear los plugins ahora?"
 
 #: rc_option_editor.cc:4340
 msgid "Set Windows VST Search Path"
@@ -13852,7 +14422,7 @@ msgstr "cambiar posición del final de región"
 
 #: region_editor.cc:335
 msgid "change region length"
-msgstr "cambiar duración de región "
+msgstr "cambiar duración de región"
 
 #: region_editor.cc:429 region_editor.cc:441
 msgid "change region sync point"
@@ -13860,7 +14430,7 @@ msgstr "cambiar punto de sincronía de región"
 
 #: region_layering_order_editor.cc:44
 msgid "RegionLayeringOrderEditor"
-msgstr ""
+msgstr "EditorDeOrdenDeCapasDeRegión"
 
 #: region_layering_order_editor.cc:57
 msgid "Region Name"
@@ -13876,7 +14446,7 @@ msgstr "Elegir región Superior"
 
 #: region_view.cc:278
 msgid "SilenceText"
-msgstr ""
+msgstr "TextoDeSilencio"
 
 #: region_view.cc:293 region_view.cc:312
 msgid "minutes"
@@ -13910,7 +14480,7 @@ msgstr ""
 
 #: return_ui.cc:104
 msgid "Return "
-msgstr "Return "
+msgstr "Volver "
 
 #: rhythm_ferret.cc:51
 msgid "Percussive Onset"
@@ -13978,7 +14548,7 @@ msgstr "Función de detección"
 
 #: rhythm_ferret.cc:129
 msgid "Trigger gap (postproc)"
-msgstr ""
+msgstr "Brecha de activación (postproc)"
 
 #: rhythm_ferret.cc:134
 msgid "Peak threshold"
@@ -13990,7 +14560,7 @@ msgstr "Umbral de silencio"
 
 #: rhythm_ferret.cc:144
 msgid "Min Inter-Onset Time"
-msgstr ""
+msgstr "Tiempo Mínimo Entre Inicios"
 
 #: rhythm_ferret.cc:151
 msgid "Sensitivity"
@@ -13998,7 +14568,7 @@ msgstr "Sensibilidad"
 
 #: rhythm_ferret.cc:155
 msgid "Cut Pos Threshold"
-msgstr ""
+msgstr "Cortar umbral posterior"
 
 #: rhythm_ferret.cc:160
 msgid "Operation"
@@ -14038,7 +14608,7 @@ msgstr "<b>Compartir</b>"
 
 #: route_group_dialog.cc:191
 msgid "The group name is not unique. Please use a different name."
-msgstr ""
+msgstr "El nombre del grupo no es único. Por favor, usa un nombre diferente."
 
 #: route_params_ui.cc:87
 msgid "Tracks/Busses"
@@ -14074,15 +14644,15 @@ msgstr "No hay pista o bus seleccionado"
 
 #: route_time_axis.cc:115
 msgid "RTAV|G"
-msgstr ""
+msgstr "G"
 
 #: route_time_axis.cc:116
 msgid "RTAV|P"
-msgstr ""
+msgstr "P"
 
 #: route_time_axis.cc:117 vca_time_axis.cc:76
 msgid "RTAV|A"
-msgstr ""
+msgstr "A"
 
 #: route_time_axis.cc:203
 msgid "Record (Right-click for Step Edit)"
@@ -14114,7 +14684,7 @@ msgstr "Ocultar toda automatización"
 
 #: route_time_axis.cc:570
 msgid "Processor automation"
-msgstr ""
+msgstr "Automatización de procesadores"
 
 # Problema: Atenuador no entra. Esto tiene que entrar en la automatización de la pista, en el Editor. Fader se entiende muy bien y entra mejor.
 #: route_time_axis.cc:577 vca_time_axis.cc:493
@@ -14124,7 +14694,7 @@ msgstr "Fader"
 # Aquí estaba panorámica, pero pan se entiende perfectamente y es mucho más corto
 #: route_time_axis.cc:604
 msgid "Pan"
-msgstr "Pan"
+msgstr "Paneo"
 
 #: route_time_axis.cc:666
 msgid "Overlaid"
@@ -14172,11 +14742,11 @@ msgstr "Renombrar lista de reproducción"
 
 #: route_time_axis.cc:1071
 msgid "New name for playlist:"
-msgstr "Nuevo nombre para lista de reproducción"
+msgstr "Nuevo nombre para lista de reproducción."
 
 #: route_time_axis.cc:1083 route_time_axis.cc:1179
 msgid "Given playlist name is not unique."
-msgstr ""
+msgstr "El nombre de la lista de reproducción proporcionada no es único."
 
 #: route_time_axis.cc:1161
 msgid "New Copy Playlist"
@@ -14184,7 +14754,7 @@ msgstr "Nueva copia de lista de reproducción"
 
 #: route_time_axis.cc:1162
 msgid "Name for playlist copy:"
-msgstr ""
+msgstr "Nombre para la copia de la lista de reproducción:"
 
 #: route_time_axis.cc:1164
 msgid "New Playlist"
@@ -14196,7 +14766,7 @@ msgstr "Nombre para nueva lista de reproducción:"
 
 #: route_time_axis.cc:1355
 msgid "The name \"%1\" is reserved for %2"
-msgstr ""
+msgstr "El nombre \"%1\" está reservado para %2"
 
 #: route_time_axis.cc:1581
 msgid "New Copy..."
@@ -14220,7 +14790,7 @@ msgstr "Selecciona de todos...."
 
 #: route_time_axis.cc:1682
 msgid "Take: %1.%2"
-msgstr ""
+msgstr "Toma: %1.%2"
 
 #: route_time_axis.cc:1980 selection.cc:855 selection.cc:909
 msgid "programming error: "
@@ -14240,7 +14810,7 @@ msgstr "programming error: underlay reference pointer pairs are inconsistent!"
 
 #: route_time_axis.cc:2555 vca_master_strip.cc:218 vca_time_axis.cc:274
 msgid "After-fade listen (AFL)"
-msgstr "Escucha Post-fader (AFL) "
+msgstr "Escucha Post-fader (AFL)"
 
 #: route_time_axis.cc:2559 vca_master_strip.cc:222 vca_time_axis.cc:278
 msgid "Pre-fade listen (PFL)"
@@ -14268,11 +14838,11 @@ msgstr "Monitorizar reproducción"
 
 #: route_ui.cc:942
 msgid "Rec-Safe"
-msgstr ""
+msgstr "Grabación-Segura"
 
 #: route_ui.cc:947
 msgid "Step Entry"
-msgstr ""
+msgstr "Entrada en pasos"
 
 #: route_ui.cc:1046
 msgid "Assign all tracks (prefader)"
@@ -14280,7 +14850,7 @@ msgstr "Asignar todas las pistas (prefader)"
 
 #: route_ui.cc:1050
 msgid "Assign all tracks and busses (prefader)"
-msgstr ""
+msgstr "Asignar todas las pistas y buses (prefader)"
 
 #: route_ui.cc:1054
 msgid "Assign all tracks (postfader)"
@@ -14288,19 +14858,19 @@ msgstr "Asignar todas las pistas (postfader)"
 
 #: route_ui.cc:1058
 msgid "Assign all tracks and busses (postfader)"
-msgstr ""
+msgstr "Asignar todas las pistas y buses (postfader)"
 
 #: route_ui.cc:1066
 msgid "Assign selected tracks and busses (prefader)"
-msgstr ""
+msgstr "Asignar las pistas y buses seleccionados (postfader)"
 
 #: route_ui.cc:1069
 msgid "Assign selected tracks (postfader)"
-msgstr "Assignar pistas seleccionadas (postfader)"
+msgstr "Asignar pistas seleccionadas (postfader)"
 
 #: route_ui.cc:1073
 msgid "Assign selected tracks and busses (postfader)"
-msgstr ""
+msgstr "Asignar las pistas y los buses (postfader)"
 
 #: route_ui.cc:1418
 msgid "Solo Isolate"
@@ -14312,11 +14882,11 @@ msgstr "Solo seguro"
 
 #: route_ui.cc:1443
 msgid "Pre Fader Sends"
-msgstr ""
+msgstr "Envíos Pre Fader"
 
 #: route_ui.cc:1449
 msgid "Post Fader Sends"
-msgstr ""
+msgstr "Envíos Post Fader"
 
 #: route_ui.cc:1455
 msgid "Control Outs"
@@ -14341,7 +14911,7 @@ msgstr "Usar el nuevo nombre"
 
 #: route_ui.cc:1695
 msgid "Re-edit the name"
-msgstr ""
+msgstr "Reeditar el nombre"
 
 #: route_ui.cc:1708
 msgid "Rename Track"
@@ -14357,7 +14927,7 @@ msgstr ": editor de notas"
 
 #: route_ui.cc:1952
 msgid "Cannot create route template directory %1"
-msgstr "Cannot create route template directory %1"
+msgstr "No se puede crear el directorio de plantilla de ruta %1"
 
 #: route_ui.cc:2054
 msgid ""
@@ -14373,7 +14943,7 @@ msgstr "Pulsa para mostrar un menú de canales para invertir su polaridad"
 
 #: save_as_dialog.cc:36
 msgid "Switch to newly-saved version"
-msgstr "Cambiar a versión recién salvada"
+msgstr "Cambiar a versión recién guardada"
 
 #: save_as_dialog.cc:37
 msgid "Copy media to new session"
@@ -14385,7 +14955,7 @@ msgstr "Copiar medios externos a nueva sesión"
 
 #: save_as_dialog.cc:39
 msgid "Newly-saved session should be empty"
-msgstr "La sesión recién salvada debería estar vacía"
+msgstr "La sesión recién guardada debería estar vacía"
 
 #: save_as_dialog.cc:50
 msgid "Save as session name"
@@ -14393,11 +14963,11 @@ msgstr "Guardar como nombre de sesión"
 
 #: save_as_dialog.cc:57
 msgid "Parent directory/folder"
-msgstr "Carpeta padre"
+msgstr "Directorio/carpeta principal"
 
 #: save_template_dialog.cc:35
 msgid "Save as template"
-msgstr ""
+msgstr "Guardar como plantilla"
 
 #: save_template_dialog.cc:44
 msgid "Template name:"
@@ -14405,7 +14975,7 @@ msgstr "Nombre de plantilla :"
 
 #: save_template_dialog.cc:48
 msgid "Description:"
-msgstr ""
+msgstr "Descripción:"
 
 #: search_path_option.cc:42
 msgid "Select folder to search for media"
@@ -14421,7 +14991,7 @@ msgstr "el archivo de sesión"
 
 #: script_selector.cc:177
 msgid "Select Script to unload"
-msgstr ""
+msgstr "Seleccionar script para descargar"
 
 #: script_selector.cc:218
 msgid "<b>Name:</b>"
@@ -14437,51 +15007,53 @@ msgstr "Enviar "
 
 #: session_archive_dialog.cc:35
 msgid "Zip/Archive Current Session"
-msgstr ""
+msgstr "Comprimir/Archivar Sesión Actual"
 
 #: session_archive_dialog.cc:37
 msgid "Exclude unused audio sources"
-msgstr ""
+msgstr "Excluir fuentes de audio no utilizadas"
 
 #: session_archive_dialog.cc:47 session_archive_dialog.cc:49
 #: session_archive_dialog.cc:179 session_archive_dialog.cc:193
 msgid "FLAC 16bit"
-msgstr ""
+msgstr "FLAC 16bit"
 
 #: session_archive_dialog.cc:48 session_archive_dialog.cc:182
 #: session_archive_dialog.cc:196
 msgid "FLAC 24bit"
-msgstr ""
+msgstr "FLAC 24bit"
 
 #: session_archive_dialog.cc:63
 msgid "Archive Name:"
-msgstr ""
+msgstr "Nombre del archivo:"
 
 #: session_archive_dialog.cc:74
 msgid "Target directory/folder:"
-msgstr ""
+msgstr "Directorio/carpeta de destino:"
 
 #: session_archive_dialog.cc:80
 msgid "Audio Compression:"
-msgstr ""
+msgstr "Compresión de Audio:"
 
 #: session_archive_dialog.cc:86
 msgid "Archive Compression:"
-msgstr ""
+msgstr "Compresión del Archivo:"
 
 #: session_archive_dialog.cc:96
 msgid ""
 "Note: This archives only the current session state, snapshots are not "
 "included."
 msgstr ""
+"Nota: Esto solo archiva el estado actual de la sesión, no se incluyen "
+"instantáneas."
 
 #: session_archive_dialog.cc:239
 msgid "Archiving Session"
-msgstr ""
+msgstr "Archivando Sesión"
 
 #: session_archive_dialog.cc:243
 msgid "Encoding Audio"
-msgstr ""
+msgstr "Codificación de audio"
 
 #: session_dialog.cc:80
 msgid "Session Setup"
@@ -14533,11 +15105,11 @@ msgstr "Abrir"
 
 #: session_dialog.cc:547
 msgid "Untitled-%1"
-msgstr ""
+msgstr "Sin Título-%1"
 
 #: session_dialog.cc:601
 msgid "Empty Template"
-msgstr ""
+msgstr "Plantilla vacia"
 
 #: session_dialog.cc:603
 msgid ""
@@ -14545,6 +15117,9 @@ msgid ""
 "\n"
 "Select this option if you are importing files to mix."
 msgstr ""
+"Una sesión vacía con la configuración de fábrica.\n"
+"\n"
+"Seleccione esta opción si está importando archivos para mezclar."
 
 #: session_dialog.cc:621
 msgid "Session name:"
@@ -14560,7 +15135,7 @@ msgstr "Seleccionar carpeta para sesión"
 
 #: session_dialog.cc:692
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
 #: session_dialog.cc:844 session_dialog.cc:902
 msgid "32-bit float"
@@ -14576,11 +15151,11 @@ msgstr "16-bit"
 
 #: session_dialog.cc:861 session_dialog.cc:920
 msgid "Last modified with: %1"
-msgstr ""
+msgstr "Última modificación con: %1"
 
 #: session_dialog.cc:1055
 msgid "Remove session from recent list"
-msgstr ""
+msgstr "Eliminar sesión de la lista reciente"
 
 #: session_import_dialog.cc:81
 msgid "Elements"
@@ -14588,11 +15163,13 @@ msgstr "Elementos"
 
 #: session_import_dialog.cc:120
 msgid "Cannot load XML for session from %1"
-msgstr ""
+msgstr "No se puede cargar XML para la sesión desde %1"
 
 #: session_import_dialog.cc:137 session_import_dialog.cc:221
 msgid "Some elements had errors in them. Please see the log for details"
 msgstr ""
+"Algunos elementos tenían errores. Por favor, consulte el registro para más "
+"detalles"
 
 #: session_import_dialog.cc:173
 msgid "Import from session"
@@ -14600,27 +15177,27 @@ msgstr "Importar desde sesión"
 
 #: session_import_dialog.cc:237
 msgid "This will select all elements of this type!"
-msgstr ""
+msgstr "¡Esto seleccionará todos los elementos de este tipo!"
 
 #: session_metadata_dialog.cc:332
 msgid "EAN Check digit OK"
-msgstr ""
+msgstr "Dígito de control EAN OK"
 
 #: session_metadata_dialog.cc:336
 msgid "EAN Check digit error"
-msgstr ""
+msgstr "Error en el dígito de control EAN"
 
 #: session_metadata_dialog.cc:336
 msgid "expected"
-msgstr ""
+msgstr "esperado"
 
 #: session_metadata_dialog.cc:341
 msgid "EAN Length error"
-msgstr ""
+msgstr "Error de longitud de EAN"
 
 #: session_metadata_dialog.cc:470
 msgid "Field"
-msgstr ""
+msgstr "Campo"
 
 #: session_metadata_dialog.cc:474
 msgid "Values (current value on top)"
@@ -14632,11 +15209,11 @@ msgstr "Usuario"
 
 #: session_metadata_dialog.cc:697
 msgid "Email"
-msgstr ""
+msgstr "Correo Electrónico"
 
 #: session_metadata_dialog.cc:700
 msgid "Web"
-msgstr ""
+msgstr "Sitio Web"
 
 #: session_metadata_dialog.cc:703
 msgid "Organization"
@@ -14660,7 +15237,7 @@ msgstr "Subtítulo"
 
 #: session_metadata_dialog.cc:743
 msgid "Grouping"
-msgstr ""
+msgstr "Agrupación"
 
 #: session_metadata_dialog.cc:746
 msgid "Artist"
@@ -14716,7 +15293,7 @@ msgstr "ISRC"
 
 #: session_metadata_dialog.cc:795
 msgid "EAN barcode"
-msgstr ""
+msgstr "Código de barras EAN"
 
 #: session_metadata_dialog.cc:808
 msgid "People"
@@ -14852,7 +15429,7 @@ msgstr "60"
 
 #: session_option_editor.cc:70
 msgid "Pull-up / pull-down"
-msgstr ""
+msgstr "Mover hacia arriba / abajo"
 
 #: session_option_editor.cc:75
 msgid "4.1667 + 0.1%"
@@ -14897,6 +15474,7 @@ msgstr "Compensación de Timecode esclavo"
 #: session_option_editor.cc:97
 msgid "The specified offset is added to the received timecode (MTC or LTC)."
 msgstr ""
+"El desfase especificado se añade al código de tiempo recibido. (MTC or LTC)."
 
 #: session_option_editor.cc:103
 msgid "Timecode Generator offset"
@@ -14906,10 +15484,12 @@ msgstr "Compensación de generador de Timecode"
 msgid ""
 "Specify an offset which is added to the generated timecode (so far only LTC)."
 msgstr ""
+"Especifica un desfase que se añade al código de tiempo generado. (so far "
+"only LTC)."
 
 #: session_option_editor.cc:114
 msgid "JACK Transport/Time Settings"
-msgstr ""
+msgstr "Configuraciones de transporte/tiempo de JACK"
 
 #: session_option_editor.cc:118
 msgid ""
@@ -14920,31 +15500,35 @@ msgstr ""
 
 #: session_option_editor.cc:125
 msgid "A/V Synchronization"
-msgstr ""
+msgstr "Sincronización A/V"
 
 #: session_option_editor.cc:128
 msgid ""
 "Use Video File's FPS Instead of Timecode Value for Timeline and Video "
 "Monitor."
 msgstr ""
+"Usa el FPS del archivo de video en lugar del valor de código de tiempo para "
+"la línea de tiempo y el monitor de video."
 
 #: session_option_editor.cc:135
 msgid ""
 "Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless using JACK-"
 "sync)."
 msgstr ""
+"Aplicar Pull-Up/Down a la Línea de Tiempo de Video y al Monitor de Video (Al "
+"menos de que se esté utilizando JACK-sync)."
 
 #: session_option_editor.cc:144
 msgid "Audio Fades"
-msgstr ""
+msgstr "Desvanecimientos de audio"
 
 #: session_option_editor.cc:148
 msgid "Declick when transport starts and stops"
-msgstr ""
+msgstr "Descliquear cuando el transporte comienza y se detiene"
 
 #: session_option_editor.cc:155
 msgid "Declick when monitor state changes"
-msgstr ""
+msgstr "Descliquear cuando cambie el estado del monitor"
 
 #: session_option_editor.cc:162
 msgid "Region fades active"
@@ -14972,7 +15556,7 @@ msgstr "Broadcast RF64"
 
 #: session_option_editor.cc:199
 msgid "WAVE (4GB size limit)"
-msgstr ""
+msgstr "WAVE (4GB tamaño máximo)"
 
 #: session_option_editor.cc:200
 msgid "WAVE-64"
@@ -14980,7 +15564,7 @@ msgstr "WAVE-64"
 
 #: session_option_editor.cc:204
 msgid "RF64 (WAV compatible)"
-msgstr ""
+msgstr "RF64 (WAV compatible)"
 
 #: session_option_editor.cc:210 session_option_editor.cc:216
 #: session_option_editor.cc:223
@@ -14989,7 +15573,7 @@ msgstr "Localizaciones"
 
 #: session_option_editor.cc:210
 msgid "File Locations"
-msgstr ""
+msgstr "Ubicaciones de archivos"
 
 #: session_option_editor.cc:212
 msgid "Search for audio files in:"
@@ -15033,12 +15617,12 @@ msgstr "Número de toma"
 msgid ""
 "Track Input Monitoring automatically follows transport state (\"auto-input\")"
 msgstr ""
-"La monitorización de entrada de pista sigue automáticamente el estado del "
+"La monitoreo de entrada de pista sigue automáticamente el estado del "
 "transporte (\"auto-entrada\")"
 
 #: session_option_editor.cc:274
 msgid "Use monitor section in this session"
-msgstr "Usar sección de monitorización en esta sesión"
+msgstr "Usar sección de monitoreo en esta sesión"
 
 #: session_option_editor.cc:281 session_option_editor.cc:283
 #: session_option_editor.cc:290 session_option_editor.cc:297
@@ -15047,11 +15631,11 @@ msgstr "Usar sección de monitorización en esta sesión"
 #: session_option_editor.cc:327 session_option_editor.cc:334
 #: session_option_editor.cc:336 session_option_editor.cc:343
 msgid "Meterbridge"
-msgstr ""
+msgstr "Puente de medición"
 
 #: session_option_editor.cc:281
 msgid "Route Display"
-msgstr ""
+msgstr "Visualización de ruta"
 
 #: session_option_editor.cc:285
 msgid "Show Midi Tracks"
@@ -15067,31 +15651,31 @@ msgstr "Incluir bus master"
 
 #: session_option_editor.cc:304
 msgid "Button Area"
-msgstr ""
+msgstr "�rea de botón"
 
 #: session_option_editor.cc:308
 msgid "Rec-enable Button"
-msgstr ""
+msgstr "Botón para habilitar grabado"
 
 #: session_option_editor.cc:315
 msgid "Mute Button"
-msgstr ""
+msgstr "Botón de enmudecer"
 
 #: session_option_editor.cc:322
 msgid "Solo Button"
-msgstr ""
+msgstr "Botón de solo"
 
 #: session_option_editor.cc:329
 msgid "Monitor Buttons"
-msgstr ""
+msgstr "Botones de monitoreo"
 
 #: session_option_editor.cc:334
 msgid "Name Labels"
-msgstr ""
+msgstr "Etiquetas de nombre"
 
 #: session_option_editor.cc:338
 msgid "Track Name"
-msgstr ""
+msgstr "Nombre de la pista"
 
 #: session_option_editor.cc:347 session_option_editor.cc:349
 #: session_option_editor.cc:370 session_option_editor.cc:372
@@ -15147,7 +15731,7 @@ msgstr "Adherir regiones nuevas a compases y pulsos"
 
 #: session_option_editor.cc:392
 msgid "Always count-in when recording"
-msgstr ""
+msgstr "Siempre cuenta antes de grabar"
 
 #: session_option_editor.cc:397
 msgid "Defaults"
@@ -15171,19 +15755,20 @@ msgstr "Coma flotante 32-bit"
 
 #: sfdb_ui.cc:106 sfdb_ui.cc:1826
 msgid "by track number"
-msgstr ""
+msgstr "por número de pista"
 
 #: sfdb_ui.cc:108 sfdb_ui.cc:1827
 msgid "by track name"
-msgstr ""
+msgstr "por nombre de pista"
 
 #: sfdb_ui.cc:110 sfdb_ui.cc:1828
 msgid "by instrument name"
-msgstr ""
+msgstr "por nombre de instrumento"
 
 #: sfdb_ui.cc:114
 msgid "programming error: unknown midi track name source string %1"
 msgstr ""
+"error de programación: nombre de pista midi desconocido cadena de origen %1"
 
 #: sfdb_ui.cc:122 sfdb_ui.cc:140 sfdb_ui.cc:147
 msgid "as new tracks"
@@ -15195,7 +15780,7 @@ msgstr "a pistas seleccionadas"
 
 #: sfdb_ui.cc:126 sfdb_ui.cc:144
 msgid "to source list"
-msgstr ""
+msgstr "a lista de fuentes"
 
 #: sfdb_ui.cc:130
 msgid "programming error: unknown import mode string %1"
@@ -15215,7 +15800,7 @@ msgstr "Timestamp:"
 
 #: sfdb_ui.cc:185
 msgid "Tempo Map:"
-msgstr ""
+msgstr "Mapa de Tempo:"
 
 #: sfdb_ui.cc:222 sfdb_ui.cc:738
 msgid "Tags:"
@@ -15223,27 +15808,27 @@ msgstr "Etiquetas:"
 
 #: sfdb_ui.cc:334
 msgid "<b>Midi File Information</b>"
-msgstr ""
+msgstr "<b>Información de Archivo MIDI</b>"
 
 #: sfdb_ui.cc:347
 msgid "(Tracks)"
-msgstr ""
+msgstr "(Pistas)"
 
 #: sfdb_ui.cc:355 sfdb_ui.cc:374
 msgid "No tempo data"
-msgstr ""
+msgstr "No hay datos de tempo"
 
 #: sfdb_ui.cc:360
 msgid "%1/%2 ♩ = %3"
-msgstr ""
+msgstr "%1/%2 ♩ = %3"
 
 #: sfdb_ui.cc:367
 msgid "map with %1 sections"
-msgstr ""
+msgstr "mapa con %1 secciones"
 
 #: sfdb_ui.cc:610
 msgid "SoundFileBox: Could not tokenize string: "
-msgstr "SoundFileBox: Could not tokenize string: "
+msgstr "SoundFileBox: No se pudo tokenizar la cadena: "
 
 #: sfdb_ui.cc:660
 msgid "Audio and MIDI files"
@@ -15311,11 +15896,11 @@ msgstr "El puntuado más bajo"
 
 #: sfdb_ui.cc:763
 msgid "More"
-msgstr ""
+msgstr "Más"
 
 #: sfdb_ui.cc:767
 msgid "Similar"
-msgstr ""
+msgstr "Similar"
 
 #: sfdb_ui.cc:779
 msgid "ID"
@@ -15356,12 +15941,12 @@ msgstr "SoundFileBrowser: Could not tokenize string: "
 #: sfdb_ui.cc:1236
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1 más página de 100 resultados disponible"
+msgstr[1] "%1 más páginas de 100 resultados disponible"
 
 #: sfdb_ui.cc:1241
 msgid "No more results available"
-msgstr ""
+msgstr "No hay más resultados disponibles"
 
 #: sfdb_ui.cc:1305
 msgid "B"
@@ -15427,7 +16012,7 @@ msgstr ""
 
 #: sfdb_ui.cc:1759
 msgid "Use MIDI Tempo Map (if defined)"
-msgstr ""
+msgstr "Usar el Mapa de Tempo MIDI (si está definido)"
 
 #: sfdb_ui.cc:1774 sfdb_ui.cc:1929
 msgid "file timestamp"
@@ -15463,7 +16048,7 @@ msgstr "<b>Calidad de conversión</b>"
 
 #: sfdb_ui.cc:1806
 msgid "<b>MIDI Track Names</b>"
-msgstr ""
+msgstr "<b>Nombre de Pistas MIDI</b>"
 
 #: sfdb_ui.cc:1813
 msgid "<b>Instrument</b>"
@@ -15486,7 +16071,7 @@ msgstr "Rapidísima"
 
 #: shuttle_control.cc:65
 msgid "LogestShuttle|< +00 st"
-msgstr ""
+msgstr "< +00 st"
 
 #: shuttle_control.cc:71
 msgid "Shuttle speed control (Context-click for options)"
@@ -15514,41 +16099,41 @@ msgstr "Velocidad máxima"
 
 #: shuttle_control.cc:262
 msgid "Reset to 100%"
-msgstr ""
+msgstr "Reestablecer a 100%"
 
 #: shuttle_control.cc:654
 #, c-format
 msgid "< %+2d st"
-msgstr ""
+msgstr "< %+2d st"
 
 #: shuttle_control.cc:656
 #, c-format
 msgid "> %+2d st"
-msgstr ""
+msgstr "> %+2d st"
 
 #: soundcloud_export_selector.cc:43
 msgid "User Email"
-msgstr ""
+msgstr "Correo electrónico del usuario"
 
 #: soundcloud_export_selector.cc:44
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: soundcloud_export_selector.cc:45
 msgid "Make files public"
-msgstr ""
+msgstr "Hacer públicos los archivos"
 
 #: soundcloud_export_selector.cc:46
 msgid "Open uploaded files in browser"
-msgstr ""
+msgstr "Abrir archivos subidos en el navegador"
 
 #: soundcloud_export_selector.cc:47
 msgid "Make files downloadable"
-msgstr ""
+msgstr "Permitir que los archivos sean descargables"
 
 #: soundcloud_export_selector.cc:106
 msgid "%1: %2 of %3 bytes uploaded"
-msgstr ""
+msgstr "%1: %2 of %3 bytes subidos"
 
 #: splash.cc:104
 msgid "%1 loading ..."
@@ -15568,21 +16153,24 @@ msgstr "Azimut:"
 
 #: startup_fsm.cc:148 startup_fsm.cc:149
 msgid "Programming error: %1"
-msgstr ""
+msgstr "Error de programación: %1"
 
 #: startup_fsm.cc:327
 msgid ""
 "The audio/MIDI engine has stopped running unexpectedly.\n"
 "Something is probably wrong with your audio/MIDI device settings."
 msgstr ""
+"El motor de audio/MIDI ha dejado de funcionar inesperadamente.\n"
+"Probablemente haya algo mal con la configuración de tu dispositivo de audio/"
+"MIDI."
 
 #: startup_fsm.cc:558
 msgid "Cannot get existing session information from %1"
-msgstr ""
+msgstr "No se puede obtener información de la sesión existente de %1"
 
 #: startup_fsm.cc:876
 msgid "Pre-Release Warning"
-msgstr ""
+msgstr "Advertencia de Pre-Lanzamiento"
 
 #: startup_fsm.cc:880
 msgid ""
@@ -15614,6 +16202,36 @@ msgid ""
 "\n"
 "                http://ardour.org/support</span>\n"
 msgstr ""
+"<span size=\"x-large\" weight=\"bold\">Bienvenido a esta versión preliminar "
+"de %1 %2</span>\n"
+"\n"
+"<span size=\"large\">Todavía hay varios problemas y errores que deben ser "
+"solucionados, así como mejoras generales en el flujo de trabajo, antes de "
+"que esto pueda considerarse software de lanzamiento. Entonces, algunas "
+"pautas:\n"
+"\n"
+"1) Por favor, <b>NO</b> utilice este software con la expectativa de que sea "
+"estable o confiable, aunque puede serlo, dependiendo de su flujo de "
+"trabajo.\n"
+"2) Por favor, espere un informe útil sobre las nuevas funciones.\n"
+"3) <b>Por favor, NO utilicen los foros en ardour.org para reportar "
+"problemas</b>.\n"
+"4) <b>Por favor, NO reporten errores para estas versiones en desarrollo alfa "
+"en este momento</b>.\n"
+"   No hay clasificación de errores antes de que concluya el desarrollo "
+"inicial y reportar problemas de trabajo en progreso incompleto es en su "
+"mayoría inútil.\n"
+"5) Por favor, <b>ÚNETE</b> a nosotros en IRC para discusiones en tiempo real "
+"sobre %1 %2. Puedes acceder directamente desde el programa a través de la "
+"opción de menú Ayuda->Chat.\n"
+"6) Por favor, <b>HAGAN</b> envíos de parches para los problemas después de "
+"discutirlos en IRC.\n"
+"\n"
+"Toda la información sobre todo lo anterior se puede encontrar en la página "
+"de soporte en\n"
+"\n"
+"                http://ardour.org/support</span>\n"
+"\n"
 
 #: step_entry.cc:69
 msgid ">beat"
@@ -15637,7 +16255,7 @@ msgstr "silencio"
 
 #: step_entry.cc:74
 msgid "g-rest"
-msgstr ""
+msgstr "g-silencio"
 
 #: step_entry.cc:75
 msgid "back"
@@ -15773,7 +16391,7 @@ msgstr "Banco"
 
 #: step_entry.cc:464
 msgid "Step Entry: %1"
-msgstr ""
+msgstr "Entrada por pasos: %1"
 
 #: step_entry.cc:604
 msgid "Insert Note A"
@@ -16002,7 +16620,7 @@ msgstr "Notas con triple puntillo"
 #: stereo_panner.cc:134
 #, c-format
 msgid "L:%3d R:%3d Width:%d%%"
-msgstr ""
+msgstr "I:%3d D:%3d Ancho:%d%%"
 
 # Aquí estaba panorámica, pero pan se entiende perfectamente y es mucho más corto
 #: stereo_panner.cc:275
@@ -16039,31 +16657,31 @@ msgstr "Analizando"
 
 #: stripable_colorpicker.cc:110
 msgid "Color Selection: %1"
-msgstr ""
+msgstr "Sección de Color: %1"
 
 #: template_dialog.cc:198
 msgid "Session Templates"
-msgstr ""
+msgstr "Plantillas de Sesión"
 
 #: template_dialog.cc:201
 msgid "Track Templates"
-msgstr ""
+msgstr "Plantillas de Pista"
 
 #: template_dialog.cc:223
 msgid "Save Description"
-msgstr ""
+msgstr "Guardar Descripción"
 
 #: template_dialog.cc:227
 msgid "Export all"
-msgstr ""
+msgstr "Exportar todo"
 
 #: template_dialog.cc:233
 msgid "Template Name"
-msgstr ""
+msgstr "Nombre de Plantilla"
 
 #: template_dialog.cc:318
 msgid "Description not saved"
-msgstr ""
+msgstr "La descripción no se ha guardado"
 
 #: template_dialog.cc:320
 msgid ""
@@ -16071,34 +16689,37 @@ msgid ""
 "yet.\n"
 "Do you want to save it?"
 msgstr ""
+"La descripción de la plantilla \"%1\" ha sido modificada pero aún no se ha "
+"guardado.\n"
+"¿Quieres guardarla?"
 
 #: template_dialog.cc:391
 msgid "Template of name \"%1\" already exists"
-msgstr ""
+msgstr "La plantilla con el nombre \"%1\" ya existe"
 
 #: template_dialog.cc:433 template_dialog.cc:733 template_dialog.cc:844
 msgid "Could not parse template file \"%1\"."
-msgstr ""
+msgstr "No se pudo analizar el archivo de plantilla \"%1\"."
 
 #: template_dialog.cc:490
 msgid "Could not make tmpdir: %1"
-msgstr ""
+msgstr "No se pudo crear el directorio temporal: %1"
 
 #: template_dialog.cc:497
 msgid "Save Exported Template Archive"
-msgstr ""
+msgstr "Guardar archivo de plantilla exportada"
 
 #: template_dialog.cc:506 template_dialog.cc:583
 msgid "Template archives"
-msgstr ""
+msgstr "Archivos de plantillas"
 
 #: template_dialog.cc:520
 msgid "File exists"
-msgstr ""
+msgstr "El archivo existe"
 
 #: template_dialog.cc:521
 msgid "The file %1 already exists."
-msgstr ""
+msgstr "El archivo %1 ya existe."
 
 #: template_dialog.cc:524 utils.cc:850
 msgid "Overwrite"
@@ -16106,43 +16727,44 @@ msgstr "Reescribir"
 
 #: template_dialog.cc:563
 msgid "Exporting templates"
-msgstr ""
+msgstr "Exportando Plantillas"
 
 #: template_dialog.cc:576
 msgid "Import template archives"
-msgstr ""
+msgstr "Importar archivos de plantilla"
 
 #: template_dialog.cc:592
 msgid "Importing templates"
-msgstr ""
+msgstr "Importando plantillas"
 
 #: template_dialog.cc:752
 msgid "Could not write to new template file \"%1\"."
-msgstr ""
+msgstr "No se pudo escribir en el nuevo archivo de plantilla \"%1\"."
 
 #: template_dialog.cc:759
 msgid "Could not rename template directory from \"%1\" to \"%2\": %3"
 msgstr ""
+"No se pudo renombrar el directorio de plantillas de \"%1\" a \"%2\": %3"
 
 #: template_dialog.cc:858
 msgid "Could not rename state dir \"%1\" to \"%2\": %3"
-msgstr ""
+msgstr "No se pudo renombrar el directorio de estado \"%1\" a \"%2\": %3"
 
 #: template_dialog.cc:867
 msgid "Could not write new template file \"%1\"."
-msgstr ""
+msgstr "No se pudo escribir el nuevo archivo de plantilla \"%1\"."
 
 #: template_dialog.cc:875
 msgid "Could not remove old template file \"%1\": %2"
-msgstr ""
+msgstr "No se pudo eliminar el archivo de plantilla antiguo \"%1\": %2"
 
 #: template_dialog.cc:892
 msgid "Could not delete template file \"%1\": %2"
-msgstr ""
+msgstr "No se pudo eliminar el archivo de plantilla \"%1\": %2"
 
 #: tempo_dialog.cc:52 tempo_dialog.cc:72
 msgid "End Beats per Minute:"
-msgstr ""
+msgstr "Pulsación por Minuto Final:"
 
 #: tempo_dialog.cc:53 tempo_dialog.cc:73
 msgid "bar:"
@@ -16154,16 +16776,16 @@ msgstr "pulso:"
 
 #: tempo_dialog.cc:55 tempo_dialog.cc:75
 msgid "Pulse:"
-msgstr ""
+msgstr "Pulsación:"
 
 #: tempo_dialog.cc:56 tempo_dialog.cc:76
 msgid "Tap tempo"
-msgstr ""
+msgstr "Toque el Tempo"
 
 #: tempo_dialog.cc:101 tempo_dialog.cc:119 tempo_dialog.cc:120
 #: tempo_dialog.cc:533 tempo_dialog.cc:534
 msgid "one-hundred-twenty-eighth"
-msgstr "semi-semifusa"
+msgstr "cuartifusa"
 
 #: tempo_dialog.cc:103 tempo_dialog.cc:104 tempo_dialog.cc:517
 #: tempo_dialog.cc:518
@@ -16220,7 +16842,7 @@ msgstr "Música"
 
 #: tempo_dialog.cc:191
 msgid "Start Beats per Minute:"
-msgstr ""
+msgstr "Pulsos por Minuto Iniciales:"
 
 #: tempo_dialog.cc:200
 msgid "Tempo Type:"
@@ -16278,7 +16900,7 @@ msgstr "Nombre de pista/bus (doble clic para editar)"
 
 #: time_axis_view.cc:163
 msgid "This track is inactive. (right-click to activate)"
-msgstr ""
+msgstr "Esta pista está inactiva. (clic derecho para activar)"
 
 #: time_axis_view_item.cc:334
 #, fuzzy
@@ -16353,35 +16975,35 @@ msgstr "<b>Progreso</b>"
 
 #: time_selection.cc:41
 msgid "programming error: request for non-existent audio range (%1)!"
-msgstr "programming error: request for non-existent audio range (%1)!"
+msgstr "error de programación: ¡solicitud de rango de audio inexistente (%1)!"
 
 #: transform_dialog.cc:37
 msgid "this note's"
-msgstr ""
+msgstr "de esta nota"
 
 #: transform_dialog.cc:38
 msgid "the previous note's"
-msgstr ""
+msgstr "de la nota previa"
 
 #: transform_dialog.cc:39
 msgid "this note's index"
-msgstr ""
+msgstr "el índice de esta nota"
 
 #: transform_dialog.cc:40
 msgid "the number of notes"
-msgstr ""
+msgstr "el número de notas"
 
 #: transform_dialog.cc:41
 msgid "exactly"
-msgstr ""
+msgstr "exactamente"
 
 #: transform_dialog.cc:42
 msgid "a random number from"
-msgstr ""
+msgstr "un número aleatorio de"
 
 #: transform_dialog.cc:53
 msgid "equal steps from"
-msgstr ""
+msgstr "pasos idénticos desde"
 
 #: transform_dialog.cc:56
 msgid "note number"
@@ -16405,7 +17027,7 @@ msgstr "Transformar"
 
 #: transform_dialog.cc:89
 msgid "Set "
-msgstr "Establecer"
+msgstr "Establecer "
 
 #: transport_control_ui.cc:70
 msgid "Play from playhead"
@@ -16451,14 +17073,19 @@ msgid ""
 "Mouse-wheel to modify level\n"
 "Signal Level: %1 dBFS"
 msgstr ""
+"Activar/Desactivar metrónomo\n"
+"\n"
+"Haz clic derecho para acceder a las preferencias.\n"
+"Rueda del ratón para modificar el nivel\n"
+"Nivel de Señal: %1 dBFS"
 
 #: transport_masters_dialog.cc:53
 msgid "Add a new Transport Master"
-msgstr ""
+msgstr "Agregar un nuevo Maestro de Transporte"
 
 #: transport_masters_dialog.cc:54
 msgid "Keep rolling if sync is lost"
-msgstr ""
+msgstr "Sigue rodando si se pierde la sincronización."
 
 #: transport_masters_dialog.cc:73
 msgid ""
@@ -16466,32 +17093,42 @@ msgid ""
 "keep rolling at its current speed.\n"
 "<b>When disabled</b>, loss of transport master sync causes %1 to stop"
 msgstr ""
+"<b> Cuando está habilitado</b> si se pierde la señal de un maestro de "
+"transporte, %1 seguirá rodando a su velocidad actual.\n"
+"<b>Cuando está deshabilitado</b> la pérdida de la sincronización del maestro "
+"de transporte hace que %1 se detenga"
 
 #: transport_masters_dialog.cc:83
 msgid "Sync Position + Delta"
-msgstr ""
+msgstr "Posición de sincronización + Delta"
 
 #: transport_masters_dialog.cc:84
 msgid "Last Message + Age"
-msgstr ""
+msgstr "Último mensaje + Edad"
 
 #: transport_masters_dialog.cc:85
 msgid ""
 "Active\n"
 "Commands"
 msgstr ""
+"Comandos\n"
+"activos"
 
 #: transport_masters_dialog.cc:86
 msgid ""
 "Clock\n"
 "Synced"
 msgstr ""
+"Reloj\n"
+"Sincronizado"
 
 #: transport_masters_dialog.cc:87
 msgid ""
 "29.97/\n"
 "30"
 msgstr ""
+"29.97/\n"
+"30"
 
 #: transport_masters_dialog.cc:90
 msgid ""
@@ -16499,6 +17136,11 @@ msgid ""
 "the GUI or control surfaces when this transport master is in use. The "
 "default is not to allow any such commands when the master is in use."
 msgstr ""
+"Controla si se pueden enviar o no ciertos comandos relacionados con el "
+"transporte desde la GUI (Interfaz gráfica) o las superficies de control "
+"cuando este maestro de transporte está en uso. La configuración "
+"predeterminada es no permitir ningún comando de este tipo cuando el maestro "
+"está en uso."
 
 #: transport_masters_dialog.cc:94
 msgid ""
@@ -16512,6 +17154,16 @@ msgid ""
 "vendors use that rate - despite it being against the specs - because the "
 "variant of using exactly 29.97 fps has zero timecode drift.\n"
 msgstr ""
+"<b>Cuando está habilitado</b>  se asume que la fuente de código de tiempo "
+"externo utiliza 29.97 fps en lugar de 30000/1001.\n"
+"SMPTE 12M-1999 especifica 29.97df como 30000/1001. La especificación "
+"menciona además que el código de tiempo de muestreo de caída tiene un error "
+"acumulado de -86 ms durante un período de 24 horas.\n"
+"El código de tiempo de muestra de caída compensaría exactamente una tasa de "
+"fotogramas de color NTSC de 30 * 0.9990. (ie 29.970000). Esa no es la tasa "
+"real. Sin embargo, algunos proveedores utilizan esa tasa - a pesar de que va "
+"en contra de las especificaciones - porque la variante de usar exactamente "
+"29.97 fps no tiene desviación de tiempo de código.\n"
 
 #: transport_masters_dialog.cc:102
 msgid ""
@@ -16519,38 +17171,45 @@ msgid ""
 "clock synced to the audio interface\n"
 "being used by %1."
 msgstr ""
+"<b>Cuando está habilitado</b> se asume que la fuente de código de tiempo "
+"externa está sincronizada con el reloj de muestra de la interfaz de audio "
+"utilizada por %1.Cuando está habilitado, se asume que la fuente de código de "
+"tiempo externo está sincronizada con el reloj de muestras de la interfaz de "
+"audio utilizada por %1."
 
 #: transport_masters_dialog.cc:165
 msgid "New transport master not added - check error log for details"
 msgstr ""
+"Nuevo maestro de transporte no añadido - consulte el registro de errores "
+"para más detalles"
 
 #: transport_masters_dialog.cc:502
 msgid "Accept start/stop commands"
-msgstr ""
+msgstr "Aceptar comandos de inicio/parada"
 
 #: transport_masters_dialog.cc:507
 msgid "Accept speed-changing commands"
-msgstr ""
+msgstr "Aceptar comandos para cambiar la velocidad"
 
 #: transport_masters_dialog.cc:512
 msgid "Accept locate commands"
-msgstr ""
+msgstr "Aceptar comandos de localización"
 
 #: transport_masters_dialog.cc:666
 msgid "%1 %2"
-msgstr ""
+msgstr "%1 %2"
 
 #: transport_masters_dialog.cc:732
 msgid "Add Transport Master"
-msgstr ""
+msgstr "Agregar Maestro de Transporte"
 
 #: transpose_dialog.cc:28
 msgid "Transpose MIDI"
-msgstr "Transportar MIDI"
+msgstr "Transponer MIDI"
 
 #: transpose_dialog.cc:53 virtual_keyboard_window.cc:183
 msgid "Transpose"
-msgstr "Transportar"
+msgstr "Transponer"
 
 #: ui_config.cc:227 ui_config.cc:417
 msgid "Loading default ui configuration file %1"
@@ -16589,11 +17248,11 @@ msgstr "el archivo de color \"%1\" no se pudo cargar."
 
 #: ui_config.cc:324
 msgid "Color file for %1 not found along %2"
-msgstr ""
+msgstr "Archivo de color para %1 no encontrado en %2"
 
 #: ui_config.cc:399 ui_config.cc:481
 msgid "Color file %1 not saved"
-msgstr "No se guardó el archivo de color %1."
+msgstr "No se guardó el archivo de color %1"
 
 #: ui_config.cc:434
 msgid "Loading user ui configuration file %1"
@@ -16613,11 +17272,11 @@ msgstr ""
 msgid "could not find any ui configuration file, canvas will look broken."
 msgstr ""
 "no se puedo encontrar ningún archivo de configuración de interfaz de usuario "
-"\"%1\""
+"\"%1."
 
 #: ui_config.cc:471
 msgid "Config file %1 not saved"
-msgstr "No se guardó el archivo de configuración %1."
+msgstr "No se guardó el archivo de configuración %1"
 
 #: ui_config.cc:711
 msgid "Color %1 not found"
@@ -16631,17 +17290,19 @@ msgstr ""
 
 #: ui_config.cc:787
 msgid "Loading ui configuration file %1"
-msgstr ""
+msgstr "Cargando el archivo de configuración de la interfaz de usuario %1"
 
 #: utils.cc:121
 msgid ""
 "The current operation is not possible because of an error communicating with "
 "the audio hardware."
 msgstr ""
+"La operación actual no es posible debido a un error de comunicación con el "
+"hardware de audio."
 
 #: utils.cc:127
 msgid "Configure Hardware"
-msgstr ""
+msgstr "Configurar hardware"
 
 #: utils.cc:166 utils.cc:209
 msgid "bad XPM header %1"
@@ -16653,11 +17314,13 @@ msgstr "No se pudo encontrar el archivo XPM para %1."
 
 #: utils.cc:472 utils.cc:502 utils.cc:522
 msgid "default"
-msgstr ""
+msgstr "predeterminado"
 
 #: utils.cc:523
 msgid "icon \"%1\" not found for icon set \"%2\", fallback to default"
 msgstr ""
+"icono \"%1\" no encontrado para el conjunto de iconos \"%2\", volviendo al "
+"predeterminado"
 
 #: utils.cc:530
 msgid "cannot find icon image for %1 using %2"
@@ -16677,7 +17340,7 @@ msgstr "M"
 
 #: vca_master_strip.cc:81 vca_time_axis.cc:65
 msgid "Mute slaves"
-msgstr ""
+msgstr "Enmudecer esclavos"
 
 #: vca_master_strip.cc:85
 msgid "Hide this VCA strip"
@@ -16701,15 +17364,15 @@ msgstr "S"
 
 #: vca_master_strip.cc:466
 msgid "Assign Selected Channels"
-msgstr ""
+msgstr "Asignar Canales Seleccionados"
 
 #: vca_master_strip.cc:467
 msgid "Drop Selected Channels"
-msgstr ""
+msgstr "Eliminar Canales Seleccionados"
 
 #: vca_master_strip.cc:469 vca_time_axis.cc:465
 msgid "Drop All Slaves"
-msgstr ""
+msgstr "Eliminar todos los esclavos"
 
 #: vca_master_strip.cc:492
 msgid "Click to show normal mixer"
@@ -16717,15 +17380,15 @@ msgstr "Pulsa para mostrar mezclador normal"
 
 #: vca_master_strip.cc:503
 msgid "Do you really want to remove this VCA?"
-msgstr ""
+msgstr "¿Realmente quieres eliminar este VCA?"
 
 #: vca_master_strip.cc:511
 msgid "This action cannot be undone."
-msgstr ""
+msgstr "Esta acción no se puede deshacer."
 
 #: virtual_keyboard_window.cc:45
 msgid "Virtual MIDI Keyboard"
-msgstr ""
+msgstr "Teclado MIDI Virtual"
 
 #: virtual_keyboard_window.cc:46
 msgid "Panic"
@@ -16733,37 +17396,43 @@ msgstr "Pánico"
 
 #: virtual_keyboard_window.cc:112
 msgid "Set the MIDI Channel of the produced MIDI events"
-msgstr ""
+msgstr "Establecer el canal MIDI de los eventos MIDI producidos"
 
 #: virtual_keyboard_window.cc:113
 msgid ""
 "The center octave, and lowest octave for keyboard control. Change with Arrow "
 "left/right."
 msgstr ""
+"La octava central y la octava más baja para el control del teclado. Cambia "
+"con la flecha izquierda/derecha."
 
 #: virtual_keyboard_window.cc:114
 msgid "Available octave range, centered around the key-octave."
-msgstr ""
+msgstr "Rango de octavas disponible, centrado alrededor de la octava clave."
 
 #: virtual_keyboard_window.cc:115
 msgid ""
 "The velocity to use with keyboard control. Use mouse-scroll for fine-grained "
 "control"
 msgstr ""
+"La velocidad a usar con el control del teclado. Usa el desplazamiento del "
+"ratón para un control más preciso"
 
 #: virtual_keyboard_window.cc:116
 msgid ""
 "Chromatic transpose note events. Notes transposed outside the range of "
 "0,,127 are discarded."
 msgstr ""
+"Transponer eventos de notas cromáticas. Las notas transpuestas fuera del "
+"rango de 0 a 127 se descartan."
 
 #: virtual_keyboard_window.cc:118
 msgid "Send MIDI Panic message for current channel"
-msgstr ""
+msgstr "Enviar mensaje MIDI de pánico para el canal actual"
 
 #: virtual_keyboard_window.cc:435
 msgid "CC-%1: "
-msgstr ""
+msgstr "CC-%1: "
 
 #: virtual_keyboard_window.cc:510
 msgid ""
@@ -16773,18 +17442,23 @@ msgid ""
 "F1-F4 and arrow-up/down keys jump\n"
 "to select values."
 msgstr ""
+"Pitchbend: %1\n"
+"Usa el mouse para arrastrar en modo de resorte,\n"
+"la rueda del mouse para ajustes persistentes.\n"
+"Las teclas F1-F4 y las flechas arriba/abajo saltan\n"
+"para seleccionar valores."
 
 #: virtual_keyboard_window.cc:527
 msgid "Modulation: %1"
-msgstr ""
+msgstr "Modulación: %1"
 
 #: add_video_dialog.cc:59
 msgid "Set Video Track"
-msgstr ""
+msgstr "Establecer pista de video"
 
 #: add_video_dialog.cc:67
 msgid "Open Video Monitor Window"
-msgstr ""
+msgstr "Abrir ventana de monitor de video"
 
 #: add_video_dialog.cc:68
 msgid "Adjust Session Framerate to Match Video Framerate"
@@ -16812,41 +17486,48 @@ msgstr "Frame rate:"
 
 #: add_video_dialog.cc:167
 msgid "Aspect Ratio:"
-msgstr "Relación de aspecto"
+msgstr "Relación de aspecto."
 
 #: add_video_dialog.cc:253
 msgid "VideoServerIndex"
-msgstr ""
+msgstr "�ndiceDelServidorDeVideo"
 
 #: add_video_dialog.cc:690
 msgid " %1 fps"
-msgstr ""
+msgstr " %1 fps"
 
 #: vca_time_axis.cc:70
 msgid "VCA|D"
-msgstr ""
+msgstr "D"
 
 #: vca_time_axis.cc:71
 msgid "Unassign all slaves"
-msgstr ""
+msgstr "Desasignar todos los esclavos"
 
 #: video_timeline.cc:461
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
+"Error al analizar la información del archivo de video. ¿Está funcionando el "
+"Servidor de Video? ¿Es el archivo legible por el Servidor de Video? "
+"¿Coincide el docroot? ¿Es un archivo de video?"
 
 #: video_timeline.cc:499
 msgid ""
 "Failed to set session-framerate: '%1' does not have a corresponding option "
 "setting in %2."
 msgstr ""
+"Error al establecer la tasa de fotogramas de la sesión: '%1' no tiene una "
+"configuración de opción correspondiente en %2."
 
 #: video_timeline.cc:507
 msgid ""
 "Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
 "vs '%3'"
 msgstr ""
+"La tasa de fotogramas del archivo de video no es igual a la tasa de "
+"fotogramas del código de tiempo de la sesión %1: '%2' vs '%3'"
 
 #: video_timeline.cc:580
 msgid ""
@@ -16854,6 +17535,9 @@ msgid ""
 "means that the video server was not started by %1 and uses a different "
 "document-root."
 msgstr ""
+"Desajuste en el docroot del servidor de video. %1: '%2', servidor de video: "
+"'%3'. Esto generalmente significa que el servidor de video no fue iniciado "
+"por %1 y utiliza un documento-raíz diferente."
 
 #: video_timeline.cc:717
 msgid ""
@@ -16864,20 +17548,29 @@ msgid ""
 "\n"
 "see also http://manual.ardour.org/video-timeline/setup/"
 msgstr ""
+"No se encontró el monitor de video 'xjadeo'. Por favor, instale http://"
+"xjadeo.sf.net/ (se puede especificar una ruta personalizada a xjadeo "
+"configurando la variable de entorno XJREMOTE). Debería apuntar a una "
+"aplicación compatible con la interfaz de control remoto de xjadeo "
+"'xjremote'.\n"
+"\n"
+"ver también http://manual.ardour.org/video-timeline/setup/"
 
 #: video_timeline.cc:732
 msgid "Video-monitor 'xjadeo' cannot be launched."
-msgstr ""
+msgstr "El monitor de video 'xjadeo' no se puede iniciar."
 
 #: video_timeline.cc:764
 msgid ""
 "Video-monitor 'xjadeo' is too old. Please install xjadeo version 0.7.7 or "
 "later. http://xjadeo.sf.net/"
 msgstr ""
+"El monitor de video 'xjadeo' es demasiado antiguo. Por favor, instale la "
+"versión 0.7.7 o posterior de xjadeo. http://xjadeo.sf.net/"
 
 #: video_monitor.cc:294
 msgid "Video Monitor: File Not Found."
-msgstr ""
+msgstr "Monitor de Video: Archivo No Encontrado."
 
 #: transcode_ffmpeg.cc:58
 msgid ""
@@ -16896,10 +17589,25 @@ msgid ""
 "\n"
 "see also http://manual.ardour.org/video-timeline/setup/"
 msgstr ""
+"No se encontró la instalación de ffmpeg en este sistema.\n"
+"%1 requiere ffmpeg y ffprobe de ffmpeg.org - versión 1.1 o más reciente.\n"
+"La importación y exportación de video no es posible hasta que instales las "
+"herramientas.\n"
+"\n"
+"Las herramientas están incluidas en las versiones %1 de ardour.org y también "
+"están disponibles con el servidor de video en http://x42.github.com/harvid/\n"
+"\n"
+"Importante: los archivos deben instalarse en $PATH y nombrarse ffmpeg_harvid "
+"y ffprobe_harvid.\n"
+"Si ya tienes una instalación adecuada de ffmpeg en tu sistema, te "
+"recomendamos crear enlaces simbólicos desde ffmpeg a ffmpeg_harvid y desde "
+"ffprobe a ffprobe_harvid.\n"
+"\n"
+"ver también http://manual.ardour.org/video-timeline/setup/"
 
 #: transcode_video_dialog.cc:59
 msgid "Transcode/Import Video File "
-msgstr ""
+msgstr "Transcodificar/Importar Archivo de Video "
 
 #: transcode_video_dialog.cc:61
 msgid "Output File:"
@@ -16915,11 +17623,11 @@ msgstr "Altura = "
 
 #: transcode_video_dialog.cc:69
 msgid "Extract LTC from audio and align video"
-msgstr ""
+msgstr "Extraer LTC (Código de Tiempo) del audio y alinear el video"
 
 #: transcode_video_dialog.cc:70
 msgid "Manual Override"
-msgstr ""
+msgstr "Anulación manual"
 
 #: transcode_video_dialog.cc:74 export_video_dialog.cc:105
 msgid "Debug Mode: Print ffmpeg command and output to stdout."
@@ -16942,6 +17650,8 @@ msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
+"No se puede leer la información del archivo. Es probable que '%1' no sea un "
+"archivo de video válido o un códec o formato de video no compatible."
 
 #: transcode_video_dialog.cc:140
 msgid "FPS:"
@@ -16966,10 +17676,12 @@ msgstr "<b>Importar configuración</b>"
 #: transcode_video_dialog.cc:187
 msgid "Reference from Current Location (Previously Transcoded Files Only)"
 msgstr ""
+"Referencia desde la ubicación actual (Solo archivos previamente "
+"transcodificados)"
 
 #: transcode_video_dialog.cc:188
 msgid "Import/Transcode Video to Session"
-msgstr ""
+msgstr "Importar/Transcodificar Video a la Sesión"
 
 #: transcode_video_dialog.cc:191 transcode_video_dialog.cc:201
 msgid "Do Not Import Video (Audio Import Only)"
@@ -16989,11 +17701,11 @@ msgstr "Anchura original"
 
 #: transcode_video_dialog.cc:248
 msgid "Bitrate (KBit/s):"
-msgstr ""
+msgstr "Bitrate (KBit/s):"
 
 #: transcode_video_dialog.cc:253
 msgid "Extract Audio:"
-msgstr "Extraer audio"
+msgstr "Extraer audio."
 
 #: transcode_video_dialog.cc:258
 msgid "No Audio Track Present"
@@ -17021,7 +17733,7 @@ msgstr "Transcoding Failed."
 
 #: transcode_video_dialog.cc:545
 msgid "Save Transcoded Video File"
-msgstr ""
+msgstr "Guardar archivo de video transcodificado"
 
 #: video_server_dialog.cc:57
 msgid "Launch Video Server"
@@ -17029,11 +17741,11 @@ msgstr "Lanzar el servidor de video"
 
 #: video_server_dialog.cc:58
 msgid "Server Executable:"
-msgstr ""
+msgstr "Ejecutable del servidor:"
 
 #: video_server_dialog.cc:60
 msgid "Server Docroot:"
-msgstr ""
+msgstr "Docroot del servidor:"
 
 #: video_server_dialog.cc:66
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
@@ -17049,18 +17761,24 @@ msgid ""
 "\n"
 "see also http://manual.ardour.org/video-timeline/setup/"
 msgstr ""
+"No se puede encontrar el servidor de video externo 'harvid'.\n"
+"La herramienta está incluida en las versiones %1 de ardour.org, "
+"alternativamente puedes descargarla desde http://x42.github.com/harvid/ o "
+"adquirirla desde tu distribución.\n"
+"\n"
+"ver también http://manual.ardour.org/video-timeline/setup/"
 
 #: video_server_dialog.cc:136
 msgid "Listen Address:"
-msgstr ""
+msgstr "Dirección de Escucha:"
 
 #: video_server_dialog.cc:141
 msgid "Listen Port:"
-msgstr ""
+msgstr "Puerto de Escucha:"
 
 #: video_server_dialog.cc:146
 msgid "Cache Size:"
-msgstr ""
+msgstr "Tamaño de Cache:"
 
 #: video_server_dialog.cc:152
 msgid ""
@@ -17068,36 +17786,43 @@ msgid ""
 "The server configured in Edit -> Preferences -> Video is not reachable.\n"
 "Do you want %1 to launch 'harvid' on this machine?"
 msgstr ""
+"%1 depende de un servidor de video externo para la línea de tiempo de "
+"video.\n"
+"El servidor configurado en Editar -> Preferencias -> Video no es accesible.\n"
+"¿Quieres que %1 inicie 'harvid' en esta máquina?"
 
 #: video_server_dialog.cc:191
 msgid "Set Video Server Executable"
-msgstr ""
+msgstr "Establecer ejecutable del servidor de video"
 
 #: video_server_dialog.cc:211
 msgid "Server docroot"
-msgstr ""
+msgstr "Docroot del servidor"
 
 #: utils_videotl.cc:67
 msgid "Destination is outside Video Server's docroot. "
-msgstr ""
+msgstr "Destination is outside Video Server's docroot. "
 
 #: utils_videotl.cc:68
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
+"La ruta del archivo de destino está fuera del docroot del Servidor de Video. "
+"El archivo no será legible por el Servidor de Video. ¿Quieres continuar de "
+"todos modos?"
 
 #: utils_videotl.cc:83
 msgid "Confirm Overwrite"
-msgstr ""
+msgstr "Confirmar Sobrescritura"
 
 #: utils_videotl.cc:93 utils_videotl.cc:109
 msgid "Cannot create video folder \"%1\" (%2)"
-msgstr ""
+msgstr "No se puede crear la carpeta de videos \"%1\" (%2)"
 
 #: export_video_dialog.cc:73
 msgid "Export Video File "
-msgstr "Exportar archivo de video"
+msgstr "Exportar archivo de video "
 
 #: export_video_dialog.cc:84
 msgid "Video:"
@@ -17129,15 +17854,17 @@ msgstr "Optimización de códecs:"
 
 #: export_video_dialog.cc:100
 msgid "Deinterlace"
-msgstr ""
+msgstr "Desentrelazar"
 
 #: export_video_dialog.cc:101
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
-msgstr ""
+msgstr "Usar [2] B-frames (MPEG 2 o 4 únicamente)"
 
 #: export_video_dialog.cc:102
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
+"Sobrescribir FPS (El valor predeterminado es mantener el FPS del archivo de "
+"video de entrada):"
 
 #: export_video_dialog.cc:103
 msgid "Include Session Metadata"
@@ -17153,7 +17880,7 @@ msgstr ""
 
 #: export_video_dialog.cc:132
 msgid "<b>Output:</b> (file extension defines format)"
-msgstr ""
+msgstr "<b>Salida:</b> (la extensión de archivo define el formato)"
 
 #: export_video_dialog.cc:142
 msgid "<b>Input Video:</b>"
@@ -17189,12 +17916,12 @@ msgstr "Audio KBit/s:"
 
 #: export_video_dialog.cc:187
 msgid "Audio Samplerate:"
-msgstr ""
+msgstr "Frecuencia de muestreo de audio:"
 
 #: export_video_dialog.cc:220 export_video_dialog.cc:228
 #: export_video_dialog.cc:843 export_video_dialog.cc:846
 msgid "(default for format)"
-msgstr ""
+msgstr "(predeterminado para el formato)"
 
 #: export_video_dialog.cc:238 export_video_dialog.cc:249
 #: export_video_dialog.cc:850 export_video_dialog.cc:859
@@ -17203,19 +17930,20 @@ msgstr "Predeterminado"
 
 #: export_video_dialog.cc:250 export_video_dialog.cc:853
 msgid "(retain)"
-msgstr ""
+msgstr "(retener)"
 
 #: export_video_dialog.cc:342
 msgid "from session start marker to session end marker"
 msgstr ""
+"desde el marcador de inicio de sesión hasta el marcador de fin de sesión"
 
 #: export_video_dialog.cc:345
 msgid "from 00:00:00:00 to the video end"
-msgstr ""
+msgstr "desde 00:00:00:00 hasta el final del video"
 
 #: export_video_dialog.cc:347
 msgid "from video start to video end"
-msgstr ""
+msgstr "desde el inicio del video hasta el final del video"
 
 #: export_video_dialog.cc:350
 msgid "Selected range"
@@ -17238,14 +17966,18 @@ msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
+"Exportar video: No se puede consultar la duración del archivo de video, "
+"usando la duración de la línea de tiempo en su lugar."
 
 #: export_video_dialog.cc:747
 msgid "Export Video: export-range does not include video."
-msgstr ""
+msgstr "Exportar video: el rango de exportación no incluye video."
 
 #: export_video_dialog.cc:760
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
+"Exportar video: No hay puertos de salida maestra para conectar para la "
+"exportación de audio"
 
 #: export_video_dialog.cc:803
 msgid "Encoding Video..."
@@ -17253,19 +17985,19 @@ msgstr "Encoding video..."
 
 #: export_video_dialog.cc:823
 msgid "Export Video: Video input file cannot be read."
-msgstr ""
+msgstr "Exportar video: No se puede leer el archivo de entrada de video."
 
 #: export_video_dialog.cc:929
 msgid "Encoding Video.. Pass 1/2"
-msgstr ""
+msgstr "Codificando video.. Pase 1/2"
 
 #: export_video_dialog.cc:941
 msgid "Encoding Video.. Pass 2/2"
-msgstr ""
+msgstr "Codificando video.. Pase 2/2"
 
 #: export_video_dialog.cc:1025
 msgid "Transcoding failed."
-msgstr ""
+msgstr "La transcodificación falló."
 
 #: export_video_dialog.cc:1261 export_video_dialog.cc:1282
 msgid "Save Exported Video File"
@@ -17273,7 +18005,7 @@ msgstr "Guardar archivo de video exportado"
 
 #: export_video_infobox.cc:39
 msgid "Video Export Info"
-msgstr "Ver info de la exportación"
+msgstr "Ver información de la exportación"
 
 #: export_video_infobox.cc:40
 msgid "Do Not Show This Dialog Again (Reset in Edit > Preferences > Video)."
@@ -17283,7 +18015,7 @@ msgstr ""
 
 #: export_video_infobox.cc:52
 msgid "<b>Video Export Info</b>"
-msgstr ""
+msgstr "<b>Información de Exportación de Video</b>"
 
 #: export_video_infobox.cc:57
 msgid ""
@@ -17296,6 +18028,15 @@ msgid ""
 "\n"
 "Open Manual in Browser? "
 msgstr ""
+"%1 no incluye licencias comerciales para la codificación de audio/video. "
+"Visite mpegla.com para obtener información sobre la concesión de licencias "
+"para varios códecs de audio/video.\n"
+"\n"
+"La codificación de video es una tarea no trivial con muchos detalles.\n"
+"\n"
+"Por favor, consulte el manual en %2/video-timeline/operations/#export.\n"
+"\n"
+"¿Abrir el manual en el navegador? "
 
 #~ msgid "Audio+MIDI Tracks"
 #~ msgstr "Pistas de audio+MIDI"
@@ -17502,13 +18243,13 @@ msgstr ""
 #~ msgstr "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 
 #~ msgid ""
-#~ "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
-#~ "%<PRIu32>%%</span> <span foreground=\"green\">c:</span><span foreground="
-#~ "\"%s\">%<PRIu32>%%</span>"
+#~ "Buffers: <span foreground=\"green\">p:</span><span "
+#~ "foreground=\"%s\">%<PRIu32>%%</span> <span foreground=\"green\">c:</"
+#~ "span><span foreground=\"%s\">%<PRIu32>%%</span>"
 #~ msgstr ""
-#~ "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
-#~ "%<PRIu32>%%</span> <span foreground=\"green\">c:</span><span foreground="
-#~ "\"%s\">%<PRIu32>%%</span>"
+#~ "Buffers: <span foreground=\"green\">p:</span><span "
+#~ "foreground=\"%s\">%<PRIu32>%%</span> <span foreground=\"green\">c:</"
+#~ "span><span foreground=\"%s\">%<PRIu32>%%</span>"
 
 #~ msgid "Disk: <span foreground=\"green\">Unknown</span>"
 #~ msgstr "Disco: <span foreground=\"green\">Desconocido</span>"
diff --git a/gtk2_ardour/port_matrix_labels.h b/gtk2_ardour/port_matrix_labels.h
index be64e6b306..c3e7161793 100644
--- a/gtk2_ardour/port_matrix_labels.h
+++ b/gtk2_ardour/port_matrix_labels.h
@@ -18,11 +18,9 @@
 
 #pragma once
 
-#include "port_matrix_component.h"
+#include "ardour/bundle.h"
 
-namespace ARDOUR {
-	class BundleChannel;
-}
+#include "port_matrix_component.h"
 
 class PortMatrixLabels : public PortMatrixComponent
 {
diff --git a/gtk2_ardour/preference-metadata b/gtk2_ardour/preference-metadata
index 2416569c91..10e54307ee 100644
--- a/gtk2_ardour/preference-metadata
+++ b/gtk2_ardour/preference-metadata
@@ -10,9 +10,6 @@
 # [never-do-that-thing]
 #   thing that action prevent never stop otherthing
 #
-# The file is processed via tools/process-metadata to create build/gtk2_ardour/configuration_metadata.h which is then incorporated via an #include directive
-# within gtk2_ardour/ui_config.cc
-#
 # Whenever a new preference variable is added to the source code, its name should also be added here.
 #
 # GUIDANCE:
@@ -20,6 +17,12 @@
 #   use "synchronization" rather than sync, because that will match both "sync" and "synchronization". For languages that create plurals with a suffix,
 #   prefer plural forms for the same reason.
 #
+# This file is processed automatically when invoking a custom tool manually:
+#
+#   tools/process-metadata gtk2_ardour/preference-metadata > gtk2_ardour/configuration_metadata.inc.h
+#
+# The generated file is incorporated via an #include directive within gtk2_ardour/ui_config.cc .
+
 [SECTION:UI]
 
 [action-table-columns]
@@ -623,7 +626,6 @@
    osc open sound control
 [use-plugin-own-gui]
    plugins GUI editor prefer use own
-[use-tranzport]
 [use-vst3]
    plugins vst3
 [use-windows-vst]
diff --git a/gtk2_ardour/prh.h b/gtk2_ardour/prh.h
index fc9a7f6215..f80c6f4477 100644
--- a/gtk2_ardour/prh.h
+++ b/gtk2_ardour/prh.h
@@ -26,6 +26,8 @@
 
 #include "canvas/rectangle.h"
 
+#include <gtkmm/adjustment.h>
+
 namespace ARDOUR {
 	class MidiTrack;
 }
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index ad3666c006..514d7ede13 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -715,7 +715,7 @@ ProcessorEntry::show_all_controls ()
 		(*i)->set_visible (true);
 	}
 
-	_parent->update_gui_object_state (this);
+	_parent->update_gui_object_state (this, true);
 }
 
 void
@@ -725,7 +725,7 @@ ProcessorEntry::hide_all_controls ()
 		(*i)->set_visible (false);
 	}
 
-	_parent->update_gui_object_state (this);
+	_parent->update_gui_object_state (this, true);
 }
 
 void
@@ -942,14 +942,14 @@ ProcessorEntry::toggle_inline_display_visibility ()
 	} else {
 		_plugin_display->show();
 	}
-	_parent->update_gui_object_state (this);
+	_parent->update_gui_object_state (this, true);
 }
 
 void
 ProcessorEntry::toggle_control_visibility (Control* c)
 {
 	c->set_visible (!c->visible ());
-	_parent->update_gui_object_state (this);
+	_parent->update_gui_object_state (this, true);
 }
 
 Menu*
@@ -4691,7 +4691,7 @@ ProcessorBox::entry_gui_object_state (ProcessorEntry* entry)
 }
 
 void
-ProcessorBox::update_gui_object_state (ProcessorEntry* entry)
+ProcessorBox::update_gui_object_state (ProcessorEntry* entry, bool emit)
 {
 	XMLNode* proc = entry_gui_object_state (entry);
 	if (!proc) {
@@ -4701,6 +4701,12 @@ ProcessorBox::update_gui_object_state (ProcessorEntry* entry)
 	/* XXX: this is a bit inefficient; we just remove all child nodes and re-add them */
 	proc->remove_nodes_and_delete (X_("Object"));
 	entry->add_control_state (proc);
+
+	/* notify other strips to update */
+	if (emit && _route) {
+		PBD::Unwinder<bool> uw (no_processor_redisplay, true);
+		_route->processors_changed (RouteProcessorChange ());
+	}
 }
 
 bool
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 7e0b09b199..1391a99e6c 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -461,7 +461,7 @@ public:
 	void edit_processor (std::shared_ptr<ARDOUR::Processor>);
 	void generic_edit_processor (std::shared_ptr<ARDOUR::Processor>);
 
-	void update_gui_object_state (ProcessorEntry *);
+	void update_gui_object_state (ProcessorEntry *, bool emit = false);
 
 	sigc::signal<void,std::shared_ptr<ARDOUR::Processor> > ProcessorSelected;
 	sigc::signal<void,std::shared_ptr<ARDOUR::Processor> > ProcessorUnselected;
diff --git a/gtk2_ardour/rec_info_box.cc b/gtk2_ardour/rec_info_box.cc
index 3725717a66..df30121cab 100644
--- a/gtk2_ardour/rec_info_box.cc
+++ b/gtk2_ardour/rec_info_box.cc
@@ -116,7 +116,9 @@ DurationInfoBox::dpi_reset ()
 	_layout_value->get_pixel_size (wv, hv);
 	_width  = 8 + wv;
 	_height = 4 + hv;
-	queue_resize ();
+	if (get_realized ()) {
+		queue_resize ();
+	}
 }
 
 void
@@ -198,7 +200,9 @@ XrunInfoBox::dpi_reset ()
 	_layout_value->get_pixel_size (wv, hv);
 	_width  = 8 + wv;
 	_height = 8 + hv;
-	queue_resize ();
+	if (get_realized ()) {
+		queue_resize ();
+	}
 }
 
 void
@@ -291,7 +295,9 @@ RemainInfoBox::dpi_reset ()
 	_width  = 8 + std::max (wl, wv);
 	_height = 2 + hv + 2 + hl + 2;
 
-	queue_resize ();
+	if (get_realized ()) {
+		queue_resize ();
+	}
 }
 
 void
diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
index 687f0ccace..eb988a944f 100644
--- a/gtk2_ardour/region_layering_order_editor.h
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -31,6 +31,8 @@
 
 #include "ardour_window.h"
 #include "audio_clock.h"
+#include "region_view.h"
+#include "time_axis_view.h"
 
 class PublicEditor;
 
diff --git a/gtk2_ardour/region_peak_cursor.h b/gtk2_ardour/region_peak_cursor.h
index a7d9497479..555ddbbf4e 100644
--- a/gtk2_ardour/region_peak_cursor.h
+++ b/gtk2_ardour/region_peak_cursor.h
@@ -36,7 +36,7 @@ public:
 	RegionPeakCursor (ArdourCanvas::Item*);
 	~RegionPeakCursor ();
 
-	void set (AudioRegionView*, samplepos_t, samplecnt_t);
+	void set (AudioRegionView*, samplepos_t, ARDOUR::samplecnt_t);
 	void hide ();
 	bool visible () const;
 
diff --git a/gtk2_ardour/route_group_menu.h b/gtk2_ardour/route_group_menu.h
index 1f9b201abe..58abbec078 100644
--- a/gtk2_ardour/route_group_menu.h
+++ b/gtk2_ardour/route_group_menu.h
@@ -22,6 +22,9 @@
 #include "ardour/route_group.h"
 #include "ardour/session_handle.h"
 
+#include <gtkmm/menu.h>
+#include <gtkmm/radiomenuitem.h>
+
 class RouteGroupDialog;
 
 class RouteGroupMenu : public ARDOUR::SessionHandlePtr
diff --git a/gtk2_ardour/route_processor_selection.h b/gtk2_ardour/route_processor_selection.h
index 8c2699d3d2..da0af00b49 100644
--- a/gtk2_ardour/route_processor_selection.h
+++ b/gtk2_ardour/route_processor_selection.h
@@ -21,6 +21,8 @@
 #pragma once
 
 #include <vector>
+
+#include "pbd/property_basics.h"
 #include "pbd/signals.h"
 
 #include "processor_selection.h"
diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h
index 0d72fc7edf..701b6276d5 100644
--- a/gtk2_ardour/session_dialog.h
+++ b/gtk2_ardour/session_dialog.h
@@ -41,6 +41,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "temporal/domain_provider.h"
 
diff --git a/gtk2_ardour/simple_progress_dialog.h b/gtk2_ardour/simple_progress_dialog.h
index f9d50a9f6c..2adeb55e22 100644
--- a/gtk2_ardour/simple_progress_dialog.h
+++ b/gtk2_ardour/simple_progress_dialog.h
@@ -44,7 +44,7 @@ public:
 		get_vbox()->pack_start (*cancel_button, Gtk::PACK_SHRINK);
 	}
 
-	void update_progress (samplecnt_t c, samplecnt_t t) {
+	void update_progress (ARDOUR::samplecnt_t c, ARDOUR::samplecnt_t t) {
 		pbar->set_fraction ((float) c / (float) t);
 		// see also ARDOUR_UI::gui_idle_handler();
 		int timeout = 30;
diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h
index 78688d17dd..3d22b22424 100644
--- a/gtk2_ardour/soundcloud_export_selector.h
+++ b/gtk2_ardour/soundcloud_export_selector.h
@@ -19,6 +19,8 @@
 #include <gtkmm/progressbar.h>
 #include <gtkmm/table.h>
 
+#include "ardour/session_handle.h"
+
 class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
 public:
diff --git a/gtk2_ardour/startup_fsm.h b/gtk2_ardour/startup_fsm.h
index 48f7e832a0..74a2a9267f 100644
--- a/gtk2_ardour/startup_fsm.h
+++ b/gtk2_ardour/startup_fsm.h
@@ -25,6 +25,11 @@
 
 #include "ardour/types.h"
 
+namespace Gtk
+{
+class Window;
+} // namespace Gtk
+
 class ArdourDialog;
 class NewUserWizard;
 class EngineControl;
diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index 4c7f966cfa..7376a9709a 100644
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -28,10 +28,12 @@
 #include "pbd/signals.h"
 
 #include "temporal/beats.h"
+#include "temporal/timeline.h"
 
 namespace ARDOUR {
 class MidiTrack;
 class MidiRegion;
+class Region;
 }
 
 class MidiRegionView;
diff --git a/gtk2_ardour/strip_selection.h b/gtk2_ardour/strip_selection.h
index 05602fddb7..6ccfa809c4 100644
--- a/gtk2_ardour/strip_selection.h
+++ b/gtk2_ardour/strip_selection.h
@@ -20,9 +20,11 @@
 
 #pragma once
 
+#include "mixer_strip.h"
+
 #include <list>
 
 class MixerStrip;
 
-struct MixerStripSelection : list<MixerStrip*> {};
+struct MixerStripSelection : std::list<MixerStrip*> {};
 
diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 7d3409bf66..c0abb40109 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -19,11 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <glibmm/threads.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/spinbutton.h>
 #include <glibmm/threads.h>
 
 #include <pbd/xml++.h>
 
+#include "ardour/interthread_info.h"
 #include "ardour/types.h"
 #include "ardour_dialog.h"
 #include "progress_reporter.h"
diff --git a/gtk2_ardour/sys_ex.h b/gtk2_ardour/sys_ex.h
index dd150767f7..888e7f875e 100644
--- a/gtk2_ardour/sys_ex.h
+++ b/gtk2_ardour/sys_ex.h
@@ -22,6 +22,8 @@
 
 #include "canvas/flag.h"
 
+#include "ardour/midi_model.h"
+
 class MidiView;
 
 class SysEx
diff --git a/gtk2_ardour/tempo_curve.h b/gtk2_ardour/tempo_curve.h
index f9c4785f91..0b274d71ca 100644
--- a/gtk2_ardour/tempo_curve.h
+++ b/gtk2_ardour/tempo_curve.h
@@ -27,6 +27,7 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
+#include "canvas/container.h"
 #include "canvas/types.h"
 #include "canvas/framed_curve.h"
 #include "canvas/text.h"
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
deleted file mode 100644
index 0f1aa8d7af..0000000000
--- a/gtk2_ardour/tempo_lines.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2007-2015 David Robillard <d@drobilla.net>
- * Copyright (C) 2010-2017 Paul Davis <paul@linuxaudiosystems.com>
- * Copyright (C) 2012 Carl Hetherington <carl@carlh.net>
- * Copyright (C) 2014-2017 Nick Mainsbridge <mainsbridge@gmail.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "pbd/compose.h"
-
-#include "canvas/canvas.h"
-#include "canvas/debug.h"
-
-#include "tempo_lines.h"
-#include "public_editor.h"
-#include "rgb_macros.h"
-#include "ui_config.h"
-
-using namespace std;
-
-TempoLines::TempoLines (ArdourCanvas::Container* group, double, ARDOUR::BeatsSamplesConverter* bfc)
-	: lines (group, ArdourCanvas::LineSet::Vertical)
-	, _bfc (bfc)
-{
-	lines.set_extent (ArdourCanvas::COORD_MAX);
-}
-
-TempoLines::~TempoLines ()
-{
-	delete _bfc;
-	_bfc = 0;
-}
-
-void
-TempoLines::tempo_map_changed (samplepos_t new_origin)
-{
-	lines.clear ();
-	_bfc->set_origin_b (new_origin);
-}
-
-void
-TempoLines::show ()
-{
-	lines.show ();
-}
-
-void
-TempoLines::hide ()
-{
-	lines.hide ();
-}
-
-void
-TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
-                        unsigned                                 divisions,
-                        samplecnt_t                              leftmost_sample,
-                        samplecnt_t                              sample_rate)
-{
-	const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
-
-	for (unsigned l = 1; l < divisions; ++l) {
-		/* find the coarsest division level this tick falls on */
-		unsigned level = divisions;
-		for (unsigned d = divisions; d >= 4; d /= 2) {
-			if (l % (divisions / d) == 0) {
-				level = d;
-			}
-		}
-		/* draw line with alpha corresponding to coarsest level */
-		const uint8_t    a = max(8, (int)rint(UINT_RGBA_A(base) / (0.8 * log2(level))));
-		const uint32_t   c = UINT_RGBA_CHANGE_A(base, a);
-		const samplepos_t f = _bfc->to (Temporal::Beats (grid.begin()->qn + (l / (double) divisions))) + _bfc->origin_b();
-
-		if (f > leftmost_sample) {
-			lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
-		}
-	}
-}
-
-void
-TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
-                  unsigned                                 divisions,
-                  samplecnt_t                              leftmost_sample,
-                  samplecnt_t                              sample_rate)
-{
-	std::vector<ARDOUR::TempoMap::BBTPoint>::const_iterator i;
-	double  beat_density;
-
-	uint32_t beats = 0;
-	uint32_t bars = 0;
-	const uint32_t bar_color = UIConfiguration::instance().color ("measure line bar");
-	const uint32_t beat_color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
-	uint32_t color;
-
-	bool all_bars = false;
-	/* get the first bar spacing */
-
-	i = grid.end();
-	i--;
-	bars = (*i).bar - (*grid.begin()).bar;
-
-	int32_t bar_mod = 4;
-
-	if (bars < distance (grid.begin(), grid.end()) - 1) {
-		/* grid contains beats and bars */
-		beats = distance (grid.begin(), grid.end()) - bars;
-	} else {
-		/* grid contains only bars */
-		beats = distance (grid.begin(), grid.end());
-
-		if (i != grid.begin()) {
-			const int32_t last_bar = (*i).bar;
-			i--;
-			bar_mod = (last_bar - (*i).bar) * 4;
-		}
-
-		all_bars = true;
-	}
-
-	double canvas_width_used = 1.0;
-	if (leftmost_sample < grid.front().sample) {
-		const samplecnt_t sample_distance = max ((samplecnt_t) 1, grid.back().sample - grid.front().sample);
-		canvas_width_used = 1.0 - ((grid.front().sample - leftmost_sample) / (double) (sample_distance + grid.front().sample));
-	}
-
-	beat_density = (beats * 10.0f) / (lines.canvas()->width() * canvas_width_used);
-
-	if (beat_density > 2.0f) {
-		/* if the lines are too close together, they become useless */
-		lines.clear ();
-		return;
-	}
-
-	/* constrain divisions to a log2 factor to cap line density */
-	while (divisions > 3 && beat_density * divisions > 0.4) {
-		divisions /= 2;
-	}
-
-	lines.clear ();
-	if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->sample > 0 && !all_bars) {
-		/* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */
-		std::vector<ARDOUR::TempoMap::BBTPoint> vec;
-		vec.push_back (*i);
-		draw_ticks (vec, divisions, leftmost_sample, sample_rate);
-	}
-
-	for (i = grid.begin(); i != grid.end(); ++i) {
-
-		if ((*i).is_bar()) {
-			/* keep all_bar beat density down */
-			if (all_bars && beat_density > 0.3 && ((*i).bar % bar_mod) != 1) {
-				continue;
-			}
-
-			color = bar_color;
-		} else {
-			if (beat_density > 0.3) {
-				continue; /* only draw beat lines if the gaps between beats are large. */
-			}
-			color = beat_color;
-		}
-
-		ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).sample);
-
-		lines.add (xpos, 1.0, color);
-
-		if (beat_density <= 0.12 && !all_bars) {
-			/* draw subdivisions of this beat */
-			std::vector<ARDOUR::TempoMap::BBTPoint> vec;
-			vec.push_back (*i);
-			draw_ticks (vec, divisions, leftmost_sample, sample_rate);
-		}
-	}
-}
-
diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
deleted file mode 100644
index 7a84f705f4..0000000000
--- a/gtk2_ardour/tempo_lines.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2007-2015 David Robillard <d@drobilla.net>
- * Copyright (C) 2012-2017 Paul Davis <paul@linuxaudiosystems.com>
- * Copyright (C) 2015-2017 Nick Mainsbridge <mainsbridge@gmail.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#pragma once
-
-#include "ardour/tempo.h"
-
-#include "canvas/line_set.h"
-
-class TempoLines {
-public:
-	TempoLines (ArdourCanvas::Container* group, double screen_height, ARDOUR::BeatsSamplesConverter* bfc);
-	~TempoLines ();
-
-	void tempo_map_changed(samplepos_t new_origin);
-
-	void draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
-	           unsigned                                 divisions,
-	           ARDOUR::samplecnt_t                      leftmost_sample,
-	           ARDOUR::samplecnt_t                      sample_rate);
-
-	void show();
-	void hide();
-
-private:
-	void draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
-	                 unsigned                                 divisions,
-	                 ARDOUR::samplecnt_t                      leftmost_sample,
-	                 ARDOUR::samplecnt_t                      sample_rate);
-
-	ArdourCanvas::LineSet lines;
-	ARDOUR::BeatsSamplesConverter* _bfc;
-};
-
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 192ed49cda..1d403c3b91 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -28,6 +28,7 @@
 #include <gdk/gdk.h>
 #include <gdkmm/color.h>
 #include <pangomm/fontdescription.h>
+#include "ardour/types.h"
 #include "pbd/signals.h"
 #include "selectable.h"
 
diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index beba8bf9bd..694b19a5c4 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -313,11 +313,7 @@ TimeInfoBox::selection_changed ()
 
 	case Editing::MouseRange:
 		if (selection.time.empty()) {
-			/* XXX we really ought to be calling
-			   ::get_mouse_mode_action() here but there is no actual
-			   mouse emode enum for smart mode (object-range).
-			*/
-			Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (PublicEditor::instance().editor_name(), "set-mouse-mode-object-range");
+			Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (PublicEditor::instance().editor_name().c_str(), "set-mouse-mode-object-range");
 
 			if (tact->get_active() &&  !selection.regions.empty()) {
 				/* show selected regions */
diff --git a/gtk2_ardour/track_record_axis.h b/gtk2_ardour/track_record_axis.h
index 920bf5c96b..31cda5ae25 100644
--- a/gtk2_ardour/track_record_axis.h
+++ b/gtk2_ardour/track_record_axis.h
@@ -25,6 +25,7 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/drawingarea.h>
+#include <gtkmm/entry.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/sizegroup.h>
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 9a324a96a0..b0313afad1 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -192,7 +192,7 @@ TranscodeFfmpeg::probe ()
 						PARSE_FRACTIONAL_FPS (timebase)
 					} else if (key == X_("timecode") && m_duration == 0 && m_fps > 0) {
 						int  h, m, s;
-						char f[32];
+						char f[33];
 						if (sscanf (i->at (16).c_str (), "%d:%d:%d:%32s", &h, &m, &s, f) == 4) {
 							m_duration = (ARDOUR::samplecnt_t)floor (m_fps * (h * 3600.0 + m * 60.0 + s * 1.0 + atoi (f) / pow ((double)10, (int)strlen (f))));
 						}
diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index defd01699d..f1d4c0243b 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -419,23 +419,7 @@ TriggerPage::rec_enable_changed (Trigger const * trigger)
 		_midi_trig_box.set_trigger (ref);
 		_midi_trig_box.show ();
 
-		_midi_editor->set_box (trigger->boxptr());
-
-		Stripable* st = dynamic_cast<Stripable*> (box.owner());
-		assert (st);
-		std::shared_ptr<MidiTrack> mt = std::dynamic_pointer_cast<MidiTrack> (st->shared_from_this());
-		assert (mt);
-		_midi_editor->set_track (mt);
-
-		if (trigger->the_region()) {
-
-			std::shared_ptr<MidiRegion> mr = std::dynamic_pointer_cast<MidiRegion> (trigger->the_region());
-
-			if (mr) {
-				_midi_editor->set_region (mr);
-			}
-		}
-
+		_midi_editor->set (ref);
 		_midi_editor->viewport().show ();
 	}
 
@@ -475,19 +459,7 @@ TriggerPage::selection_changed ()
 			_midi_trig_box.set_trigger (ref);
 			_midi_trig_box.show ();
 
-			std::shared_ptr<MidiTrack> mt = std::dynamic_pointer_cast<MidiTrack> (entry->strip().stripable());
-			assert (mt);
-			_midi_editor->set_track (mt);
-
-			if (trigger->the_region()) {
-
-				std::shared_ptr<MidiRegion> mr = std::dynamic_pointer_cast<MidiRegion> (trigger->the_region());
-
-				if (mr) {
-					_midi_editor->set_region (mr);
-				}
-			}
-
+			_midi_editor->set (ref);
 			_midi_editor->viewport().show ();
 		}
 
diff --git a/gtk2_ardour/trigger_page.h b/gtk2_ardour/trigger_page.h
index 36e9632c76..cdf94ad44c 100644
--- a/gtk2_ardour/trigger_page.h
+++ b/gtk2_ardour/trigger_page.h
@@ -31,6 +31,7 @@
 #include "audio_region_operations_box.h"
 #include "audio_region_properties_box.h"
 #include "audio_trigger_properties_box.h"
+#include "axis_provider.h"
 #include "cuebox_ui.h"
 #include "fitted_canvas_widget.h"
 #include "midi_region_operations_box.h"
diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc
index a58a4a9ee3..4726b8a44b 100644
--- a/gtk2_ardour/trigger_ui.cc
+++ b/gtk2_ardour/trigger_ui.cc
@@ -797,7 +797,6 @@ TriggerUI::trigger_changed (PropertyChange const& what)
 	on_trigger_changed(what);
 }
 
-
 void
 TriggerUI::set_trigger (ARDOUR::TriggerReference tr)
 {
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 6e42f750d9..37e716bd0f 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -84,8 +84,8 @@ UIConfiguration::UIConfiguration ()
 #undef  UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,val) var (name,val),
 #define CANVAS_FONT_VARIABLE(var,name) var (name),
-#include "ui_config_vars.h"
-#include "canvas_vars.h"
+#include "ui_config_vars.inc.h"
+#include "canvas_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_FONT_VARIABLE
 
@@ -101,7 +101,7 @@ UIConfiguration::UIConfiguration ()
 #undef  UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
 #define CANVAS_FONT_VARIABLE(var,name) /* no need for metadata for these */
-#include "ui_config_vars.h"
+#include "ui_config_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_FONT_VARIABLE
 
@@ -222,7 +222,7 @@ UIConfiguration::map_parameters (std::function<void (std::string)>& functor)
 {
 #undef  UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,Name,value) functor (Name);
-#include "ui_config_vars.h"
+#include "ui_config_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 }
 
@@ -572,8 +572,8 @@ UIConfiguration::get_variables (std::string const & node_name) const
 #undef  CANVAS_FONT_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); }
 #define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); }
-#include "ui_config_vars.h"
-#include "canvas_vars.h"
+#include "ui_config_vars.inc.h"
+#include "canvas_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_FONT_VARIABLE
 
@@ -707,8 +707,8 @@ UIConfiguration::set_variables (const XMLNode& node)
 #undef  UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,val) if (var.set_from_node (node)) { ParameterChanged (name); }
 #define CANVAS_FONT_VARIABLE(var,name)        if (var.set_from_node (node)) { ParameterChanged (name); }
-#include "ui_config_vars.h"
-#include "canvas_vars.h"
+#include "ui_config_vars.inc.h"
+#include "canvas_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_FONT_VARIABLE
 }
@@ -867,4 +867,4 @@ UIConfiguration::color_to_hex_string_no_alpha (Gtkmm2ext::Color c)
 	return buf;
 }
 
-#include "configuration_metadata.h"
+#include "configuration_metadata.inc.h"
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index d365eef0b4..2396a52141 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -114,13 +114,13 @@ public:
 #define UI_CONFIG_VARIABLE(Type,var,name,value) \
 	Type get_##var () const { return var.get(); } \
 	bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
-#include "ui_config_vars.h"
+#include "ui_config_vars.inc.h"
 #undef  UI_CONFIG_VARIABLE
 #define CANVAS_FONT_VARIABLE(var,name) \
 	Pango::FontDescription get_##var () const { return ARDOUR_UI_UTILS::sanitized_font (var.get()); } \
 	Pango::FontDescription get_Ardour##var () const { return ARDOUR_UI_UTILS::ardour_font (var.get()); } \
 	bool set_##var (const std::string& val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
-#include "canvas_vars.h"
+#include "canvas_vars.inc.h"
 #undef CANVAS_FONT_VARIABLE
 
 private:
@@ -128,11 +128,11 @@ private:
 
 #undef  UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
-#include "ui_config_vars.h"
+#include "ui_config_vars.inc.h"
 #undef UI_CONFIG_VARIABLE
 
 #define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
-#include "canvas_vars.h"
+#include "canvas_vars.inc.h"
 #undef CANVAS_FONT_VARIABLE
 
 	XMLNode& state () const;
diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.inc.h
similarity index 100%
rename from gtk2_ardour/ui_config_vars.h
rename to gtk2_ardour/ui_config_vars.inc.h
diff --git a/gtk2_ardour/velocity_display.cc b/gtk2_ardour/velocity_display.cc
index b6b3c5d5ba..d04baf95b7 100644
--- a/gtk2_ardour/velocity_display.cc
+++ b/gtk2_ardour/velocity_display.cc
@@ -203,12 +203,15 @@ VelocityDisplay::set_size_and_position (GhostEvent& gev)
 void
 VelocityDisplay::update_note (NoteBase* nb)
 {
-	GhostEvent* gev = GhostEvent::find (nb->note(), events, _optimization_iterator);
+	auto iter = events.end();
+
+	GhostEvent* gev = GhostEvent::find (nb->note(), events, iter);
 
 	if (!gev) {
 		return;
 	}
 
+	_optimization_iterator = iter;
 	update_ghost_event (gev);
 }
 
@@ -319,7 +322,9 @@ VelocityDisplay::y_position_to_velocity (double y) const
 void
 VelocityDisplay::note_selected (NoteBase* ev)
 {
-	GhostEvent* gev = GhostEvent::find (ev->note(), events, _optimization_iterator);
+	auto ignore_optiter = events.end();
+
+	GhostEvent* gev = GhostEvent::find (ev->note(), events, ignore_optiter);
 
 	if (!gev) {
 		return;
@@ -430,3 +435,22 @@ VelocityDisplay::set_selected (bool yn)
 		base.parent()->raise_to_top ();
 	}
 }
+
+void
+VelocityDisplay::hide ()
+{
+	if (lolli_container) {
+		lolli_container->hide ();
+		lolli_container->set_ignore_events (true);
+	}
+
+}
+
+void
+VelocityDisplay::show ()
+{
+	if (lolli_container) {
+		lolli_container->show ();
+		lolli_container->set_ignore_events (false);
+	}
+}
diff --git a/gtk2_ardour/velocity_display.h b/gtk2_ardour/velocity_display.h
index f16694532e..655c98ead8 100644
--- a/gtk2_ardour/velocity_display.h
+++ b/gtk2_ardour/velocity_display.h
@@ -44,6 +44,9 @@ class VelocityDisplay
 	VelocityDisplay (EditingContext&, MidiViewBackground&, MidiView&, ArdourCanvas::Rectangle& base_rect, ArdourCanvas::Container&, GhostEvent::EventList& el, Gtkmm2ext::Color oc);
 	virtual ~VelocityDisplay ();
 
+	void hide ();
+	void show ();
+
 	void redisplay();
 	void add_note(NoteBase*);
 
diff --git a/gtk2_ardour/view_background.h b/gtk2_ardour/view_background.h
index 80d59d84e5..1a11555419 100644
--- a/gtk2_ardour/view_background.h
+++ b/gtk2_ardour/view_background.h
@@ -41,6 +41,7 @@ class ViewBackground
 	virtual ~ViewBackground ();
 
 	virtual double height() const { return 0.; }
+	virtual double width() const { return 0.; }
 	virtual double contents_height() const { return 0.; }
 
 	/** @return y position, or -1 if hidden */
diff --git a/gtk2_ardour/visibility_group.h b/gtk2_ardour/visibility_group.h
index 0dbb75e85e..7dc2005ba7 100644
--- a/gtk2_ardour/visibility_group.h
+++ b/gtk2_ardour/visibility_group.h
@@ -21,6 +21,8 @@
 #define __ardour_visibility_group__
 
 #include <gtkmm/liststore.h>
+#include <gtkmm/widget.h>
+
 #include "pbd/signals.h"
 
 class XMLNode;
diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index 0670b39dfa..d6385389cf 100644
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -24,12 +24,16 @@
 #include <string>
 #include <map>
 
-#include <glibmm/refptr.h>
 #include <sigc++/trackable.h>
 
+#include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/window_proxy.h"
 
+#include <glibmm/refptr.h>
+
+#include "ardour/session_handle.h"
+
 class XMLNode;
 
 namespace Gtk {
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 486c4f6e82..93485dc3c1 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -159,7 +159,7 @@ gtk2_ardour_sources = [
         'main.cc',
         'main_clock.cc',
         'marker.cc',
-    	'mergeable_line.cc',
+        'mergeable_line.cc',
         'midi_automation_line.cc',
         'midi_channel_dialog.cc',
         'midi_channel_selector.cc',
@@ -772,6 +772,7 @@ def build(bld):
     if sys.platform == 'darwin':
         basefont = ""
         font_sizes = {
+                'VERYSMALL' : '7',
                 'SMALLER' : '9',
                 'SMALL' : '10',
                 'NORMAL' : '11',
@@ -789,6 +790,7 @@ def build(bld):
     else: # Linux/X11 & Windows fonts
         basefont = '' # unspecified - use system defaults
         font_sizes = {
+                'VERYSMALL' : '8',
                 'SMALLER' : '6',
                 'SMALL' : '7',
                 'NORMAL' : '8',
@@ -879,7 +881,7 @@ def build(bld):
         obj.stdin = 'livetrax.menus.in'
     else:
         obj.stdin = 'ardour.menus.in'
-    obj.stdout = 'ardour.menus'        
+    obj.stdout = 'ardour.menus'
     bld.install_files (bld.env['CONFDIR'], 'ardour.menus')
 
     # Freedesktop
@@ -971,26 +973,27 @@ def build(bld):
             bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
                             mo)
 
-def i18n(bld):
+def i18n_func(bld):
     I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
     autowaf.build_i18n(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
                        'Paul Davis')
     appdata_i18n_pot(bld)
     appdata_i18n_po(bld)
+    appdata_i18n_mo(bld)
 
-def i18n_pot(bld):
+def i18n_pot_func(bld):
     I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
     autowaf.build_i18n_pot(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
                            'Paul Davis')
     appdata_i18n_pot(bld)
 
-def i18n_po(bld):
+def i18n_po_func(bld):
     I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
     autowaf.build_i18n_po(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
                           'Paul Davis')
     appdata_i18n_po(bld)
 
-def i18n_mo(bld):
+def i18n_mo_func(bld):
     I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
     autowaf.build_i18n_mo(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
                           'Paul Davis')
@@ -998,7 +1001,7 @@ def i18n_mo(bld):
 def appdata_i18n_pot(bld):
     potfile = os.path.join(bld.top_dir, 'gtk2_ardour', 'appdata',
             'ardour.appdata.pot')
-    if bld.cmd == 'i18n_pot':
+    if bld.cmd in ('i18n_pot', 'i18n'):
         Logs.info('Generating pot file from Ardour appdata')
         itsfile = os.path.join(bld.top_dir, 'tools', 'as-metainfo.its')
         adsource = os.path.join(bld.top_dir, 'gtk2_ardour',
diff --git a/libs/aaf/wscript b/libs/aaf/wscript
index e6a1337b5a..491c3b8c97 100644
--- a/libs/aaf/wscript
+++ b/libs/aaf/wscript
@@ -16,22 +16,22 @@ top = '.'
 out = 'build'
 
 libaaf_sources = [
-	'AAFClass.c',
-	'AAFCore.c',
-	'AAFDump.c',
-	'AAFIEssenceFile.c',
-	'AAFIface.c',
-	'AAFIParser.c',
-	'AAFToText.c',
-	'CFBDump.c',
-	'LibCFB.c',
-	'ProTools.c',
-	'MediaComposer.c',
-	'Resolve.c',
-	'RIFFParser.c',
-	'URIParser.c',
-	'utils.c',
-	'log.c',
+    'AAFClass.c',
+    'AAFCore.c',
+    'AAFDump.c',
+    'AAFIEssenceFile.c',
+    'AAFIface.c',
+    'AAFIParser.c',
+    'AAFToText.c',
+    'CFBDump.c',
+    'LibCFB.c',
+    'ProTools.c',
+    'MediaComposer.c',
+    'Resolve.c',
+    'RIFFParser.c',
+    'URIParser.c',
+    'utils.c',
+    'log.c',
 ]
 
 def options(opt):
diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript
index 51be798e82..6136aafc71 100644
--- a/libs/appleutility/wscript
+++ b/libs/appleutility/wscript
@@ -42,6 +42,3 @@ def build(bld):
     obj.name           = 'libappleutility'
     obj.target         = 'appleutility'
     obj.install_path   = os.path.join(bld.env['LIBDIR'], 'appleutility')
-
-def i18n(bld):
-    pass
diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index 33c8ddb70c..e9cb15288d 100644
--- a/libs/ardour/MSVClibardour/ardour.vcproj
+++ b/libs/ardour/MSVClibardour/ardour.vcproj
@@ -1881,10 +1881,6 @@
 				RelativePath="..\ardour\export_handler.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ardour\export_multiplication.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ardour\export_pointers.h"
 				>
@@ -2350,7 +2346,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ardour\rc_configuration_vars.h"
+				RelativePath="..\ardour\rc_configuration_vars.inc.h"
 				>
 			</File>
 			<File
@@ -2458,7 +2454,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ardour\session_configuration_vars.h"
+				RelativePath="..\ardour\session_configuration_vars.inc.h"
 				>
 			</File>
 			<File
@@ -2545,10 +2541,6 @@
 				RelativePath="..\ardour\soundcloud_upload.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ardour\soundseq.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ardour\source.h"
 				>
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index fac0f4313c..7632b172ba 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -60,7 +60,7 @@ public:
 	virtual int update_header (samplepos_t when, struct tm&, time_t) = 0;
 	virtual int flush_header () = 0;
 
-	void mark_streaming_write_completed (const WriterLock& lock);
+	void mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration);
 
 	int setup_peakfile ();
 	void set_gain (float g, bool temporarily = false);
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 9ea6c25f60..0c0bd049a3 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -24,8 +24,6 @@
 
 #include <memory>
 
-#include <boost/shared_array.hpp>
-
 #include <time.h>
 
 #include <glibmm/threads.h>
@@ -57,7 +55,7 @@ class LIBARDOUR_API AudioSource : virtual public Source, public ARDOUR::AudioRea
 
 	virtual float sample_rate () const = 0;
 
-	virtual void mark_streaming_write_completed (const WriterLock& lock);
+	virtual void mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration);
 
 	virtual bool can_truncate_peaks() const { return true; }
 
@@ -107,8 +105,8 @@ class LIBARDOUR_API AudioSource : virtual public Source, public ARDOUR::AudioRea
 	   thread, or a lock around calls that use them.
 	*/
 
-	static std::vector<boost::shared_array<Sample> > _mixdown_buffers;
-	static std::vector<boost::shared_array<gain_t> > _gain_buffers;
+	static std::vector<std::shared_ptr<Sample[]> > _mixdown_buffers;
+	static std::vector<std::shared_ptr<gain_t[]> > _gain_buffers;
 	static Glib::Threads::Mutex    _level_buffer_lock;
 
 	std::string         _peakpath;
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index b8ad0632d7..952bd1007f 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -43,7 +43,6 @@
 namespace ARDOUR {
 
 class AutomationList;
-class BeatsSamplesConverter;
 
 /** A SharedStatefulProperty for AutomationLists */
 class LIBARDOUR_API AutomationListProperty : public PBD::SharedStatefulProperty<AutomationList>
diff --git a/libs/ardour/ardour/beatbox.h b/libs/ardour/ardour/beatbox.h
index a9e57dd8af..933c2f280e 100644
--- a/libs/ardour/ardour/beatbox.h
+++ b/libs/ardour/ardour/beatbox.h
@@ -30,7 +30,7 @@
 #include "pbd/ringbuffer.h"
 
 #include "temporal/bbt_time.h"
-#include "temporal/superclock.h
+#include "temporal/superclock.h"
 
 #include "ardour/midi_state_tracker.h"
 #include "ardour/processor.h"
diff --git a/libs/ardour/ardour/comparable_shared_ptr.h b/libs/ardour/ardour/comparable_shared_ptr.h
index e670225575..3194c3c891 100644
--- a/libs/ardour/ardour/comparable_shared_ptr.h
+++ b/libs/ardour/ardour/comparable_shared_ptr.h
@@ -22,6 +22,10 @@
 
 #include "ardour/libardour_visibility.h"
 
+#include <boost/operators.hpp>
+
+#include <memory>
+
 namespace ARDOUR {
 
 template<typename T>
diff --git a/libs/ardour/ardour/control_group_member.h b/libs/ardour/ardour/control_group_member.h
index ca7e013efb..3bf4e61849 100644
--- a/libs/ardour/ardour/control_group_member.h
+++ b/libs/ardour/ardour/control_group_member.h
@@ -18,6 +18,10 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
+#include <memory>
+
 namespace ARDOUR {
 
 class ControlGroup;
diff --git a/libs/ardour/ardour/convolver.h b/libs/ardour/ardour/convolver.h
index e4934034f0..0f779bbf53 100644
--- a/libs/ardour/ardour/convolver.h
+++ b/libs/ardour/ardour/convolver.h
@@ -27,6 +27,7 @@
 #include "ardour/buffer_set.h"
 #include "ardour/chan_mapping.h"
 #include "ardour/readable.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR { namespace DSP {
 
diff --git a/libs/ardour/ardour/delayline.h b/libs/ardour/ardour/delayline.h
index 2f23fff7a4..c22db4f26e 100644
--- a/libs/ardour/ardour/delayline.h
+++ b/libs/ardour/ardour/delayline.h
@@ -20,8 +20,6 @@
 
 #include <memory>
 
-#include <boost/shared_array.hpp>
-
 #include "ardour/types.h"
 #include "ardour/processor.h"
 
@@ -67,8 +65,8 @@ private:
 	sampleoffset_t _roff, _woff;
 	bool           _pending_flush;
 
-	typedef std::vector<boost::shared_array<Sample> > AudioDlyBuf;
-	typedef std::vector<std::shared_ptr<MidiBuffer> > MidiDlyBuf;
+	typedef std::vector<std::shared_ptr<Sample[]>>   AudioDlyBuf;
+	typedef std::vector<std::shared_ptr<MidiBuffer>> MidiDlyBuf;
 
 	AudioDlyBuf _buf;
 	MidiDlyBuf  _midi_buf;
diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index 23f14e90db..4a63f9b764 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -74,7 +74,7 @@ public:
 
 	std::string steal_write_source_name ();
 	int use_new_write_source (DataType, uint32_t n = 0);
-	void reset_write_sources (bool, bool force = false);
+	void reset_write_sources (bool mark_write_complete);
 
 	AlignStyle alignment_style () const { return _alignment_style; }
 	void       set_align_style (AlignStyle, bool force = false);
diff --git a/libs/ardour/ardour/event_ring_buffer.h b/libs/ardour/ardour/event_ring_buffer.h
index 555a2b293d..c3fecd9540 100644
--- a/libs/ardour/ardour/event_ring_buffer.h
+++ b/libs/ardour/ardour/event_ring_buffer.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cassert>
 #include <iostream>
 
 #include "pbd/ringbufferNPT.h"
diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h
deleted file mode 100644
index 35979aab04..0000000000
--- a/libs/ardour/ardour/export_multiplication.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2008-2015 Paul Davis <paul@linuxaudiosystems.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* This file is not used at the moment. It includes code related to export a
- * multiplication graph system that can be used together with the ExportMultiplicator
- * class in the gtk2_ardour folder.
- * - Sakari Bergen 6.8.2008 -
- */
-
-/*** Graph classes ***/
-  public:
-
-	/// A node in the hierarchical graph that represents a multiplicatable export item
-	class GraphNode {
-	  public:
-		GraphNode ();
-		virtual ~GraphNode ();
-
-		uint32_t id() const { return _id; }
-
-		/* Children and parents. Note: only children are kept in order! */
-
-		list<GraphNode *> const & get_parents () const { return parents; }
-
-		void add_child (GraphNode * child, GraphNode * left_sibling);
-		void remove_child (GraphNode * child);
-		GraphNode * first_child () const { return children.front(); }
-		GraphNode * last_child () const { return children.back(); }
-		list<GraphNode *> const & get_children () const { return children; }
-
-		/* Relation functions */
-
-		bool is_ancestor_of (GraphNode const * node) const;
-		bool is_descendant_of (GraphNode const * node) const;
-		bool equals (GraphNode const * node) const { return node == this; }
-
-		/* Selection functions */
-
-		bool selected () const { return _selected; }
-		void select (bool value);
-
-		PBD::Signal<void(bool)> SelectChanged;
-
-	  protected:
-
-		/* Parent manipulation functions should be used only from child manipulation functions! */
-
-		void add_parent (GraphNode * parent);
-		void remove_parent (GraphNode * parent);
-
-		list<GraphNode *> parents;
-		list<GraphNode *> children;
-
-		bool           _selected;
-		uint32_t       _id;
-		static uint32_t id_counter;
-	};
-
-	/// A graph node that contains data
-	template <typename T>
-	class DataNode : public GraphNode {
-	  private:
-		typedef std::shared_ptr<T> DataPtr;
-		typedef std::shared_ptr<DataNode<T> > SelfPtr;
-		typedef std::weak_ptr<DataNode<T> > WeakSelfPtr;
-
-		DataNode (DataPtr data) : _data (data) {}
-		void set_self_ptr (std::shared_ptr<DataNode<T> > ptr) { _self_ptr = ptr; }
-
-	  public:
-		static SelfPtr create (T * data)
-		{
-			SelfPtr ptr = SelfPtr (new DataNode<T> (DataPtr (data)));
-			ptr->set_self_ptr (ptr);
-			return ptr;
-		}
-
-		static SelfPtr create (DataPtr data)
-		{
-			SelfPtr ptr = SelfPtr (new DataNode<T> (data));
-			ptr->set_self_ptr (ptr);
-			return ptr;
-		}
-
-		DataPtr data() { return _data; }
-		SelfPtr self_ptr () { return _self_ptr.lock(); }
-
-		template<typename P> // Parent's data type
-		void sort_parents (list<std::shared_ptr<DataNode<P> > > const & sort_list)
-		{
-			parents.sort (NodeSorter<P> (sort_list));
-		}
-
-	  private:
-		DataPtr     _data;
-		WeakSelfPtr _self_ptr;
-	};
-
-  private:
-	/* Sorts GraphNodes according to a list of DataNodes */
-
-	template<typename T>
-	class NodeSorter {
-	  public:
-		typedef list<std::shared_ptr<DataNode<T> > > ListType;
-
-		NodeSorter (ListType const & list) : list (list) {}
-
-		bool operator() (GraphNode * one, GraphNode * other) // '<' operator
-		{
-			if (one == other) { return false; } // Strict weak ordering
-			for (typename ListType::const_iterator it = list.begin(); it != list.end(); ++it) {
-				if (it->get() == one) {
-					return true;
-				}
-				if (it->get() == other) {
-					return false;
-				}
-			}
-
-			std::cerr << "Invalid comparison list given to NodeSorter" << std::endl;
-
-			abort();
-		}
-
-	  private:
-		ListType const & list;
-	};
-
-/*** Multiplication management ***/
-  public:
-
-	typedef DataNode<TimespanState> TimespanNode;
-	typedef std::shared_ptr<TimespanNode> TimespanNodePtr;
-
-	typedef DataNode<ChannelConfigState> ChannelConfigNode;
-	typedef std::shared_ptr<ChannelConfigNode> ChannelConfigNodePtr;
-
-	typedef DataNode<FormatState> FormatNode;
-	typedef std::shared_ptr<FormatNode> FormatNodePtr;
-
-	typedef DataNode<FilenameState> FilenameNode;
-	typedef std::shared_ptr<FilenameNode> FilenameNodePtr;
-
-	struct MultiplicationGraph {
-		list<TimespanNodePtr>      timespans;
-		list<ChannelConfigNodePtr> channel_configs;
-		list<FormatNodePtr>        formats;
-		list<FilenameNodePtr>      filenames;
-	};
-
-	MultiplicationGraph const & get_graph () { return graph; }
-
-	void split_node (GraphNode * node, float position);
-	void remove_node (GraphNode * node);
-
-	PBD::Signal<void()> GraphChanged;
-
-  private:
-
-	void purge_graph ();
-
-	template<typename T>
-	static void insert_after (list<T> & the_list, T const & position, T const & element);
-
-	template<typename T>
-	static void remove_by_element (list<T> & the_list, T const & element);
-
-	bool nodes_have_one_common_child (list<GraphNode *> const & the_list);
-	list<GraphNode *>::const_iterator end_of_common_child_range (list<GraphNode *> const & the_list, list<GraphNode *>::const_iterator beginning);
-	void split_node_at_position (GraphNode * old_node, GraphNode * new_node, float position);
-
-	void split_timespan (TimespanNodePtr node, float position = 0.5);
-	void split_channel_config (ChannelConfigNodePtr node, float position = 0.5);
-	void split_format (FormatNodePtr node, float position = 0.5);
-	void split_filename (FilenameNodePtr node, float position = 0.5);
-
-	void duplicate_timespan_children (TimespanNodePtr source, TimespanNodePtr target, GraphNode * insertion_point = 0);
-	void duplicate_channel_config_children (ChannelConfigNodePtr source, ChannelConfigNodePtr target, GraphNode * insertion_point = 0);
-	void duplicate_format_children (FormatNodePtr source, FormatNodePtr target, GraphNode * insertion_point = 0);
-
-	TimespanNodePtr duplicate_timespan_node (TimespanNodePtr node);
-	ChannelConfigNodePtr duplicate_channel_config_node (ChannelConfigNodePtr node);
-	FormatNodePtr duplicate_format_node (FormatNodePtr node);
-	FilenameNodePtr duplicate_filename_node (FilenameNodePtr node);
-
-	void remove_timespan (TimespanNodePtr node);
-	void remove_channel_config (ChannelConfigNodePtr node);
-	void remove_format (FormatNodePtr node);
-	void remove_filename (FilenameNodePtr node);
-
-	MultiplicationGraph graph;
\ No newline at end of file
diff --git a/libs/ardour/ardour/export_smf_writer.h b/libs/ardour/ardour/export_smf_writer.h
index 9d86d1b832..e3d5fdd3bd 100644
--- a/libs/ardour/ardour/export_smf_writer.h
+++ b/libs/ardour/ardour/export_smf_writer.h
@@ -25,6 +25,8 @@
 #include "ardour/midi_state_tracker.h"
 #include "ardour/types.h"
 
+#include <memory>
+
 namespace ARDOUR
 {
 class MidiBuffer;
@@ -36,6 +38,7 @@ public:
 	~ExportSMFWriter ();
 
 	int init (std::string const& path, samplepos_t);
+	Temporal::Beats duration() const;
 
 	void process (MidiBuffer const&, sampleoffset_t, samplecnt_t, bool);
 
diff --git a/libs/ardour/ardour/library.h b/libs/ardour/ardour/library.h
index e24aafd7d2..23f79fa461 100644
--- a/libs/ardour/ardour/library.h
+++ b/libs/ardour/ardour/library.h
@@ -20,6 +20,7 @@
 
 #include <cstdio>
 #include <cstdint>
+#include <functional>
 #include <string>
 #include <vector>
 
diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h
index bfab98533f..d64ee0d78e 100644
--- a/libs/ardour/ardour/logcurve.h
+++ b/libs/ardour/ardour/logcurve.h
@@ -23,6 +23,10 @@
 #include "pbd/fastlog.h"
 #include <glibmm/threads.h>
 
+#include "ardour/libardour_visibility.h"
+
+#include <cstdint>
+
 namespace ARDOUR {
 
 class LIBARDOUR_API LogCurve {
diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index 1da9061a0e..7287c3dc35 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -44,7 +44,6 @@ class                         Beats;
 namespace ARDOUR
 {
 
-class BeatsSamplesConverter;
 class MidiChannelFilter;
 class MidiRegion;
 class Session;
diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h
index f7ff8f424c..27eb489254 100644
--- a/libs/ardour/ardour/midi_scene_changer.h
+++ b/libs/ardour/ardour/midi_scene_changer.h
@@ -21,6 +21,7 @@
 
 #include <glibmm/threads.h>
 
+#include "ardour/midi_port.h"
 #include "ardour/scene_changer.h"
 
 namespace ARDOUR
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index b00a16574b..6f5725cc85 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -138,7 +138,7 @@ class LIBARDOUR_API MidiSource : virtual public Source
 
 	virtual void mark_streaming_midi_write_started (const WriterLock& lock, NoteMode mode);
 	virtual void mark_streaming_write_started (const WriterLock& lock);
-	virtual void mark_streaming_write_completed (const WriterLock& lock);
+	virtual void mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration);
 
 	/** Mark write starting with the given time parameters.
 	 *
@@ -160,7 +160,7 @@ class LIBARDOUR_API MidiSource : virtual public Source
 	virtual void mark_midi_streaming_write_completed (
 		const WriterLock&                                  lock,
 		Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option,
-		Temporal::Beats                                    when = Temporal::Beats());
+		Temporal::timecnt_t const &                        when);
 
 	virtual void session_saved();
 
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index 2d0885aa8e..dcc55e02be 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -25,6 +25,8 @@
 #include "pbd/abstract_ui.h"
 #include "pbd/signals.h"
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class Session;
diff --git a/libs/ardour/ardour/mixer_scene.h b/libs/ardour/ardour/mixer_scene.h
index 8341f6cb83..eb5038c6f5 100644
--- a/libs/ardour/ardour/mixer_scene.h
+++ b/libs/ardour/ardour/mixer_scene.h
@@ -19,16 +19,13 @@
 #ifndef _libardour_mixer_scene_h_
 #define _libardour_mixer_scene_h_
 
+#include "pbd/controllable.h"
 #include "pbd/stateful.h"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/session_handle.h"
 #include "ardour/types.h"
 
-namespace PBD {
-	class Controllable;
-}
-
 namespace ARDOUR {
 
 class LIBARDOUR_API MixerScene : public SessionHandleRef, public PBD::Stateful
diff --git a/libs/ardour/ardour/monitor_port.h b/libs/ardour/ardour/monitor_port.h
index 2d8c6c42f7..9cc3176941 100644
--- a/libs/ardour/ardour/monitor_port.h
+++ b/libs/ardour/ardour/monitor_port.h
@@ -25,6 +25,7 @@
 #include "zita-resampler/vmresampler.h"
 
 #include "pbd/rcu.h"
+#include <pbd/signals.h>
 
 #include "ardour/audio_buffer.h"
 #include "ardour/port_engine.h"
diff --git a/libs/ardour/ardour/movable.h b/libs/ardour/ardour/movable.h
index 64ad637f2d..d4fe89a7e6 100644
--- a/libs/ardour/ardour/movable.h
+++ b/libs/ardour/ardour/movable.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class LIBARDOUR_API Movable {
diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h
index 250656679e..74df576544 100644
--- a/libs/ardour/ardour/panner_shell.h
+++ b/libs/ardour/ardour/panner_shell.h
@@ -26,7 +26,9 @@
 #include <string>
 #include <iostream>
 
+#include "evoral/Parameter.h"
 #include "pbd/cartesian.h"
+#include "temporal/domain_provider.h"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/peak.h b/libs/ardour/ardour/peak.h
index 47668177e2..26b86b7cd0 100644
--- a/libs/ardour/ardour/peak.h
+++ b/libs/ardour/ardour/peak.h
@@ -28,7 +28,7 @@ static inline float
 default_compute_peak (const ARDOUR::Sample * const buf, ARDOUR::pframes_t nsamples, float current)
 {
 	for (ARDOUR::pframes_t i = 0; i < nsamples; ++i) {
-		current = f_max (current, fabsf (buf[i]));
+		current = ARDOUR::f_max (current, fabsf (buf[i]));
 	}
 	return current;
 }
diff --git a/libs/ardour/ardour/proxy_controllable.h b/libs/ardour/ardour/proxy_controllable.h
index 61137ae0ab..c6e61dd1e9 100644
--- a/libs/ardour/ardour/proxy_controllable.h
+++ b/libs/ardour/ardour/proxy_controllable.h
@@ -23,6 +23,8 @@
 #include <functional>
 
 #include "pbd/controllable.h"
+
+#include "ardour/dB.h"
 #include "ardour/libardour_visibility.h"
 
 namespace ARDOUR {
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index 2fcfa58c62..b35ca5f6c1 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -71,7 +71,7 @@ class LIBARDOUR_API RCConfiguration : public PBD::Configuration
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
 	Type get_##var () const { return var.get(); } \
 	bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -83,7 +83,7 @@ class LIBARDOUR_API RCConfiguration : public PBD::Configuration
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.inc.h
similarity index 98%
rename from libs/ardour/ardour/rc_configuration_vars.h
rename to libs/ardour/ardour/rc_configuration_vars.inc.h
index 5cd5b976d5..b3b2bdb601 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.inc.h
@@ -89,8 +89,7 @@ CONFIG_VARIABLE (float, ltc_output_volume, "ltc-output-volume", 0.125893)
 
 /* control surfaces */
 
-CONFIG_VARIABLE (uint32_t, feedback_interval_ms,  "feedback-interval-ms", 100)
-CONFIG_VARIABLE (bool, use_tranzport,  "use-tranzport", false)
+CONFIG_VARIABLE (uint32_t, feedback_interval_ms, "feedback-interval-ms", 100)
 CONFIG_VARIABLE (bool, auto_enable_surfaces, "auto-enable-surfaces", true)
 
 /* disk operations */
@@ -184,6 +183,7 @@ CONFIG_VARIABLE (AutoReturnTarget, auto_return_target_list, "auto-return-target-
 CONFIG_VARIABLE (bool, reset_default_speed_on_stop, "reset-default-speed-on-stop", false)
 CONFIG_VARIABLE (bool, rewind_ffwd_like_tape_decks, "rewind-ffwd-like-tape-decks", true)
 CONFIG_VARIABLE (bool, auto_return_after_rewind_ffwd, "auto-return-after-rewind-ffwd", false)
+CONFIG_VARIABLE (bool, stop_on_grid, "stop-on-grid", false)
 
 /* metering */
 
@@ -236,7 +236,7 @@ CONFIG_VARIABLE (samplecnt_t, range_location_minimum, "range-location-minimum",
 CONFIG_VARIABLE (EditMode, edit_mode, "edit-mode", Slide)
 CONFIG_VARIABLE (RippleMode, ripple_mode, "ripple-mode", RippleSelected)
 CONFIG_VARIABLE (Temporal::TimeDomain, default_automation_time_domain, "default-automation-time-domain", Temporal::BeatTime)
-
+CONFIG_VARIABLE (ARDOUR::AnyTime, default_quantization, "default-quantization", ARDOUR::AnyTime (Temporal::BBT_Offset (1, 0, 0)))
 CONFIG_VARIABLE (bool, mark_at_pgm_change, "mark-at-pgm-change", true)
 CONFIG_VARIABLE (bool, locate_to_pgm_change, "locate-to-pgm-change", true)
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index fc76cfb529..a465cf0927 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1367,6 +1367,11 @@ public:
 	void unsuspend_livetrax_auto_connect (bool with_action);
 	void update_track_numbers () { reassign_track_numbers (); }
 
+	AnyTime global_quantization() const { return _global_quantization; }
+	void set_global_quantization (AnyTime const &);
+	PBD::Signal<void()> QuantizationChanged;
+
+
 protected:
 	friend class AudioEngine;
 	void set_block_size (pframes_t nframes);
@@ -2011,7 +2016,7 @@ public:
 	ARDOUR::CueMarkers pending_source_markers; // source markers created while recording
 
 private:
-	void reset_write_sources (bool mark_write_complete, bool force = false);
+	void reset_write_sources (bool mark_write_complete);
 	SourceMap sources;
 
 	int load_sources (const XMLNode& node);
@@ -2399,6 +2404,8 @@ private:
 
 	std::atomic<uint32_t> _no_livetrax_auto_connect;
 	std::map<PBD::ID,double> livetrax_vs_msend_values;
+
+	AnyTime _global_quantization;
 };
 
 
diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h
index 88474b6114..d592234390 100644
--- a/libs/ardour/ardour/session_configuration.h
+++ b/libs/ardour/ardour/session_configuration.h
@@ -53,7 +53,7 @@ public:
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
 	Type get_##var () const { return var.get(); } \
 	bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 	/* clang-format on */
@@ -67,7 +67,7 @@ public:
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 	/* clang-format on */
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.inc.h
similarity index 100%
rename from libs/ardour/ardour/session_configuration_vars.h
rename to libs/ardour/ardour/session_configuration_vars.inc.h
diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h
index 1ee1faddd3..8045e4fe0e 100644
--- a/libs/ardour/ardour/session_playlists.h
+++ b/libs/ardour/ardour/session_playlists.h
@@ -27,6 +27,10 @@
 
 #include <glibmm/threads.h>
 
+#include "ardour/libardour_visibility.h"
+#include "ardour/types.h"
+
+#include "temporal/domain_swap.h"
 
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 07ecb2c53a..b40aab9dd8 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -58,10 +58,11 @@ public:
 	void update_length (timepos_t const & dur);
 
 	void mark_streaming_midi_write_started (const WriterLock& lock, NoteMode mode);
-	void mark_streaming_write_completed (const WriterLock& lock);
+
+	void mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration);
 	void mark_midi_streaming_write_completed (const WriterLock& lock,
 	                                          Evoral::Sequence<Temporal::Beats>::StuckNoteOption,
-	                                          Temporal::Beats when = Temporal::Beats());
+	                                          Temporal::timecnt_t const & duration);
 
 	XMLNode& get_state () const;
 	int set_state (const XMLNode&, int version);
@@ -80,6 +81,8 @@ public:
 
 	void render (const ReaderLock& lock, Evoral::EventSink<Temporal::Beats>& dst);
 
+	Temporal::Beats duration() const;
+
   protected:
 	void close ();
 	void flush_midi (const WriterLock& lock);
diff --git a/libs/ardour/ardour/soundseq.h b/libs/ardour/ardour/soundseq.h
deleted file mode 100644
index 2cf8bcc866..0000000000
--- a/libs/ardour/ardour/soundseq.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2007-2017 Paul Davis <paul@linuxaudiosystems.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#pragma once
-
-#include "edl.h"
-
-namespace ARDOUR {
-
-typedef gint16 peak_datum;
-
-struct LIBARDOUR_API peak_data_t {
-    peak_datum min;
-    peak_datum max;
-};
-
-const uint32_t samples_per_peak = 2048;
-
-class LIBARDOUR_API Sound : public EDL::Piece {
-  public:
-	int peak (peak_data_t& pk, uint32_t start, uint32_t cnt);
-	int read_peaks (peak_data_t *, uint32_t npeaks, uint32_t start, uint32_t cnt);
-	int build_peak (uint32_t first_sample, uint32_t cnt);
-};
-
-class LIBARDOUR_API SoundPlaylist : public EDL::Playlist {
-  public:
-	int read_peaks (peak_data_t *, uint32_t npeaks, uint32_t start, uint32_t cnt);
-};
-
-} /* namespace ARDOUR */
-
-
-
-
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 087dbb861c..1770e70ad9 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -83,7 +83,12 @@ public:
 	void mark_for_remove();
 
 	virtual void mark_streaming_write_started (const WriterLock& lock) {}
-	virtual void mark_streaming_write_completed (const WriterLock& lock) = 0;
+	/* The duration argument is ignored for audio data, where length is
+	   implicitly given by the sample data. It matters for MIDI data, where
+	   the file may be intended to be N bars long, but has no events that
+	   occur at that duration.
+	*/
+	virtual void mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration) = 0;
 
 	virtual void session_saved() {}
 
diff --git a/libs/ardour/ardour/spline.h b/libs/ardour/ardour/spline.h
index c0f02180b7..47a80ad036 100644
--- a/libs/ardour/ardour/spline.h
+++ b/libs/ardour/ardour/spline.h
@@ -19,6 +19,10 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
+#include <cstdint>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libs/ardour/ardour/step_sequencer.h b/libs/ardour/ardour/step_sequencer.h
index 9063a45e27..533f71021c 100644
--- a/libs/ardour/ardour/step_sequencer.h
+++ b/libs/ardour/ardour/step_sequencer.h
@@ -22,6 +22,7 @@
 #include <unistd.h>
 
 #include <boost/intrusive/list.hpp>
+#include <boost/rational.hpp>
 
 #include <glibmm/threads.h>
 
@@ -38,6 +39,8 @@
 #include "ardour/midi_state_tracker.h"
 #include "ardour/types.h"
 
+#include "midi++/types.h"
+
 namespace ARDOUR {
 
 class MidiBuffer;
@@ -299,7 +302,7 @@ class StepSequencer : public PBD::Stateful
 		size_t          start_step;
 		size_t          end_step;
 
-		static MultiAllocSingleReleasePool pool;
+		static PBD::MultiAllocSingleReleasePool pool;
 
 		void *operator new (size_t) {
 			return pool.alloc ();
@@ -322,7 +325,7 @@ class StepSequencer : public PBD::Stateful
 		Temporal::Beats when;
 		uint8_t buf[3];
 
-		static Pool pool;
+		static PBD::Pool pool;
 
 		void *operator new (size_t) {
 			return pool.alloc ();
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 650b910cb7..855a78f841 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -145,7 +145,7 @@ public:
 	void ensure_input_monitoring (bool);
 	std::list<std::shared_ptr<Source> > & last_capture_sources ();
 	std::string steal_write_source_name ();
-	void reset_write_sources (bool, bool force = false);
+	void reset_write_sources (bool mark_write_complete);
 	float playback_buffer_load () const;
 	float capture_buffer_load () const;
 	int do_refill ();
diff --git a/libs/ardour/ardour/transport_fsm.h b/libs/ardour/ardour/transport_fsm.h
index 94b660f59f..9dc2c2cac9 100644
--- a/libs/ardour/ardour/transport_fsm.h
+++ b/libs/ardour/ardour/transport_fsm.h
@@ -12,6 +12,7 @@
 #include <iostream>
 
 #include "pbd/demangle.h"
+#include "pbd/pool.h"
 
 #include "ardour/debug.h"
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h
index ee01cce0db..c3d9b2fc5a 100644
--- a/libs/ardour/ardour/triggerbox.h
+++ b/libs/ardour/ardour/triggerbox.h
@@ -72,7 +72,7 @@ class Session;
 class AudioRegion;
 class MidiRegion;
 class TriggerBox;
-class SlotArmInfo;
+struct SlotArmInfo;
 class SideChain;
 class MidiPort;
 
@@ -715,7 +715,7 @@ class LIBARDOUR_API TriggerBoxThread
 
 	void set_region (TriggerBox&, uint32_t slot, std::shared_ptr<Region>);
 	void request_delete_trigger (Trigger* t);
-	void request_build_source (Trigger* t);
+	void request_build_source (Trigger* t, Temporal::timecnt_t const & duration);
 
 	void summon();
 	void stop();
@@ -743,6 +743,7 @@ class LIBARDOUR_API TriggerBoxThread
 		std::shared_ptr<Region> region;
 		/* for DeleteTrigger and BuildSourceAndRegion */
 		Trigger* trigger;
+		Temporal::timecnt_t duration;
 
 		void* operator new (size_t);
 		void  operator delete (void* ptr, size_t);
@@ -757,9 +758,9 @@ class LIBARDOUR_API TriggerBoxThread
 	CrossThreadChannel _xthread;
 	void queue_request (Request*);
 	void delete_trigger (Trigger*);
-	void build_source (Trigger*);
-	void build_midi_source (MIDITrigger*);
-	void build_audio_source (AudioTrigger*);
+	void build_source (Trigger*, Temporal::timecnt_t const & duration);
+	void build_midi_source (MIDITrigger*, Temporal::timecnt_t const &);
+	void build_audio_source (AudioTrigger*, Temporal::timecnt_t const &);
 };
 
 struct CueRecord {
@@ -783,7 +784,7 @@ struct SlotArmInfo {
 	samplepos_t start_samples;
 	Temporal::Beats end_beats;
 	samplepos_t end_samples;
-	Temporal::timecnt_t captured;
+	samplecnt_t captured;
 	RTMidiBufferBeats* midi_buf;
 	AudioTrigger::AudioData audio_buf;
 	RubberBand::RubberBandStretcher* stretcher;
@@ -814,6 +815,7 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro
 
 	void arm_from_another_thread (Trigger& slot, samplepos_t, uint32_t chans);
 	void disarm();
+	void disarm_all();
 	bool armed() const { return (bool) _arm_info.load(); }
 	PBD::Signal<void()> ArmedChanged;
 
@@ -941,7 +943,7 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro
 
 	void dump (std::ostream &) const;
 
-	PBD::Signal<void(timecnt_t)> Captured;
+	PBD::Signal<void(samplecnt_t)> Captured;
 
   private:
 	struct Requests {
@@ -1099,6 +1101,7 @@ namespace Properties {
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> patch_change; /* type not important */
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> channel_map; /* type not important */
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> used_channels; /* type not important */
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> region; /* type not important */
 
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> tempo_meter; /* only used to transmit changes, not storage */
 }
diff --git a/libs/ardour/ardour/trimmable.h b/libs/ardour/ardour/trimmable.h
index 357f812277..f2c7601a2b 100644
--- a/libs/ardour/ardour/trimmable.h
+++ b/libs/ardour/ardour/trimmable.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class LIBARDOUR_API Trimmable {
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 3083fd1290..c755727fcd 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -304,6 +304,7 @@ class AnyTime {
 	enum Type {
 		Timecode,
 		BBT,
+		BBT_Offset,
 		Samples,
 		Seconds
 	};
@@ -311,14 +312,21 @@ class AnyTime {
 	Type type;
 
 	Timecode::Time     timecode;
-	Temporal::BBT_Time bbt;
+	union {
+		Temporal::BBT_Time bbt;
+		Temporal::BBT_Offset bbt_offset;
+	};
 
 	union {
 		samplecnt_t     samples;
 		double         seconds;
 	};
 
-	AnyTime() { type = Samples; samples = 0; }
+	AnyTime () : type (Samples), samples (0) {}
+	AnyTime (Temporal::BBT_Offset bt) : type (BBT_Offset), bbt_offset (bt) {}
+	AnyTime (std::string const &);
+
+	std::string str() const;
 
 	bool operator== (AnyTime const & other) const {
 		if (type != other.type) { return false; }
@@ -328,6 +336,8 @@ class AnyTime {
 			return timecode == other.timecode;
 		case BBT:
 			return bbt == other.bbt;
+		case BBT_Offset:
+			return bbt_offset == other.bbt_offset;
 		case Samples:
 			return samples == other.samples;
 		case Seconds:
@@ -344,6 +354,8 @@ class AnyTime {
 				timecode.seconds != 0 || timecode.frames != 0;
 		case BBT:
 			return bbt.bars != 0 || bbt.beats != 0 || bbt.ticks != 0;
+		case BBT_Offset:
+			return bbt_offset.bars != 0 || bbt_offset.beats != 0 || bbt_offset.ticks != 0;
 		case Samples:
 			return samples != 0;
 		case Seconds:
diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h
index 19b8484589..75f69c199f 100644
--- a/libs/ardour/ardour/types_convert.h
+++ b/libs/ardour/ardour/types_convert.h
@@ -94,6 +94,32 @@ DEFINE_ENUM_CONVERT(ARDOUR::CueBehavior)
 
 DEFINE_ENUM_CONVERT(MusicalMode::Type)
 
+template <>
+inline bool to_string (ARDOUR::AnyTime const & at, std::string & str)
+{
+	str = at.str();
+	return true;
+}
+
+template <>
+inline bool string_to (std::string const & str, ARDOUR::AnyTime & at)
+{
+	at = ARDOUR::AnyTime (str);
+	return true;
+}
+
+template <>
+inline std::string to_string (ARDOUR::AnyTime at)
+{
+	return at.str();
+}
+
+template <>
+inline ARDOUR::AnyTime string_to (std::string const & str)
+{
+	return ARDOUR::AnyTime (str);
+}
+
 template <>
 inline std::string to_string (ARDOUR::timepos_t val)
 {
diff --git a/libs/ardour/ardour/vst3_scan.h b/libs/ardour/ardour/vst3_scan.h
index 0bd842cc2e..d3dc68964e 100644
--- a/libs/ardour/ardour/vst3_scan.h
+++ b/libs/ardour/ardour/vst3_scan.h
@@ -19,6 +19,7 @@
 #ifndef _ardour_vst3_scan_h_
 #define _ardour_vst3_scan_h_
 
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index c3e83bfa13..e1c68d6852 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -249,13 +249,13 @@ AudioFileSource::set_state (const XMLNode& node, int version)
 }
 
 void
-AudioFileSource::mark_streaming_write_completed (const WriterLock& lock)
+AudioFileSource::mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration)
 {
 	if (!writable()) {
 		return;
 	}
 
-	AudioSource::mark_streaming_write_completed (lock);
+	AudioSource::mark_streaming_write_completed (lock, duration);
 }
 
 int
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 970854610b..795debc390 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -932,6 +932,7 @@ AudioSource::compute_and_write_peaks (Sample const * buf, samplecnt_t first_samp
 	samplecnt_t samples_done;
 	const size_t blocksize = (128 * 1024);
 	off_t first_peak_byte;
+	std::unique_ptr<Sample[]> buf2;
 
 	if (-1 == _peakfile_fd) {
 		if (prepare_for_peakfile_writes ()) {
@@ -991,7 +992,7 @@ AudioSource::compute_and_write_peaks (Sample const * buf, samplecnt_t first_samp
 		/* make a new contiguous buffer containing leftovers and the new stuff */
 
 		to_do = cnt + peak_leftover_cnt;
-		std::unique_ptr<Sample[]> buf2(new Sample[to_do]);
+		buf2.reset(new Sample[to_do]);
 
 		/* the remnants */
 		memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample));
@@ -1150,7 +1151,7 @@ AudioSource::available_peaks (double zoom_factor) const
 }
 
 void
-AudioSource::mark_streaming_write_completed (const WriterLock& lock)
+AudioSource::mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const &)
 {
 	Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
 
diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc
index d205592ad3..bc800ddd3f 100644
--- a/libs/ardour/broadcast_info.cc
+++ b/libs/ardour/broadcast_info.cc
@@ -39,15 +39,15 @@ namespace ARDOUR
 static void
 snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
 {
-	std::vector<char> buf(target_size+1);
+	std::unique_ptr<char[]> buf (new char [target_size + 1]);
 	va_list ap;
 
 	va_start (ap, fmt);
-	vsnprintf (&buf[0], target_size+1, fmt, ap);
+	vsnprintf (buf.get (), target_size+1, fmt, ap);
 	va_end (ap);
 
 	memset (target, 0, target_size);
-	memcpy (target, &buf[0], target_size);
+	memcpy (target, buf.get (), target_size);
 
 }
 
diff --git a/libs/ardour/delayline.cc b/libs/ardour/delayline.cc
index 64408941f0..2be812b28b 100644
--- a/libs/ardour/delayline.cc
+++ b/libs/ardour/delayline.cc
@@ -362,7 +362,7 @@ DelayLine::allocate_pending_buffers (samplecnt_t signal_delay, ChanCount const&
 
 	AudioDlyBuf pending_buf;
 	for (uint32_t i = 0; i < cc.n_audio (); ++i) {
-		boost::shared_array<Sample> b (new Sample[rbs]);
+		std::shared_ptr<Sample[]> b (new Sample[rbs]);
 		pending_buf.push_back (b);
 		memset (b.get (), 0, rbs * sizeof (Sample));
 	}
diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
index c0e8607b32..21493640a9 100644
--- a/libs/ardour/disk_writer.cc
+++ b/libs/ardour/disk_writer.cc
@@ -390,7 +390,7 @@ DiskWriter::set_state (const XMLNode& node, int version)
 	node.get_property (X_("record-safe"), rec_safe);
 	_record_safe.store (rec_safe);
 
-	reset_write_sources (false, true);
+	reset_write_sources (false);
 
 	return 0;
 }
@@ -1072,7 +1072,7 @@ DiskWriter::do_flush (RunContext ctxt, bool force_flush)
 }
 
 void
-DiskWriter::reset_write_sources (bool mark_write_complete, bool /*force*/)
+DiskWriter::reset_write_sources (bool mark_write_complete)
 {
 	std::shared_ptr<ChannelList const> c = channels.reader();
 	uint32_t n = 0;
@@ -1085,13 +1085,17 @@ DiskWriter::reset_write_sources (bool mark_write_complete, bool /*force*/)
 
 	for (auto const chan : *c) {
 
-		if (chan->write_source) {
+		if (mark_write_complete) {
+			Source::WriterLock lock(chan->write_source->mutex());
+			/* we're iterating over channels, so we know this is an
+			   audio source and the duration argument makes no
+			   difference
+			*/
+			chan->write_source->mark_streaming_write_completed (lock, timecnt_t());
+			chan->write_source->done_with_peakfile_writes ();
+		}
 
-			if (mark_write_complete) {
-				Source::WriterLock lock(chan->write_source->mutex());
-				chan->write_source->mark_streaming_write_completed (lock);
-				chan->write_source->done_with_peakfile_writes ();
-			}
+		if (chan->write_source) {
 
 			if (chan->write_source->removable()) {
 				chan->write_source->mark_for_remove ();
@@ -1108,13 +1112,6 @@ DiskWriter::reset_write_sources (bool mark_write_complete, bool /*force*/)
 		}
 	}
 
-	if (_midi_write_source) {
-		if (mark_write_complete) {
-			Source::WriterLock lm(_midi_write_source->mutex());
-			_midi_write_source->mark_streaming_write_completed (lm);
-		}
-	}
-
 	if (_playlists[DataType::MIDI]) {
 		use_new_write_source (DataType::MIDI);
 	}
@@ -1315,7 +1312,11 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo
 			total_capture += timecnt_t ((*ci)->samples);
 		}
 
-		_midi_write_source->mark_midi_streaming_write_completed (source_lock, Evoral::Sequence<Temporal::Beats>::ResolveStuckNotes, total_capture.beats());
+		/* XXX we need to consider snapping the duration up to the next
+		 * beat/bar here
+		 */
+
+		_midi_write_source->mark_midi_streaming_write_completed (source_lock, Evoral::Sequence<Temporal::Beats>::ResolveStuckNotes, total_capture);
 	}
 
 	_last_capture_sources.insert (_last_capture_sources.end(), audio_srcs.begin(), audio_srcs.end());
@@ -1441,6 +1442,7 @@ bool
 DiskWriter::configure_io (ChanCount in, ChanCount out)
 {
 	bool changed = false;
+
 	{
 		std::shared_ptr<ChannelList const> c = channels.reader();
 		if (in.n_audio() != c->size()) {
@@ -1457,7 +1459,7 @@ DiskWriter::configure_io (ChanCount in, ChanCount out)
 	}
 
 	if (record_enabled() || changed) {
-		reset_write_sources (false, true);
+		reset_write_sources (false);
 	}
 
 	return true;
@@ -1472,7 +1474,7 @@ DiskWriter::use_playlist (DataType dt, std::shared_ptr<Playlist> playlist)
 		return -1;
 	}
 	if (reset_ws) {
-		reset_write_sources (false, true);
+		reset_write_sources (false);
 	}
 	return 0;
 }
diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 5a4bd7d671..82706337b0 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -796,9 +796,9 @@ ExportGraphBuilder::Intermediate::Intermediate (ExportGraphBuilder & parent, Fil
 	int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float;
 
 	if (parent._realtime) {
-		tmp_file.reset (new TmpFileRt<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
+		tmp_file.reset (new TmpFileRt<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
 	} else {
-		tmp_file.reset (new TmpFileSync<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
+		tmp_file.reset (new TmpFileSync<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
 	}
 
 	tmp_file->FileWritten.connect_same_thread (post_processing_connection,
diff --git a/libs/ardour/export_smf_writer.cc b/libs/ardour/export_smf_writer.cc
index 16aeff975b..cfdbe2d1d4 100644
--- a/libs/ardour/export_smf_writer.cc
+++ b/libs/ardour/export_smf_writer.cc
@@ -95,3 +95,9 @@ ExportSMFWriter::process (MidiBuffer const& buf, sampleoffset_t off, samplecnt_t
 		_pos += n_samples;
 	}
 }
+
+Temporal::Beats
+ExportSMFWriter::duration() const
+{
+	return std::numeric_limits<Temporal::Beats>::max ();
+}
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index bcaef5fc10..5847c3f75e 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -34,6 +34,8 @@
 
 #include <cstdio> // Needed so that libraptor (included in lrdf) won't complain
 #include <cstdlib>
+#include <sstream>
+
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -84,6 +86,7 @@
 #include "pbd/cpus.h"
 #include "pbd/enumwriter.h"
 #include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
 #include "pbd/fpu.h"
 #include "pbd/id.h"
@@ -1074,3 +1077,70 @@ ARDOUR::reset_performance_meters (Session *session)
 		AudioEngine::instance()->current_backend()->dsp_stats[n].queue_reset ();
 	}
 }
+
+ARDOUR::AnyTime::AnyTime (std::string const & str)
+{
+	char c;
+	std::stringstream ss;
+
+	ss << str;
+	ss >> c;
+
+	switch (c) {
+	case 't':
+		type = Timecode;
+		if (!Timecode::parse_timecode_format (str.substr (1), timecode)) {
+			throw failed_constructor ();
+		}
+		break;
+	case 'b':
+		type = BBT;
+		ss >> bbt;
+		break;
+	case 'B':
+		type = BBT_Offset;
+		ss >> bbt_offset;
+		break;
+	case 's':
+		type = Samples;
+		ss >> samples;
+		break;
+	case 'S':
+		type = Seconds;
+		ss >> seconds;
+		break;
+	default:
+		throw failed_constructor();
+	}
+}
+
+std::string
+ARDOUR::AnyTime::str() const
+{
+	std::stringstream ss;
+	switch (type) {
+	case Timecode:
+		ss << 't';
+		ss << timecode;
+		break;
+	case BBT:
+		ss << 'b';
+		ss << bbt;
+		break;
+	case BBT_Offset:
+		ss << 'B';
+		ss << bbt_offset;
+		break;
+	case Samples:
+		ss << 's';
+		ss << samples;
+		break;
+	case Seconds:
+		ss << 'S';
+		ss << seconds;
+		break;
+	}
+
+	return ss.str ();
+}
+
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 1a73351d0e..833df4440d 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -40,8 +40,6 @@
 #include "pbd/gstdio_compat.h"
 #include <glibmm.h>
 
-#include <boost/shared_array.hpp>
-
 #include "pbd/basename.h"
 #include "pbd/convert.h"
 
@@ -134,7 +132,7 @@ open_importable_source (const string& path, samplecnt_t samplerate, ARDOUR::SrcQ
 		}
 
 		/* rewrap as a resampled source */
-		return std::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));		
+		return std::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
 	} catch (...) { }
 
 	throw failed_constructor ();
@@ -266,10 +264,10 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
 	}
 
 	std::unique_ptr<float[]> data(new float[nframes * channels]);
-	vector<boost::shared_array<Sample> > channel_data;
+	vector<std::shared_ptr<Sample[]> > channel_data;
 
 	for (uint32_t n = 0; n < channels; ++n) {
-		channel_data.push_back(boost::shared_array<Sample>(new Sample[nframes]));
+		channel_data.push_back(std::shared_ptr<Sample[]>(new Sample[nframes]));
 	}
 
 	float gain = 1;
@@ -464,18 +462,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 
 				/* we wrote something */
 
-				/* try to guess at the meter, for 5/4 midi loop oddballs */
-				int pulses_per_bar = 4;
-				Evoral::SMF::Tempo *tempo = source->nth_tempo (0);
-				if (tempo && (tempo->numerator>0) ) {
-					pulses_per_bar = tempo->numerator;
-				}
-
-				/* extend the length of the region to the end of a bar */
-				const Temporal::Beats  length_beats = Temporal::Beats::ticks_at_rate(t, source->ppqn());
-				smfs->update_length (timepos_t (length_beats.round_up_to_multiple(Temporal::Beats(pulses_per_bar,0))));
-
-				smfs->mark_streaming_write_completed (source_lock);
+				smfs->mark_streaming_write_completed (source_lock, timecnt_t (source->duration()));
 
 				/* the streaming write that we've just finished
 				 * only wrote data to the SMF object, which is
@@ -486,12 +473,10 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 
 				smfs->load_model (source_lock, true);
 
-				/* Now that there is a model, we can set interpolation of parameters. */
-				smfs->mark_streaming_write_completed (source_lock);
-
 				if (status.cancel) {
 					break;
 				}
+
 			} else {
 				info << string_compose (_("Track %1 of %2 contained no usable MIDI data"), i, total_files) << endmsg;
 			}
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 7f589a37ac..395543e5b6 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -1337,7 +1337,6 @@ IO::bundle_changed (Bundle::Change /*c*/)
 string
 IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
 {
-	const int name_size = AudioEngine::instance()->port_name_size();
 	int limit;
 	string suffix;
 
@@ -1371,21 +1370,24 @@ IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
 
 	// allow up to 4 digits for the output port number, plus the slash, suffix and extra space
 
+	uint32_t name_size = AudioEngine::instance()->port_name_size();
 	limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5);
 
-	std::vector<char> buf1(name_size+1);
-	std::vector<char> buf2(name_size+1);
+	++name_size; // allow for \0
+
+	std::unique_ptr<char[]> buf1 (new char[name_size]);
+	std::unique_ptr<char[]> buf2 (new char[name_size]);
 
 	/* colons are illegal in port names, so fix that */
 
 	string nom = legalize_io_name (_name.val());
 
-	snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
+	std::snprintf (buf1.get(), name_size, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
 
-	int port_number = find_port_hole (ports, &buf1[0]);
-	snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number);
+	int port_number = find_port_hole (ports, buf1.get ());
+	std::snprintf (buf2.get(), name_size, "%s %d", buf1.get (), port_number);
 
-	return string (&buf2[0]);
+	return string (buf2.get ());
 }
 
 int32_t
@@ -1399,17 +1401,17 @@ IO::find_port_hole (std::shared_ptr<PortSet const> ports, const char* base)
 		return 1;
 	}
 
-	/* we only allow up to 4 characters for the port number
-	 */
+	uint32_t const name_size = AudioEngine::instance()->port_name_size() + 1;
 
+	/* we only allow up to 4 characters for the port number */
 	for (n = 1; n < 9999; ++n) {
-		std::vector<char> buf (AudioEngine::instance()->port_name_size());
 		PortSet::const_iterator i = ports->begin ();
 
-		snprintf (&buf[0], buf.size()+1, _("%s %u"), base, n);
+		std::unique_ptr<char[]> buf (new char[name_size]);
+		std::snprintf (buf.get (), name_size, "%s %u", base, n);
 
 		for ( ; i != ports->end (); ++i) {
-			if (string (i->name()) == string (&buf[0])) {
+			if (string (i->name()) == string (buf.get ())) {
 				break;
 			}
 		}
@@ -1525,13 +1527,13 @@ IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const
 		case 2:
 			return c == 0 ? _("L") : _("R");
 		default:
-			snprintf (buf, sizeof(buf), "%d", (c + 1));
+			std::snprintf (buf, sizeof(buf), "%d", (c + 1));
 			return buf;
 		}
 
 	} else {
 
-		snprintf (buf, sizeof(buf), "%d", (c + 1));
+		std::snprintf (buf, sizeof(buf), "%d", (c + 1));
 		return buf;
 
 	}
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index 49d8c0c648..4147df5a1d 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -3008,7 +3008,7 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("set_" # var, &RCConfiguration::set_##var) \
 		.addProperty (#var, &RCConfiguration::get_##var, &RCConfiguration::set_##var)
 
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 
 #undef CONFIG_VARIABLE
 #undef CONFIG_VARIABLE_SPECIAL
@@ -3027,7 +3027,7 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("set_" # var, &SessionConfiguration::set_##var) \
 		.addProperty (#var, &SessionConfiguration::get_##var, &SessionConfiguration::set_##var)
 
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 
 #undef CONFIG_VARIABLE
 #undef CONFIG_VARIABLE_SPECIAL
diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc
index 6241d4df8b..859d549e58 100644
--- a/libs/ardour/luaproc.cc
+++ b/libs/ardour/luaproc.cc
@@ -380,6 +380,7 @@ LuaProc::load_script ()
 				_param_desc[pn].logarithmic  = lr["logarithmic"].isBoolean () && (lr["logarithmic"]).cast<bool> ();
 				_param_desc[pn].integer_step = lr["integer"].isBoolean () && (lr["integer"]).cast<bool> ();
 				_param_desc[pn].sr_dependent = lr["ratemult"].isBoolean () && (lr["ratemult"]).cast<bool> ();
+				_param_desc[pn].inline_ctrl  = lr["inline"].isBoolean () && (lr["inline"]).cast<bool> ();
 				_param_desc[pn].enumeration  = lr["enum"].isBoolean () && (lr["enum"]).cast<bool> ();
 
 				if (lr["bypass"].isBoolean () && (lr["bypass"]).cast<bool> ()) {
@@ -1094,6 +1095,7 @@ LuaProc::get_parameter_descriptor (uint32_t port, ParameterDescriptor& desc) con
 	desc.integer_step = d.integer_step;
 	desc.sr_dependent = d.sr_dependent;
 	desc.enumeration  = d.enumeration;
+	desc.inline_ctrl  = d.inline_ctrl;
 	desc.unit         = d.unit;
 	desc.label        = d.label;
 	desc.scale_points = d.scale_points;
@@ -1163,7 +1165,6 @@ LuaProc::parse_scale_points (luabridge::LuaRef* lr)
 		return std::shared_ptr<ScalePoints> ();
 	}
 
-	int cnt = 0;
 	std::shared_ptr<ScalePoints> rv = std::shared_ptr<ScalePoints>(new ScalePoints());
 	luabridge::LuaRef scalepoints ((*lr)["scalepoints"]);
 
@@ -1172,7 +1173,6 @@ LuaProc::parse_scale_points (luabridge::LuaRef* lr)
 		if (!i.value ().isNumber ())  { continue; }
 		rv->insert(make_pair(i.key ().cast<std::string> (),
 					i.value ().cast<float> ()));
-		++cnt;
 	}
 
 	if (rv->size() > 0) {
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index c35ab34291..37890f25f3 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -1244,15 +1244,15 @@ MidiModel::write_to (std::shared_ptr<MidiSource>     source,
 {
 	ReadLock lock (read_lock()); /* Sequence read-lock */
 
-	source->drop_model(source_lock);
+	source->drop_model (source_lock);
 	/* as of March 2022 or long before , the note mode argument does nothing */
 	source->mark_streaming_midi_write_started (source_lock, Sustained);
 
 	for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
-		source->append_event_beats(source_lock, *i);
+		source->append_event_beats (source_lock, *i);
 	}
 
-	source->mark_streaming_write_completed(source_lock);
+	source->mark_streaming_write_completed (source_lock, timecnt_t (duration()));
 
 	/* no call to set_edited() because writing to "newsrc" doesn't remove
 	 * the need to write to "our own" source in ::sync_to_source()
@@ -1269,13 +1269,11 @@ MidiModel::write_to (std::shared_ptr<MidiSource>     source,
 bool
 MidiModel::sync_to_source (const Source::WriterLock& source_lock)
 {
-	ReadLock lock(read_lock());
-
-	std::cerr << "SYNC " << _midi_source.name() << " from model\n";
+	ReadLock lock (read_lock());
 
 	/* Invalidate and store active notes, which will be picked up by the iterator
 	   on the next roll if time progresses linearly. */
-	_midi_source.invalidate(source_lock);
+	_midi_source.invalidate (source_lock);
 
 	/* as of March 2022 or long before , the note mode argument does nothing */
 	_midi_source.mark_streaming_midi_write_started (source_lock, Sustained);
@@ -1284,7 +1282,7 @@ MidiModel::sync_to_source (const Source::WriterLock& source_lock)
 		_midi_source.append_event_beats(source_lock, *i);
 	}
 
-	_midi_source.mark_streaming_write_completed (source_lock);
+	_midi_source.mark_streaming_write_completed (source_lock, timecnt_t (duration()));
 
 	set_edited (false);
 
@@ -1300,10 +1298,10 @@ MidiModel::sync_to_source (const Source::WriterLock& source_lock)
  */
 bool
 MidiModel::write_section_to (std::shared_ptr<MidiSource>     source,
-                             const Source::WriterLock&         source_lock,
-                             TimeType                          begin_time,
-                             TimeType                          end_time,
-                             bool                              offset_events)
+                             const Source::WriterLock&       source_lock,
+                             TimeType                        begin_time,
+                             TimeType                        end_time,
+                             bool                            offset_events)
 {
 	ReadLock lock(read_lock());
 	MidiNoteTracker mst;
@@ -1348,7 +1346,11 @@ MidiModel::write_section_to (std::shared_ptr<MidiSource>     source,
 	}
 	mst.resolve_notes (*source, source_lock, end_time);
 
-	source->mark_streaming_write_completed(source_lock);
+	/* the new source will have precisely the length given by begin_time
+	 * and end_time. That might not be quite right in some cases.
+	 */
+
+	source->mark_streaming_write_completed (source_lock, timecnt_t (end_time - begin_time));
 
 	set_edited(false);
 
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 1c06bcc406..45913ebb17 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -363,8 +363,8 @@ MidiPlaylist::render (MidiChannelFilter* filter)
 		EventsSortByTimeAndType<samplepos_t> cmp;
 
 		/* iterate, top-most region first */
-		for (auto i = regs.rbegin(); i != regs.rend(); ++i) {
-			std::shared_ptr<MidiRegion> mr = *i;
+		for (auto & mr : regs) {
+
 			DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("maybe render from %1\n", mr->name()));
 
 			if (top) {
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index a899b1396b..f7be87cb75 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -376,10 +376,10 @@ MidiSource::mark_streaming_write_started (const WriterLock& lock)
 void
 MidiSource::mark_midi_streaming_write_completed (const WriterLock&                                  lock,
                                                  Evoral::Sequence<Temporal::Beats>::StuckNoteOption option,
-                                                 Temporal::Beats                                    end)
+                                                 Temporal::timecnt_t const &                        duration)
 {
 	if (_model) {
-		_model->end_write (option, end);
+		_model->end_write (option, duration.beats());
 
 		/* Make captured controls discrete to play back user input exactly. */
 		for (MidiModel::Controls::iterator i = _model->controls().begin(); i != _model->controls().end(); ++i) {
@@ -395,9 +395,9 @@ MidiSource::mark_midi_streaming_write_completed (const WriterLock&
 }
 
 void
-MidiSource::mark_streaming_write_completed (const WriterLock& lock)
+MidiSource::mark_streaming_write_completed (const WriterLock& lock, Temporal::timecnt_t const & duration)
 {
-	mark_midi_streaming_write_completed (lock, Evoral::Sequence<Temporal::Beats>::DeleteStuckNotes);
+	mark_midi_streaming_write_completed (lock, Evoral::Sequence<Temporal::Beats>::DeleteStuckNotes, duration);
 }
 
 int
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index 81a865934e..60d1c20313 100644
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -43,7 +43,7 @@ using namespace Glib;
 
 MidiControlUI* MidiControlUI::_instance = 0;
 
-#include "pbd/abstract_ui.cc"  /* instantiate the template */
+#include "pbd/abstract_ui.inc.cc" /* instantiate the template */
 
 MidiControlUI::MidiControlUI (Session& s)
 	: AbstractUI<MidiUIRequest> (X_("midiUI"))
diff --git a/libs/ardour/po/es.po b/libs/ardour/po/es.po
index 5d0a43537f..47f8e3b16f 100644
--- a/libs/ardour/po/es.po
+++ b/libs/ardour/po/es.po
@@ -3,198 +3,208 @@ msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-05-20 14:36-0600\n"
-"PO-Revision-Date: 2015-03-15 \n"
+"PO-Revision-Date: 2024-11-06 16:18-0500\n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #: analyser.cc:127 audioregion.cc:1791
 msgid "Transient Analysis failed for %1."
-msgstr ""
+msgstr "El análisis de transientes falló para %1."
 
 #: analyser.cc:127
 msgid "Audio File Source"
-msgstr ""
+msgstr "Fuente del archivo de audio"
 
 #: analysis_graph.cc:136
 msgid "%1 (%2..%3)"
-msgstr ""
+msgstr "%1 (%2..%3)"
 
 #: audio_backend.cc:31
 msgid "No Error occurred"
-msgstr ""
+msgstr "No ocurrió ningún error"
 
 #: audio_backend.cc:33
 msgid "Failed to initialize audio backend"
-msgstr ""
+msgstr "No se pudo inicializar el backend de audio"
 
 #: audio_backend.cc:35
 msgid "Failed to deinitialize audio backend"
-msgstr ""
+msgstr "No se pudo desinicializar el backend de audio"
 
 #: audio_backend.cc:37
 msgid "Failed to reinitialize audio backend"
-msgstr ""
+msgstr "No se pudo reinicializar el backend de audio"
 
 #: audio_backend.cc:39
 msgid ""
 "Failed to open audio device\n"
 "(Typically caused by hardware parameter settings)"
 msgstr ""
+"No se pudo abrir el dispositivo de audio\n"
+"(Generalmente causado por la configuración de los parámetros del hardware)"
 
 #: audio_backend.cc:41
 msgid "Failed to close audio device"
-msgstr ""
+msgstr "No se pudo cerrar el dispositivo de audio"
 
 #: audio_backend.cc:43
 msgid "Audio device not valid"
-msgstr ""
+msgstr "Dispositivo de audio no válido"
 
 #: audio_backend.cc:45
 msgid "Audio device unavailable"
-msgstr ""
+msgstr "Dispositivo de audio no disponible"
 
 #: audio_backend.cc:47
 msgid "Audio device not connected"
-msgstr ""
+msgstr "Dispositivo de audio no conectado"
 
 #: audio_backend.cc:49
 msgid "Failed to request and reserve audio device"
-msgstr ""
+msgstr "No se pudo solicitar ni reservar el dispositivo de audio"
 
 #: audio_backend.cc:51
 msgid "Audio device Input/Output error"
-msgstr ""
+msgstr "Error de entrada/salida del dispositivo de audio"
 
 #: audio_backend.cc:53
 msgid "Failed to open MIDI device"
-msgstr ""
+msgstr "No se pudo abrir el dispositivo MIDI"
 
 #: audio_backend.cc:55
 msgid "Failed to close MIDI device"
-msgstr ""
+msgstr "No se pudo cerrar el dispositivo MIDI"
 
 #: audio_backend.cc:57
 msgid "MIDI device unavailable"
-msgstr ""
+msgstr "Dispositivo MIDI no disponible"
 
 #: audio_backend.cc:59
 msgid "MIDI device not connected"
-msgstr ""
+msgstr "Dispositivo MIDI no conectado"
 
 #: audio_backend.cc:61
 msgid "MIDI device Input/Output error"
-msgstr ""
+msgstr "Error de entrada/salida del dispositivo MIDI"
 
 #: audio_backend.cc:63
 msgid "Sample format is not supported"
-msgstr ""
+msgstr "El formato de muestra no es compatible"
 
 #: audio_backend.cc:65
 msgid "Sample rate is not supported"
-msgstr ""
+msgstr "La frecuencia de muestreo no es compatible"
 
 #: audio_backend.cc:67
 msgid "Requested input latency is not supported"
-msgstr ""
+msgstr "La latencia de entrada solicitada no es compatible"
 
 #: audio_backend.cc:69
 msgid "Requested output latency is not supported"
-msgstr ""
+msgstr "La latencia de salida solicitada no es compatible"
 
 #: audio_backend.cc:71
 msgid "Period size is not supported"
-msgstr ""
+msgstr "El tamaño del período no es compatible"
 
 #: audio_backend.cc:73
 msgid "Period count is not supported"
-msgstr ""
+msgstr "No se admite el recuento de períodos"
 
 #: audio_backend.cc:75
 msgid "Device configuration not supported"
-msgstr ""
+msgstr "Configuración del dispositivo no compatible"
 
 #: audio_backend.cc:77
 msgid "Channel count configuration not supported"
-msgstr ""
+msgstr "No se admite la configuración del recuento de canales"
 
 #: audio_backend.cc:79
 msgid "Input channel count configuration not supported"
-msgstr ""
+msgstr "No se admite la configuración del recuento de canales de entrada"
 
 #: audio_backend.cc:81
 msgid "Output channel count configuration not supported"
-msgstr ""
+msgstr "No se admite la configuración del recuento de canales de salida"
 
 #: audio_backend.cc:83
 msgid "Unable to acquire realtime permissions"
-msgstr ""
+msgstr "No se pueden adquirir permisos en tiempo real"
 
 #: audio_backend.cc:85
 msgid "Setting audio device thread priorities failed"
 msgstr ""
+"Error al configurar las prioridades de los subprocesos del dispositivo de "
+"audio"
 
 #: audio_backend.cc:87
 msgid "Setting MIDI device thread priorities failed"
 msgstr ""
+"Falló la configuración de prioridades de subprocesos del dispositivo MIDI"
 
 #: audio_backend.cc:89
 msgid "Failed to start process thread"
-msgstr ""
+msgstr "No se pudo iniciar el hilo del proceso"
 
 #: audio_backend.cc:91
 msgid "Failed to start freewheel thread"
-msgstr ""
+msgstr "No se pudo iniciar el hilo de rueda libre"
 
 #: audio_backend.cc:93
 msgid "Failed to register audio/midi ports"
-msgstr ""
+msgstr "No se pudieron registrar los puertos de audio/midi"
 
 #: audio_backend.cc:95
 msgid "Failed to re-connect audio/midi ports"
-msgstr ""
+msgstr "No se pudo volver a conectar los puertos de audio/midi"
 
 #: audio_backend.cc:97
 msgid "Out Of Memory Error"
-msgstr ""
+msgstr "Error de falta de memoria"
 
 #: audio_backend.cc:99
 msgid "Could not reconnect to Audio/MIDI engine"
-msgstr ""
+msgstr "No se pudo volver a conectar al motor de audio/MIDI"
 
 #: audio_backend.cc:107 export_formats.cc:60 session.cc:6791
 #: transport_master.cc:489
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: audio_backend.cc:109
 msgid "Default"
-msgstr ""
+msgstr "Por defecto"
 
 #: audio_library.cc:90
 msgid "Could not open %1.  Audio Library not saved"
-msgstr "No se pudo abrir %1. Biblioteca de Audio no guardada."
+msgstr "No se pudo abrir %1. Biblioteca de Audio no guardada"
 
 #: audio_playlist.cc:519
 msgid ""
 "Legacy crossfade involved an incoming region not present in playlist \"%1\" "
 "- crossfade discarded"
 msgstr ""
+"El fundido cruzado heredado involucró una región entrante que no está "
+"presente en la lista de reproducción \"%1\" - fundido cruzado descartado"
 
 #: audio_playlist.cc:535
 msgid ""
 "Legacy crossfade involved an outgoing region not present in playlist \"%1\" "
 "- crossfade discarded"
 msgstr ""
+"El fundido cruzado heredado involucró una región saliente que no está "
+"presente en la lista de reproducción \"%1\" - fundido cruzado descartado"
 
 #: audio_playlist_importer.cc:70
 msgid "Audio Playlists"
-msgstr ""
+msgstr "Listas de reproducción de audio"
 
 #: audio_playlist_importer.cc:163
 msgid "region"
@@ -210,11 +220,11 @@ msgstr "Ya existe un puerto con este nombre, por favor renómbralo."
 
 #: audio_playlist_importer.cc:185
 msgid "badly-formed XML in imported playlist"
-msgstr ""
+msgstr "XML mal formado en la lista de reproducción importada"
 
 #: audio_playlist_importer.cc:269
 msgid "Audio Playlists (unused)"
-msgstr ""
+msgstr "Listas de reproducción de audio (sin usar)"
 
 #: audio_playlist_source.cc:169 audiosource.cc:1054 midi_playlist_source.cc:163
 #: midi_playlist_source.cc:171 midi_playlist_source.cc:178 midi_source.cc:410
@@ -254,7 +264,7 @@ msgstr "Pistas de audio"
 
 #: audio_track_importer.cc:255 audio_track_importer.cc:261
 msgid "badly-formed XML in imported track"
-msgstr ""
+msgstr "XML mal formado en la pista importada"
 
 #: audio_track_importer.cc:291
 msgid "Error Importing Audio track %1"
@@ -270,21 +280,23 @@ msgstr "el plugin VAMP \"%1\" no pudo ser cargado"
 
 #: audioengine.cc:852
 msgid "AudioEngine: cannot load module \"%1\" (%2)"
-msgstr ""
+msgstr "AudioEngine: no se puede cargar el módulo \"%1\" (%2)"
 
 #: audioengine.cc:858
 msgid "AudioEngine: backend at \"%1\" has no descriptor function."
-msgstr ""
+msgstr "AudioEngine: el backend en \"%1\" no tiene función de descriptor."
 
 #: audioengine.cc:951
 msgid "Could not create backend for %1: %2"
-msgstr ""
+msgstr "No se pudo crear el backend para %1: %2"
 
 #: audioengine.cc:1629
 msgid ""
 "programming error: port %1 could not be placed on the pending deletion "
 "queue\n"
 msgstr ""
+"Error de programación: el puerto %1 no se pudo colocar en la cola de "
+"eliminación pendiente\n"
 
 #: audioregion.cc:1759
 msgid ""
@@ -300,87 +312,108 @@ msgid ""
 "This dialog will not display again.  But you may notice a slight delay in "
 "this and future transient-detection operations.\n"
 msgstr ""
+"Ha solicitado una operación que requiere análisis de audio.\n"
+"\n"
+"Actualmente tiene deshabilitado el \"análisis automático de audio\", lo que "
+"significa que se deben generar datos sobre los transientes cada vez que sea "
+"necesario.\n"
+"\n"
+"Si está realizando un trabajo que requerirá datos de transientes de forma "
+"regular, probablemente debería habilitar \"análisis automático de audio\" en "
+"Preferencias > Audio > Regiones, luego salir de %1 y reiniciar.\n"
+"\n"
+"Este cuadro de diálogo no se volverá a mostrar.  Pero es posible que notes "
+"un ligero retraso en esta y futuras operaciones de detección de "
+"transientes.\n"
 
 #: audioregion.cc:1791
 msgid "Audio Region"
-msgstr ""
+msgstr "Región de audio"
 
 #: audiosource.cc:231
 msgid "cannot rename peakfile for %1 from %2 to %3 (%4)"
-msgstr ""
+msgstr "no se puede cambiar el nombre del archivo pico para %1 de %2 a %3 (%4)"
 
 #: audiosource.cc:265
 msgid "AudioSource: cannot stat peakfile \"%1\""
-msgstr ""
+msgstr "AudioSource: no se puede registrar el archivo pico \"%1\""
 
 #: audiosource.cc:371
 msgid "Cannot open peakfile @ %1 for size check (%2)"
-msgstr ""
+msgstr "No se puede abrir el archivo pico @ %1 para verificar el tamaño (%2)"
 
 #: audiosource.cc:392
 msgid "peak file %1 is truncated from %2 to %3"
-msgstr ""
+msgstr "El archivo máximo %1 se trunca de %2 a %3"
 
 #: audiosource.cc:397
 msgid "Cannot open peakfile @ %1 for size check (%2) after rebuild"
 msgstr ""
+"No se puede abrir Peakfile @ %1 para verificar el tamaño (%2) después de la "
+"reconstrucción"
 
 #: audiosource.cc:409
 msgid "Cannot open peakfile @ %1 for reading (%2)"
-msgstr ""
+msgstr "No se puede abrir el archivo pico @ %1 para leer (%2)"
 
 #: audiosource.cc:445
 msgid "cannot read sample data for unscaled peak computation"
-msgstr ""
+msgstr "no se pueden leer datos de muestra para el cálculo de picos sin escala"
 
 #: audiosource.cc:480 audiosource.cc:575
 msgid "map failed - could not create file mapping for peakfile %1."
 msgstr ""
+"Error en la asignación: no se pudo crear la asignación de archivos para el "
+"archivo pico %1."
 
 #: audiosource.cc:486 audiosource.cc:581
 msgid "map failed - could not map peakfile %1."
-msgstr ""
+msgstr "Error en la asignación: no se pudo asignar el archivo pico %1."
 
 #: audiosource.cc:497 audiosource.cc:592
 msgid "unmap failed - could not unmap peakfile %1."
-msgstr ""
+msgstr "Falló la desasignación: no se pudo desasignar el archivo pico %1."
 
 #: audiosource.cc:503 audiosource.cc:598
 msgid "map failed - could not mmap peakfile %1."
-msgstr ""
+msgstr "Error en el mapa: no se pudo mapear el archivo pico %1."
 
 #: audiosource.cc:687
 msgid ""
 "AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"
 msgstr ""
+"AudioSource[%1]: lectura de picos: no se pueden leer %2 muestras en el "
+"desplazamiento %3 de %4 (%5)"
 
 #: audiosource.cc:754
 msgid "%1: could not write read raw data for peak computation (%2)"
 msgstr ""
+"%1: no se pudieron escribir datos sin procesar leídos para el cálculo de "
+"picos (%2)"
 
 #: audiosource.cc:821
 msgid "AudioSource: cannot open _peakpath (c) \"%1\" (%2)"
-msgstr ""
+msgstr "AudioSource: no se puede abrir _peakpath (c) \"%1\" (%2)"
 
 #: audiosource.cc:900 audiosource.cc:1024
 msgid "%1: could not seek in peak file data (%2)"
-msgstr ""
+msgstr "%1: no se pudieron buscar datos de archivos pico (%2)"
 
 #: audiosource.cc:905 audiosource.cc:1033
 msgid "%1: could not write peak file data (%2)"
-msgstr ""
+msgstr "%1: no se pudieron escribir datos de archivos pico (%2)"
 
 #: audiosource.cc:1066
 msgid "could not truncate peakfile %1 to %2 (error: %3)"
-msgstr ""
+msgstr "No se pudo truncar el archivo pico %1 a %2 (error: %3)"
 
 #: auditioner.cc:120
 msgid "Falling back to Reasonable Synth for Midi Audition"
-msgstr ""
+msgstr "Recurriendo a Reasonable Synth para Audicionar Midi"
 
 #: auditioner.cc:125
 msgid "No synth for midi-audition found."
-msgstr ""
+msgstr "No se encontró ningún sintetizador para audicionar midi."
 
 #: auditioner.cc:189
 msgid "no outputs available for auditioner - manual connection required"
@@ -389,62 +422,64 @@ msgstr "No hay salidas disponibles para Audición - se requiere conexión manual
 #: auditioner.cc:322 auditioner.cc:359
 msgid "Cannot setup auditioner processing flow for %1 channels"
 msgstr ""
+"No se puede configurar el flujo de procesamiento del audicionista para %1 "
+"canales"
 
 #: auditioner.cc:351
 msgid "Failed to load synth for MIDI-Audition."
-msgstr ""
+msgstr "No se pudo cargar el sintetizador para audicionar MIDI."
 
 #: auditioner.cc:367
 msgid "Auditioning of regions other than Audio or Midi is not supported."
-msgstr ""
+msgstr "No se admite la audición de regiones que no sean Audio o Midi."
 
 #: auditioner.cc:389
 msgid "Cannot audition empty file."
-msgstr ""
+msgstr "No se puede escuchar un archivo vacío."
 
 #: automatable.cc:103
 msgid "Automation node has no path property"
-msgstr ""
+msgstr "El nodo de automatización no tiene propiedad de ruta"
 
 #: automatable.cc:124
 msgid "cannot open %2 to load automation data (%3)"
-msgstr ""
+msgstr "no se puede abrir %2 para cargar datos de automatización (%3)"
 
 #: automatable.cc:156
 msgid "cannot load automation data from %2"
-msgstr ""
+msgstr "no se pueden cargar datos de automatización desde %2"
 
 #: automatable.cc:194 send.cc:103 session.cc:822
 msgid "Fader"
-msgstr ""
+msgstr "Fader"
 
 #: automatable.cc:196
 msgid "Send"
-msgstr ""
+msgstr "Envío"
 
 #: automatable.cc:198
 msgid "Trim"
-msgstr ""
+msgstr "Trim"
 
 #: automatable.cc:200
 msgid "Mute"
-msgstr ""
+msgstr "Mudo"
 
 #: automatable.cc:202
 msgid "Azimuth"
-msgstr ""
+msgstr "Azimut"
 
 #: automatable.cc:204
 msgid "Width"
-msgstr ""
+msgstr "Ancho"
 
 #: automatable.cc:206
 msgid "Elevation"
-msgstr ""
+msgstr "Elevación"
 
 #: automation_control.cc:326
 msgid "record %1 automation"
-msgstr ""
+msgstr "registrar %1 automatización"
 
 #: automation_list.cc:452
 msgid "automation list: cannot load coordinates from XML, all points ignored"
@@ -470,30 +505,32 @@ msgstr ""
 msgid ""
 "AutomationList: passed XML node called %1, not \"AutomationList\" - ignored"
 msgstr ""
+"AutomationList: nodo XML pasado llamado %1, no \"AutomationList\" - ignorado"
 
 #: butler.cc:123
 msgid "Session: could not create butler thread"
-msgstr ""
+msgstr "Sesión: no se pudo crear el hilo de mayordomo"
 
 #: butler.cc:264 butler.cc:265
 msgid "Butler read ahead failure on dstream %1"
-msgstr ""
+msgstr "Error de lectura anticipada de Butler en dstream %1"
 
 #: butler.cc:354 butler.cc:355 butler.cc:403 butler.cc:404
 msgid "Butler write-behind failure on dstream %1"
-msgstr ""
+msgstr "Error de escritura retrasada de Butler en dstream %1"
 
 #: control_protocol_manager.cc:133
 msgid "Control protocol %1 was already active."
-msgstr ""
+msgstr "El protocolo de control %1 ya estaba activo."
 
 #: control_protocol_manager.cc:161
 msgid "Control protocol support for %1 failed to activate"
 msgstr ""
+"No se pudo activar la compatibilidad con el protocolo de control para %1"
 
 #: control_protocol_manager.cc:224
 msgid "control protocol name \"%1\" has no descriptor"
-msgstr "control protocol name \"%1\" has no descriptor"
+msgstr "El nombre del protocolo de control \"%1\" no tiene descriptor."
 
 #: control_protocol_manager.cc:231
 msgid "control protocol name \"%1\" could not be initialized"
@@ -501,7 +538,7 @@ msgstr "El protocolo de control de nombre \"%1\" no se pudo inicializar"
 
 #: control_protocol_manager.cc:321
 msgid "Instantiating mandatory control protocol %1"
-msgstr ""
+msgstr "Creación de instancias del protocolo de control obligatorio %1"
 
 #: control_protocol_manager.cc:365
 msgid "looking for control protocols in %1\n"
@@ -509,51 +546,53 @@ msgstr "buscando protocolos de control en %1\n"
 
 #: control_protocol_manager.cc:389
 msgid "Control protocol %1 not usable"
-msgstr "Protocolo de control %1 no usable."
+msgstr "Protocolo de control %1 no usable"
 
 #: control_protocol_manager.cc:406
 msgid "Control surface protocol discovered: \"%1\"\n"
-msgstr ""
+msgstr "Protocolo de superficie de control descubierto: \"%1\"\n"
 
 #: control_protocol_manager.cc:422
 msgid "ControlProtocolManager: cannot load module \"%1\" (%2)"
-msgstr ""
+msgstr "ControlProtocolManager: no se puede cargar el módulo \"%1\" (%2)"
 
 #: control_protocol_manager.cc:428
 msgid "ControlProtocolManager: module \"%1\" has no descriptor function."
 msgstr ""
+"ControlProtocolManager: el módulo \"%1\" no tiene función de descriptor."
 
 #: control_protocol_manager.cc:578
 msgid "Control protocol \"%1\" has no descriptor"
-msgstr ""
+msgstr "El protocolo de control \"%1\" no tiene descriptor"
 
 #: convolver.cc:232
 msgid "Convolver: IR \"%1\" no usable audio-channels sound."
-msgstr ""
+msgstr "Convolver: IR \"%1\" no hay sonido de canales de audio utilizables."
 
 #: convolver.cc:237
 msgid "Convolver: IR \"%1\" file too long."
-msgstr ""
+msgstr "Convolver: Archivo IR \"%1\" demasiado largo."
 
 #: cycle_timer.cc:41
 msgid "CycleTimer::get_mhz(): can't open /proc/cpuinfo"
-msgstr ""
+msgstr "CycleTimer::get_mhz(): no se puede abrir /proc/cpuinfo"
 
 #: cycle_timer.cc:53
 msgid "CycleTimer::get_mhz(): cannot locate cpu MHz in /proc/cpuinfo"
 msgstr ""
+"CycleTimer::get_mhz(): no se puede localizar la CPU MHz en /proc/cpuinfo"
 
 #: cycle_timer.cc:76
 msgid "cannot locate cpu MHz in /proc/cpuinfo"
-msgstr ""
+msgstr "No se puede localizar la CPU MHz en /proc/cpuinfo"
 
 #: data_type.cc:27
 msgid "audio"
-msgstr ""
+msgstr "audio"
 
 #: data_type.cc:28 session.cc:2388
 msgid "MIDI"
-msgstr ""
+msgstr "MIDI"
 
 #: data_type.cc:29
 msgid "unknown"
@@ -561,42 +600,50 @@ msgstr "desconocido"
 
 #: delivery.cc:126
 msgid "main outs"
-msgstr ""
+msgstr "salidas principales"
 
 #: delivery.cc:129 send.cc:78
 msgid "listen"
-msgstr ""
+msgstr "escuchar"
 
 #: disk_reader.cc:729
 msgid ""
 "DiskReader %1: when overwriting(1), cannot read %2 from playlist at sample %3"
 msgstr ""
+"DiskReader %1: al sobrescribir (1), no se puede leer %2 de la lista de "
+"reproducción en la muestra %3"
 
 #: disk_reader.cc:738
 msgid ""
 "DiskReader %1: when overwriting(2), cannot read %2 from playlist at sample %3"
 msgstr ""
+"DiskReader %1: al sobrescribir (2), no se puede leer %2 de la lista de "
+"reproducción en la muestra %3"
 
 #: disk_reader.cc:1043
 msgid "DiskReader %1: cannot read %2 from playlist at sample %3"
 msgstr ""
+"DiskReader %1: no se puede leer %2 de la lista de reproducción en la muestra "
+"%3"
 
 #: disk_reader.cc:1301
 msgid ""
 "DiskReader %1: when refilling, cannot read %2 from playlist at sample %3"
 msgstr ""
+"DiskReader %1: al recargar, no se puede leer %2 de la lista de reproducción "
+"en la muestra %3"
 
 #: disk_reader.cc:1307
 msgid "DiskReader %1: when refilling, cannot write %2 into buffer"
-msgstr ""
+msgstr "DiskReader %1: al recargar, no se puede escribir %2 en el búfer"
 
 #: disk_writer.cc:869 disk_writer.cc:888
 msgid "AudioDiskstream %1: cannot write to disk"
-msgstr "AudioDiskstream %1: no se puede escribir en el disco."
+msgstr "AudioDiskstream %1: no se puede escribir en el disco"
 
 #: disk_writer.cc:934
 msgid "MidiDiskstream %1: cannot write to disk"
-msgstr ""
+msgstr "MidiDiskstream %1: no se puede escribir en el disco"
 
 #: disk_writer.cc:1014 disk_writer.cc:1040
 msgid "%1:%2 new capture file not initialized correctly"
@@ -609,82 +656,88 @@ msgstr "AudioDiskstream: canal %1 fuera de rango"
 #: disk_writer.cc:1080
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
+"AudioDiskstream \"%1\": ¡no se pueden vaciar los datos capturados en el "
+"disco!"
 
 #: export_channel.cc:158
 msgid "Could not get port for export channel \"%1\", dropping the channel"
 msgstr ""
+"No se pudo obtener el puerto para el canal de exportación \"%1\", por lo que "
+"se abandonó el canal."
 
 #: export_failed.cc:32
 msgid "Export failed: %1"
-msgstr ""
+msgstr "Error al exportar: %1"
 
 #: export_filename.cc:131
 msgid "Existing export folder for this session (%1) does not exist - ignored"
 msgstr ""
+"La carpeta de exportación existente para esta sesión (%1) no existe; se "
+"ignora"
 
 #: export_filename.cc:274
 msgid "No Time"
-msgstr ""
+msgstr "No hay Tiempo"
 
 #: export_filename.cc:283
 msgid "Invalid time format"
-msgstr ""
+msgstr "Formato de tiempo inválido"
 
 #: export_filename.cc:292
 msgid "No Date"
-msgstr ""
+msgstr "No hay Fecha"
 
 #: export_filename.cc:307
 msgid "Invalid date format"
-msgstr ""
+msgstr "Formato de Fecha inválido"
 
 #: export_format_manager.cc:60
 msgid "CD"
-msgstr ""
+msgstr "CD"
 
 #: export_format_manager.cc:69
 msgid "DVD-A"
-msgstr ""
+msgstr "DVD-A"
 
 #: export_format_manager.cc:83
 msgid "iPod"
-msgstr ""
+msgstr "iPod"
 
 #: export_format_manager.cc:94
 msgid "Something else"
-msgstr ""
+msgstr "Otra cosa"
 
 #: export_format_manager.cc:113
 msgid "Any"
-msgstr ""
+msgstr "Cualquiera"
 
 #: export_format_manager.cc:114
 msgid "Lossless (linear PCM)"
-msgstr ""
+msgstr "Sin pérdidas (PCM lineal)"
 
 #: export_format_manager.cc:115
 msgid "Lossy compression"
-msgstr ""
+msgstr "Compresión con pérdida"
 
 #: export_format_manager.cc:116
 msgid "Lossless compression"
-msgstr ""
+msgstr "Compresión sin pérdidas"
 
 #: export_format_manager.cc:227 export_format_specification.cc:646
 msgid "Session rate"
-msgstr ""
+msgstr "Frequencia de la sesión"
 
 #: export_format_specification.cc:598
 msgid "normalize loudness"
-msgstr ""
+msgstr "normalizar sonoridad"
 
 #: export_format_specification.cc:600
 msgid "normalize peak"
-msgstr ""
+msgstr "normalizar pico"
 
 #: export_format_specification.cc:605
 msgid "trim"
-msgstr ""
+msgstr "recortar"
 
 #: export_format_specification.cc:607
 msgid "trim start"
@@ -692,146 +745,151 @@ msgstr "trim start"
 
 #: export_format_specification.cc:609
 msgid "trim end"
-msgstr ""
+msgstr "recortar final"
 
 #: export_formats.cc:57
 msgid "Shaped Noise"
-msgstr ""
+msgstr "Ruido Formado"
 
 #: export_formats.cc:58
 msgid "Triangular"
-msgstr ""
+msgstr "Triangular"
 
 #: export_formats.cc:59
 msgid "Rectangular"
-msgstr ""
+msgstr "Rectangular"
 
 #: export_formats.cc:167
 msgid "8-bit"
-msgstr ""
+msgstr "8-bit"
 
 #: export_formats.cc:169
 msgid "16-bit"
-msgstr ""
+msgstr "16-bit"
 
 #: export_formats.cc:171
 msgid "24-bit"
-msgstr ""
+msgstr "24-bit"
 
 #: export_formats.cc:173
 msgid "32-bit"
-msgstr ""
+msgstr "32-bit"
 
 #: export_formats.cc:175
 msgid "float"
-msgstr ""
+msgstr "float"
 
 #: export_formats.cc:177
 msgid "double"
-msgstr ""
+msgstr "double"
 
 #: export_formats.cc:179
 msgid "8-bit unsigned"
-msgstr ""
+msgstr "8-bit unsigned"
 
 #: export_formats.cc:181
 msgid "Vorbis sample format"
-msgstr ""
+msgstr "Formato de muestra Vorbis"
 
 #: export_formats.cc:183
 msgid "No sample format"
-msgstr ""
+msgstr "Sin formato de muestra"
 
 #: export_handler.cc:483
 msgid "File %1 uploaded to %2"
-msgstr ""
+msgstr "Archivo %1 subido a %2"
 
 #: export_handler.cc:489
 msgid ""
 "upload to Soundcloud failed. Perhaps your email or password are incorrect?\n"
 msgstr ""
+"La carga en Soundcloud falló. ¿Quizás tu correo electrónico o contraseña son "
+"incorrectos?\n"
 
 #: export_handler.cc:627 export_handler.cc:630
 msgid "an error occurred while writing a TOC/CUE file: %1"
-msgstr ""
+msgstr "se produjo un error al escribir un archivo TOC/CUE: %1"
 
 #: export_handler.cc:920 export_handler.cc:978
 msgid "Cannot convert %1 to Latin-1 text"
-msgstr ""
+msgstr "No se puede convertir %1 a texto latino-1"
 
 #: export_profile_manager.cc:102
 msgid "Searching for export formats in %1"
-msgstr ""
+msgstr "Buscando formatos de exportación en %1"
 
 #: export_profile_manager.cc:108
 msgid "Unable to create export format directory %1: %2"
-msgstr "Unable to create export format directory %1: %2"
+msgstr "No se puede crear el directorio de formato de exportación %1: %2"
 
 #: export_profile_manager.cc:276
 msgid "Unable to remove export preset %1: %2"
-msgstr "Unable to remove export preset %1: %2"
+msgstr "No se puede eliminar el ajuste preestablecido de exportación %1: %2"
 
 #: export_profile_manager.cc:365
 msgid "Selection"
-msgstr ""
+msgstr "Selección"
 
 #: export_profile_manager.cc:623
 msgid "Unable to rename export format %1 to %2: %3"
-msgstr "Unable to rename export format %1 to %2: %3"
+msgstr "No se puede cambiar el nombre del formato de exportación %1 a %2: %3"
 
 #: export_profile_manager.cc:654
 msgid "Unable to remove export profile %1: %2"
-msgstr "Unable to remove export profile %1: %2"
+msgstr "No se puede eliminar el perfil de exportación %1: %2"
 
 #: export_profile_manager.cc:689
 msgid "empty format"
-msgstr ""
+msgstr "formato vacío"
 
 #: export_profile_manager.cc:770
 msgid "Cannot load export format from %1"
-msgstr ""
+msgstr "No se puede cargar el formato de exportación desde %1"
 
 #: export_profile_manager.cc:776
 msgid "Cannot export format read from %1"
-msgstr ""
+msgstr "No se puede exportar el formato leído desde %1"
 
 #: export_profile_manager.cc:785
 msgid "Ignored format '%1': encoder is not available"
-msgstr ""
+msgstr "Formato ignorado '%1': el codificador no está disponible"
 
 #: export_profile_manager.cc:877
 msgid "No timespan has been selected!"
-msgstr ""
+msgstr "¡No se ha seleccionado ningún intervalo de tiempo!"
 
 #: export_profile_manager.cc:881
 msgid "No channels have been selected!"
-msgstr ""
+msgstr "¡No se han seleccionado canales!"
 
 #: export_profile_manager.cc:885
 msgid "Some channels are empty"
-msgstr ""
+msgstr "Algunos canales están vacíos"
 
 #: export_profile_manager.cc:909
 msgid "Destination folder does not exist."
-msgstr ""
+msgstr "La carpeta de destino no existe."
 
 #: export_profile_manager.cc:928
 msgid "No format selected!"
-msgstr ""
+msgstr "¡Ningún formato seleccionado!"
 
 #: export_profile_manager.cc:930
 msgid "All channels are empty!"
-msgstr ""
+msgstr "¡Todos los canales están vacíos!"
 
 #: export_profile_manager.cc:932
 msgid "One or more of the selected formats is not compatible with this system!"
 msgstr ""
+"¡Uno o más de los formatos seleccionados no son compatibles con este sistema!"
 
 #: export_profile_manager.cc:935
 msgid ""
 "%1 supports only %2 channels, but you have %3 channels in your channel "
 "configuration"
 msgstr ""
+"%1 admite solo %2 canales, pero tienes %3 canales en tu configuración de "
+"canales"
 
 #: file_source.cc:200 session_state.cc:3639
 msgid ""
@@ -840,98 +898,107 @@ msgstr "ya hay 1000 archivos con nombres como %1; se discontinúa el versionado"
 
 #: file_source.cc:209
 msgid "cannot rename file source from %1 to %2 (%3)"
-msgstr ""
+msgstr "no se puede cambiar el nombre del origen del archivo de %1 a %2 (%3)"
 
 #: file_source.cc:250 file_source.cc:373
 msgid "FileSource: search path not set"
-msgstr "Filesource: ruta de búsqueda no especificada."
+msgstr "Filesource: ruta de búsqueda no especificada"
 
 #: file_source.cc:433
 msgid ""
 "FileSource: \"%1\" is ambiguous when searching\n"
 "\t"
 msgstr ""
+"FileSource: \"%1\" es ambiguo al buscar\n"
+"\t"
 
 #: file_source.cc:440
 msgid "Filesource: cannot find required file (%1)"
-msgstr ""
+msgstr "Fuente de archivo: no se puede encontrar el archivo requerido (%1)"
 
 #: file_source.cc:485
 msgid "Filesource: cannot find required file (%1): %2"
-msgstr "Filesource: no se puede encontrar el archivo requerido (%1): %2."
+msgstr "Filesource: no se puede encontrar el archivo requerido (%1): %2"
 
 #: file_source.cc:493
 msgid "Filesource: cannot check for existing file (%1): %2"
-msgstr ""
+msgstr "Fuente de archivo: no se puede verificar el archivo existente (%1): %2"
 
 #: file_source.cc:592
 msgid ""
 "Programming error! %1 tried to rename a file over another file! It's safe to "
 "continue working, but please report this to the developers."
 msgstr ""
+"¡Error de programación! ¡%1 intentó cambiar el nombre de un archivo sobre "
+"otro! Es seguro seguir trabajando, pero infórmalo a los desarrolladores."
 
 #: file_source.cc:599
 msgid "cannot rename file %1 to %2 (%3)"
-msgstr ""
+msgstr "no se puede cambiar el nombre del archivo %1 a %2 (%3)"
 
 #: filesystem_paths.cc:116
 msgid "Cannot create Configuration directory %1 - cannot run"
 msgstr ""
+"No se puede crear el directorio de configuración %1 - no se puede ejecutar"
 
 #: filesystem_paths.cc:121
 msgid ""
 "Configuration directory %1 already exists and is not a directory/folder - "
 "cannot run"
 msgstr ""
+"El directorio de configuración %1 ya existe y no es un directorio/carpeta; "
+"no se puede ejecutar"
 
 #: filesystem_paths.cc:184
 msgid "Cannot create cache directory %1 - cannot run"
-msgstr ""
+msgstr "No se puede crear el directorio de caché %1; no se puede ejecutar"
 
 #: filesystem_paths.cc:189
 msgid ""
 "Cache directory %1 already exists and is not a directory/folder - cannot run"
 msgstr ""
+"El directorio de caché %1 ya existe y no es un directorio/carpeta; no se "
+"puede ejecutar"
 
 #: filesystem_paths.cc:207
 msgid "ARDOUR_DLL_PATH not set in environment - exiting\n"
-msgstr ""
+msgstr "ARDOUR_DLL_PATH no configurado en el entorno - saliendo\n"
 
 #: filesystem_paths.cc:230
 msgid "Cannot determine %1 package directory"
-msgstr ""
+msgstr "No se puede determinar el directorio del paquete %1"
 
 #: filesystem_paths.cc:275
 msgid "ARDOUR_CONFIG_PATH not set in environment\n"
-msgstr ""
+msgstr "ARDOUR_CONFIG_PATH no configurado en el entorno\n"
 
 #: filesystem_paths.cc:296
 msgid "ARDOUR_DATA_PATH not set in environment\n"
-msgstr ""
+msgstr "ARDOUR_DATA_PATH no configurado en el entorno\n"
 
 #: filter.cc:68
 msgid "filter: error creating name for new file based on %1"
-msgstr ""
+msgstr "filtro: error al crear el nombre para un nuevo archivo basado en %1"
 
 #: filter.cc:93
 msgid "filter: error creating new file %1 (%2)"
-msgstr ""
+msgstr "filtro: error al crear nuevo archivo %1 (%2)"
 
 #: find_session.cc:65
 msgid "cannot check session path %1 (%2)"
-msgstr ""
+msgstr "no se puede comprobar la ruta de sesión %1 (%2)"
 
 #: find_session.cc:91
 msgid "cannot check statefile %1 (%2)"
-msgstr ""
+msgstr "no se puede verificar el archivo de estado %1 (%2)"
 
 #: find_session.cc:130
 msgid "%1 is not a snapshot file"
-msgstr "%1 no es un archivo de captura de sesión"
+msgstr "%1 no es un archivo de captura instántanea de sesión"
 
 #: find_session.cc:147
 msgid "cannot determine current working directory (%1)"
-msgstr ""
+msgstr "no se puede determinar el directorio de trabajo actual (%1)"
 
 #: find_session.cc:164
 msgid "unknown file type for session %1"
@@ -939,71 +1006,75 @@ msgstr "tipo de archivo desconocido para la sesión %1"
 
 #: find_session.cc:210 find_session.cc:269
 msgid "Archive is empty"
-msgstr ""
+msgstr "El archivo está vacío."
 
 #: find_session.cc:217 find_session.cc:271
 msgid "Archive does not contain a session folder"
-msgstr ""
+msgstr "El archivo no contiene una carpeta de sesión"
 
 #: find_session.cc:228 find_session.cc:273
 msgid "Archive does not contain a valid session structure"
-msgstr ""
+msgstr "El archivo no contiene una estructura de sesión válida"
 
 #: find_session.cc:235 find_session.cc:275
 msgid "Archive does not contain a session file"
-msgstr ""
+msgstr "El archivo no contiene un archivo de sesión"
 
 #: find_session.cc:242
 msgid "Destination '%1' already exists."
-msgstr ""
+msgstr "El destino '%1' ya existe."
 
 #: find_session.cc:247
 msgid "Extracted session-archive to '%1'."
-msgstr ""
+msgstr "Se extrajo el archivo de sesión en '%1'."
 
 #: find_session.cc:254 find_session.cc:277
 msgid "Error reading file-archive"
-msgstr ""
+msgstr "Error al leer el archivo-archivo"
 
 #: find_session.cc:258 find_session.cc:281
 msgid "Error extracting file-archive"
-msgstr ""
+msgstr "Error al extraer el archivo comprimido"
 
 #: find_session.cc:265
 msgid "No Error"
-msgstr ""
+msgstr "Sin errores"
 
 #: find_session.cc:267
 msgid "File extension is not %1"
-msgstr ""
+msgstr "La extensión del archivo no es %1"
 
 #: find_session.cc:279
 msgid "Destination folder already exists."
-msgstr ""
+msgstr "La carpeta de destino ya existe."
 
 #: find_session.cc:286
 msgid "Unknown Error"
-msgstr ""
+msgstr "Error desconocido"
 
 #: globals.cc:278
 msgid "Could not set system open files limit to \"unlimited\""
-msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
+msgstr ""
+"No se pudo establecer el límite de archivos abiertos del sistema en "
+"\"ilimitado\""
 
 #: globals.cc:280
 msgid "Could not set system open files limit to %1"
-msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
+msgstr "No se pudo establecer el límite de archivos abiertos del sistema en %1"
 
 #: globals.cc:284 globals.cc:301
 msgid "Your system is configured to limit %1 to %2 open files"
-msgstr ""
+msgstr "Su sistema está configurado para limitar de %1 a %2 archivos abiertos"
 
 #: globals.cc:288
 msgid "Could not get system open files limit (%1)"
-msgstr "No se pudo obtener el límite de archivos abiertos del sistema (%1) "
+msgstr "No se pudo obtener el límite de archivos abiertos del sistema (%1)"
 
 #: globals.cc:303
 msgid "Could not set system open files limit. Current limit is %1 open files"
 msgstr ""
+"No se pudo establecer el límite de archivos abiertos del sistema. El límite "
+"actual es %1 archivos abiertos"
 
 #: globals.cc:510
 msgid "Loading configuration"
@@ -1011,68 +1082,71 @@ msgstr "Cargando configuración"
 
 #: globals.cc:592 route.cc:207 session.cc:1006
 msgid "Monitor"
-msgstr ""
+msgstr "Monitor"
 
 #: globals.cc:593 session.cc:1267
 msgid "Master"
-msgstr ""
+msgstr "Master"
 
 #: globals.cc:595 midiport_manager.cc:71 port_manager.cc:1273
 #: port_manager.cc:1283
 msgid "Virtual Keyboard"
-msgstr ""
+msgstr "Teclado Virtual"
 
 #: globals.cc:599
 msgid "Control"
-msgstr ""
+msgstr "Control"
 
 #: globals.cc:600
 msgid "Mackie"
-msgstr ""
+msgstr "Mackie"
 
 #: globals.cc:601
 msgid "FaderPort Recv"
-msgstr ""
+msgstr "FaderPort Recb"
 
 #: globals.cc:602
 msgid "FaderPort Send"
-msgstr ""
+msgstr "FaderPort Envío"
 
 #: globals.cc:603
 msgid "FaderPort2 Recv"
-msgstr ""
+msgstr "FaderPort2 Recb"
 
 #: globals.cc:604
 msgid "FaderPort2 Send"
-msgstr ""
+msgstr "FaderPort2 Envío"
 
 #: globals.cc:605
 msgid "FaderPort8 Recv"
-msgstr ""
+msgstr "FaderPort8 Recb"
 
 #: globals.cc:606
 msgid "FaderPort8 Send"
-msgstr ""
+msgstr "FaderPort8 Envío"
 
 #: globals.cc:607
 msgid "FaderPort16 Recv"
-msgstr ""
+msgstr "FaderPort16 Recb"
 
 #: globals.cc:608
 msgid "FaderPort16 Send"
-msgstr ""
+msgstr "FaderPort16 Envío"
 
 #: graph.cc:599
 msgid "Could not graph to file (%1)"
-msgstr ""
+msgstr "No se pudo graficar al archivo (%1)"
 
 #: import.cc:163
 msgid "Cannot find new filename for imported file %1"
 msgstr ""
+"No se puede encontrar un nuevo nombre de archivo para el archivo importado %1"
 
 #: import.cc:183
 msgid "Could not find a source for %1 even though we are updating this file!"
 msgstr ""
+"¡No se pudo encontrar una fuente para %1 a pesar de que estamos actualizando "
+"este archivo!"
 
 #: import.cc:209
 msgid "Unable to create file %1 during import"
@@ -1080,19 +1154,19 @@ msgstr "Incapaz de crear el archivo %1 durante la importación"
 
 #: import.cc:235
 msgid "Resampling %1 from %2kHz to %3kHz"
-msgstr ""
+msgstr "Remuestreo de %1 de %2kHz a %3kHz"
 
 #: import.cc:241
 msgid "Copying %1"
-msgstr ""
+msgstr "Copiando %1"
 
 #: import.cc:460
 msgid "Track %1 of %2 contained no usable MIDI data"
-msgstr ""
+msgstr "La pista %1 de %2 no contenía datos MIDI utilizables"
 
 #: import.cc:470
 msgid "MIDI file could not be written (best guess: %1)"
-msgstr ""
+msgstr "No se pudo escribir el archivo MIDI (mejor estimación: %1)"
 
 #: import.cc:518
 msgid "Import: cannot open input sound file \"%1\""
@@ -1100,96 +1174,102 @@ msgstr "Importación: No se pudo abrir el archivo de entrada de sonido \"%1\""
 
 #: import.cc:547
 msgid "Import: error opening MIDI file"
-msgstr ""
+msgstr "Importar: error al abrir el archivo MIDI"
 
 #: import.cc:554
 msgid "Import: file contains no channels."
-msgstr ""
+msgstr "Importar: el archivo no contiene canales."
 
 #: import.cc:588
 msgid "Loading MIDI file %1"
-msgstr ""
+msgstr "Cargando archivo MIDI %1"
 
 #: import.cc:649
 msgid "Failed to remove some files after failed/cancelled import operation"
 msgstr ""
+"No se pudieron eliminar algunos archivos después de una operación de "
+"importación fallida o cancelada"
 
 #: import_pt.cc:248
 msgid "PT Import : MISSING `%1`, inserting ref to missing source"
 msgstr ""
+"Importación PT: FALTA `%1`, insertando referencia a la fuente que falta"
 
 #: import_pt.cc:250
 msgid "PT Import : MISSING `%1`, please check Audio Files"
-msgstr ""
+msgstr "Importación PT: FALTA `%1`, verifique los archivos de audio"
 
 #: import_pt.cc:264
 msgid "Failed to find any audio for PT import"
-msgstr ""
+msgstr "No se pudo encontrar ningún audio para importar PT"
 
 #: import_pt.cc:267
 msgid ""
 "Failed to load one or more of the audio files for PT import, see above list"
 msgstr ""
+"No se pudieron cargar uno o más archivos de audio para importar PT, consulte "
+"la lista anterior"
 
 #: import_pt.cc:269
 msgid "All audio files found for PT import!"
-msgstr ""
+msgstr "¡Todos los archivos de audio encontrados para importar PT!"
 
 #: import_pt.cc:354
 msgid "PTImport: UINT_MAX routes? impossible!"
-msgstr ""
+msgstr "PTImport: ¿Rutas UINT_MAX? ¡imposible!"
 
 #: instrument_info.cc:41 instrument_info.cc:74
 msgid "Unknown"
-msgstr "Unknown"
+msgstr "Desconocido"
 
 #: internal_send.cc:431 internal_send.cc:432
 msgid "%1 - cannot find any track/bus with the ID %2 to connect to"
 msgstr ""
+"%1 - no se puede encontrar ninguna pista/bus con el ID %2 para conectarse"
 
 #: io.cc:172
 msgid "IO: cannot disconnect port %1 from %2"
-msgstr ""
+msgstr "IO: no se puede desconectar el puerto %1 de %2"
 
 #: io.cc:323 io.cc:429
 msgid "IO: cannot register input port %1"
-msgstr ""
+msgstr "IO: no se puede registrar el puerto de entrada %1"
 
 #: io.cc:328 io.cc:434
 msgid "IO: cannot register output port %1"
-msgstr ""
+msgstr "IO: no se puede registrar el puerto de salida %1"
 
 #: io.cc:583 io.cc:655
 msgid "incorrect XML node \"%1\" passed to IO object"
-msgstr ""
+msgstr "Nodo XML incorrecto \"%1\" pasado al objeto IO"
 
 #: io.cc:715
 msgid "in"
-msgstr ""
+msgstr "in"
 
 #: io.cc:715
 msgid "out"
-msgstr ""
+msgstr "out"
 
 #: io.cc:716
 msgid "input"
-msgstr ""
+msgstr "entrada"
 
 #: io.cc:716
 msgid "output"
-msgstr ""
+msgstr "salida"
 
 #: io.cc:727
 msgid "Unknown bundle \"%1\" listed for %2 of %3"
-msgstr ""
+msgstr "Paquete desconocido \"%1\" listado para %2 de %3"
 
 #: io.cc:788
 msgid "Bundle %1 was not available - \"%2\" used instead"
-msgstr ""
+msgstr "El paquete %1 no estaba disponible; en su lugar se utilizó \"%2\""
 
 #: io.cc:791
 msgid "No %1 bundles available as a replacement"
-msgstr ""
+msgstr "No hay paquetes %1 disponibles como reemplazo"
 
 #: io.cc:895
 msgid "%1: cannot create I/O ports"
@@ -1197,27 +1277,27 @@ msgstr "%1: no se pueden crear puertos de E/S"
 
 #: io.cc:1023 io.cc:1124
 msgid "IO: badly formed string in XML node for inputs \"%1\""
-msgstr ""
+msgstr "IO: cadena mal formada en el nodo XML para las entradas \"%1\""
 
 #: io.cc:1028 io.cc:1129
 msgid "bad input string in XML node \"%1\""
-msgstr ""
+msgstr "Cadena de entrada incorrecta en el nodo XML \"%1\""
 
 #: io.cc:1067
 msgid "IO: badly formed string in XML node for outputs \"%1\""
-msgstr ""
+msgstr "IO: cadena mal formada en el nodo XML para las salidas \"%1\""
 
 #: io.cc:1072
 msgid "IO: bad output string in XML node \"%1\""
-msgstr ""
+msgstr "IO: cadena de salida incorrecta en el nodo XML \"%1\""
 
 #: io.cc:1237 plugin.cc:292
 msgid "Out"
-msgstr ""
+msgstr "Out"
 
 #: io.cc:1237 plugin.cc:290
 msgid "In"
-msgstr ""
+msgstr "In"
 
 #: io.cc:1483
 #, c-format
@@ -1227,74 +1307,79 @@ msgstr "%s %u"
 #: io.cc:1529
 #, c-format
 msgid "%s in"
-msgstr ""
+msgstr "%s in"
 
 #: io.cc:1531
 #, c-format
 msgid "%s out"
-msgstr ""
+msgstr "%s out"
 
 #: io.cc:1601 session_bundles.cc:143 session_bundles.cc:177
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 #: io.cc:1603 session_bundles.cc:156 session_bundles.cc:191
 msgid "L"
-msgstr ""
+msgstr "I"
 
 #: io.cc:1603 session_bundles.cc:158 session_bundles.cc:193
 msgid "R"
-msgstr ""
+msgstr "D"
 
 #: io_processor.cc:279
 msgid "send "
-msgstr ""
+msgstr "envío"
 
 #: io_processor.cc:279
 msgid "insert "
-msgstr ""
+msgstr "inserto"
 
 #: io_processor.cc:279
 msgid "return "
-msgstr ""
+msgstr "volver"
 
 #: ladspa_plugin.cc:100
 msgid "LADSPA: Unable to open module: "
-msgstr ""
+msgstr "LADSPA: No se puede abrir el módulo:"
 
 #: ladspa_plugin.cc:106
 msgid "LADSPA: module has no descriptor function."
-msgstr ""
+msgstr "LADSPA: el módulo no tiene función descriptiva."
 
 #: ladspa_plugin.cc:113
 msgid "LADSPA: plugin has gone away since discovery!"
-msgstr ""
+msgstr "LADSPA: ¡el plugin ha desaparecido desde su descubrimiento!"
 
 #: ladspa_plugin.cc:120
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
+"LADSPA: \"%1\" no se puede utilizar porque no puede realizar procesamiento "
+"local"
 
 #: ladspa_plugin.cc:315
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
+"número de parámetro ilegal utilizado con el plugin \"%1\". Esto puede "
+"indicar un cambio en el diseño del plugin y los ajustes preestablecidos "
+"pueden no ser válidos"
 
 #: ladspa_plugin.cc:383 ladspa_plugin.cc:427
 msgid "Bad node sent to LadspaPlugin::set_state"
-msgstr ""
+msgstr "Nodo incorrecto enviado a LadspaPlugin::set_state"
 
 #: ladspa_plugin.cc:397 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
-msgstr ""
+msgstr "LADSPA: sin número de puerto ladspa"
 
 #: ladspa_plugin.cc:402 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
-msgstr ""
+msgstr "LADSPA: no hay datos del puerto ladspa"
 
 #: ladspa_plugin.cc:836
 msgid "Could not locate HOME.  Preset not removed."
-msgstr ""
+msgstr "No se pudo localizar INICIO.  Preestablecido no eliminado."
 
 #: ladspa_plugin.cc:875 ladspa_plugin.cc:881
 msgid "Could not create %1.  Preset not saved. (%2)"
@@ -1302,47 +1387,49 @@ msgstr "No se pudo crear %1. El preset no se guardó. (%2)"
 
 #: ladspa_plugin.cc:888
 msgid "Error saving presets file %1."
-msgstr "Error al guardar el archivo de preset %1."
+msgstr "Error al guardar el archivo de preajuste %1."
 
 #: ladspa_plugin.cc:930
 msgid "Could not locate HOME.  Preset not saved."
-msgstr ""
+msgstr "No se pudo localizar INICIO.  Preajuste no guardado."
 
 #: location.cc:477
 msgid "You cannot put a CD marker at this position"
-msgstr "No puedes poner una marca de CD en esta posición."
+msgstr "No puedes poner unn marcador de CD en esta posición"
 
 #: location.cc:636
 msgid "incorrect XML node passed to Location::set_state"
-msgstr ""
+msgstr "Nodo XML incorrecto pasado a Ubicación::set_state"
 
 #: location.cc:641
 msgid "XML node for Location has no ID information"
-msgstr ""
+msgstr "El nodo XML para Ubicación no tiene información de ID"
 
 #: location.cc:646
 msgid "XML node for Location has no name information"
-msgstr ""
+msgstr "El nodo XML para Ubicación no tiene información de nombre"
 
 #: location.cc:657
 msgid "XML node for Location has no start information"
-msgstr ""
+msgstr "El nodo XML para Ubicación no tiene información de inicio"
 
 #: location.cc:662
 msgid "XML node for Location has no end information"
-msgstr ""
+msgstr "El nodo XML para Ubicación no tiene información final"
 
 #: location.cc:671
 msgid "XML node for Location has no flags information"
-msgstr ""
+msgstr "El nodo XML para Ubicación no tiene información de indicadores"
 
 #: location.cc:907
 msgid "Locations: attempt to use unknown location as selected location"
 msgstr ""
+"Ubicaciones: intente utilizar una ubicación desconocida como ubicación "
+"seleccionada"
 
 #: location.cc:1101
 msgid "incorrect XML mode passed to Locations::set_state"
-msgstr ""
+msgstr "Se pasó el modo XML incorrecto a Locations::set_state"
 
 #: location.cc:1114 session.cc:1601 session_state.cc:1441
 msgid "session"
@@ -1350,21 +1437,23 @@ msgstr "sesión"
 
 #: location.cc:1181
 msgid "could not load location from session file - ignored"
-msgstr ""
+msgstr "no se pudo cargar la ubicación desde el archivo de sesión - ignorado"
 
 #: location_importer.cc:62
 msgid "Locations"
-msgstr ""
+msgstr "Ubicaciones"
 
 #: location_importer.cc:124
 msgid "Location: "
-msgstr ""
+msgstr "Ubicaciones:"
 
 #: location_importer.cc:126
 msgid ""
 "Range\n"
 "start: "
 msgstr ""
+"Rango\n"
+"comenzar:"
 
 #: location_importer.cc:127
 msgid ""
@@ -1379,204 +1468,215 @@ msgid ""
 "The location is the Punch range. It will be imported as a normal range.\n"
 "You may rename the imported location:"
 msgstr ""
+"La ubicación es el campo de pinchado. Se importará como un rango normal.\n"
+"Puede cambiar el nombre de la ubicación importada:"
 
 #: location_importer.cc:158
 msgid ""
 "The location is a Loop range. It will be imported as a normal range.\n"
 "You may rename the imported location:"
 msgstr ""
+"La ubicación es un rango de Bucle. Se importará como un rango normal.\n"
+"Puede cambiar el nombre de la ubicación importada:"
 
 #: location_importer.cc:169
 msgid ""
 "A location with that name already exists.\n"
 "You may rename the imported location:"
 msgstr ""
+"Ya existe una ubicación con ese nombre.\n"
+"Puede cambiar el nombre de la ubicación importada:"
 
 #: ltc_file_reader.cc:155
 msgid "LTCFileReader: cannot open file \"%1\""
-msgstr ""
+msgstr "LTCFileReader: no se puede abrir el archivo \"%1\""
 
 #: ltc_file_reader.cc:164
 msgid "LTCFileReader: cannot open file \"%1\" (%3)"
-msgstr ""
+msgstr "LTCFileReader: no se puede abrir el archivo \"%1\" (%3)"
 
 #: ltc_file_reader.cc:168
 msgid "LTCFileReader: \"%1\" is an empty audio file"
-msgstr ""
+msgstr "LTCFileReader: \"%1\" es un archivo de audio vacío"
 
 #: ltc_file_reader.cc:192
 msgid "LTCFileReader:: invalid audio channel selected"
-msgstr ""
+msgstr "LTCFileReader:: canal de audio no válido seleccionado"
 
 #: ltc_slave.cc:650
 msgid "flywheel"
-msgstr ""
+msgstr "volante"
 
 #: lua_api.cc:96
 msgid "Script with given name was not found\n"
-msgstr ""
+msgstr "No se encontró el script con el nombre de pila\n"
 
 #: lua_api.cc:105
 msgid "Failed to instantiate Lua Processor\n"
-msgstr ""
+msgstr "No se pudo crear una instancia del procesador Lua\n"
 
 #: luaproc.cc:837
 msgid "Failed to load Lua script from session state."
-msgstr ""
+msgstr "No se pudo cargar el script Lua desde el estado de la sesión."
 
 #: luaproc.cc:847
 msgid "Session State for LuaProcessor did not include a Lua script."
-msgstr ""
+msgstr "El estado de sesión para LuaProcessor no incluía un script Lua."
 
 #: luaproc.cc:851
 msgid "Invalid/incompatible Lua script found for LuaProcessor."
-msgstr ""
+msgstr "Se encontró un script Lua no válido/incompatible para LuaProcessor."
 
 #: luaproc.cc:871
 msgid "Bad node sent to LuaProc::set_state"
-msgstr ""
+msgstr "Nodo incorrecto enviado a LuaProc::set_state"
 
 #: luaproc.cc:883
 msgid "LuaProc: port has no symbol, ignored"
-msgstr ""
+msgstr "LuaProc: el puerto no tiene símbolo, se ignora"
 
 #: luaproc.cc:888
 msgid "LuaProc: port has no value, ignored"
-msgstr ""
+msgstr "LuaProc: el puerto no tiene valor, se ignora"
 
 #: luaproc.cc:1106
 msgid "Unable to create LuaProc presets directory"
-msgstr ""
+msgstr "No se puede crear el directorio de ajustes preestablecidos de LuaProc"
 
 #: luascripting.cc:141
 msgid "Script '%1' has no valid descriptor."
-msgstr ""
+msgstr "El script '%1' no tiene un descriptor válido."
 
 #: meter.cc:82
 msgid "Meter"
-msgstr ""
+msgstr "Medidor"
 
 #: midi_model.cc:518
 msgid "Change has no note, using note ID"
-msgstr ""
+msgstr "El cambio no tiene nota, usando ID de nota"
 
 #: midi_model.cc:521
 msgid "Change has no note or note ID"
-msgstr ""
+msgstr "El cambio no tiene nota ni ID de nota"
 
 #: midi_model.cc:540
 msgid "No NoteID found for note property change - ignored"
 msgstr ""
+"No se encontró ningún ID de nota para el cambio de propiedad de la nota: se "
+"ignora"
 
 #: midi_model.cc:791
 msgid "No SysExID found for sys-ex property change - ignored"
 msgstr ""
+"No se encontró ningún SysExID para el cambio de propiedad sys-ex: ignorado"
 
 #: midi_patch_manager.cc:126
 msgid "Loading %1 MIDI patch from %2"
 msgid_plural "Loading %1 MIDI patches from %2"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Cargando %1 parche MIDI desde %2"
+msgstr[1] "Cargando %1 parches MIDI desde %2"
 
 #: midi_patch_manager.cc:158
 msgid "Unloading %1 MIDI patch from %2"
 msgid_plural "Unloading %1 MIDI patches from %2"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando %1 parche MIDI de %2"
+msgstr[1] "Descargando %1 parches MIDI de %2"
 
 #: midi_patch_manager.cc:175
 msgid "Error parsing MIDI patch file %1"
-msgstr ""
+msgstr "Error al analizar el archivo de parche MIDI %1"
 
 #: midi_patch_manager.cc:201
 msgid "Duplicate MIDI device `%1' in `%2' ignored"
-msgstr ""
+msgstr "Dispositivo MIDI duplicado `%1' en `%2' ignorado"
 
 #: midi_patch_manager.cc:242
 msgid "Removing MIDI patch file %1"
-msgstr ""
+msgstr "Eliminando el archivo de parche MIDI %1"
 
 #: midi_scene_changer.cc:312
 msgid "Scene "
-msgstr ""
+msgstr "Escena"
 
 #: midi_source.cc:127
 msgid "Missing parameter property on InterpolationStyle"
-msgstr ""
+msgstr "Propiedad de parámetro faltante en InterpolationStyle"
 
 #: midi_source.cc:147
 msgid "Missing style property on InterpolationStyle"
-msgstr ""
+msgstr "Propiedad de estilo faltante en InterpolationStyle"
 
 #: midi_source.cc:156
 msgid "Missing parameter property on AutomationState"
-msgstr ""
+msgstr "Propiedad de parámetro faltante en AutomationState"
 
 #: midi_source.cc:162
 msgid "Missing state property on AutomationState"
-msgstr ""
+msgstr "Propiedad de estado faltante en AutomationState"
 
 #: midi_stretch.cc:100
 msgid "MIDI stretch created non-MIDI source"
-msgstr ""
+msgstr "Estiramiento MIDI creado fuente no MIDI"
 
 #: monitor_processor.cc:55
 msgid "monitor dim"
-msgstr ""
+msgstr "monitor tenue"
 
 #: monitor_processor.cc:56
 msgid "monitor cut"
-msgstr ""
+msgstr "monitor cortar"
 
 #: monitor_processor.cc:57
 msgid "monitor mono"
-msgstr ""
+msgstr "monitor mono"
 
 #: monitor_processor.cc:60
 msgid "monitor dim level"
-msgstr ""
+msgstr "monitor nivel tenue"
 
 #: monitor_processor.cc:64
 msgid "monitor solo boost level"
-msgstr ""
+msgstr "monitor nivel solo boost"
 
 #: monitor_processor.cc:538
 msgid "cut control %1"
-msgstr ""
+msgstr "control de corte %1"
 
 #: monitor_processor.cc:539
 msgid "dim control"
-msgstr ""
+msgstr "control tenue"
 
 #: monitor_processor.cc:540
 msgid "polarity control"
-msgstr ""
+msgstr "control de polaridad"
 
 #: monitor_processor.cc:541
 msgid "solo control"
-msgstr ""
+msgstr "solo control"
 
 #: mp3filesource.cc:71
 msgid "MPEG Layer %1 (%2 kbps)"
-msgstr ""
+msgstr "Capa MPEG %1 (%2 kbps)"
 
 #: mtc_slave.cc:387
 msgid ""
 "Unknown rate/drop value %1 in incoming MTC stream, session values used "
 "instead"
 msgstr ""
+"Valor desconocido de tasa/caída %1 en la transmisión MTC entrante; en su "
+"lugar se utilizan valores de sesión"
 
 #: operations.cc:41
 msgid "capture"
-msgstr ""
+msgstr "captura"
 
 #: operations.cc:42
 msgid "paste"
-msgstr ""
+msgstr "pegar"
 
 #: operations.cc:43
 msgid "duplicate region"
-msgstr ""
+msgstr "duplicar región"
 
 #: operations.cc:44
 msgid "insert file"
@@ -1588,205 +1688,211 @@ msgstr "insert región"
 
 #: operations.cc:46
 msgid "drag region brush"
-msgstr ""
+msgstr "arrastrar pincel de región"
 
 #: operations.cc:47
 msgid "region drag"
-msgstr ""
+msgstr "arrastrar región"
 
 #: operations.cc:48
 msgid "selection grab"
-msgstr ""
+msgstr "agarre de selección"
 
 #: operations.cc:49
 msgid "region fill"
-msgstr ""
+msgstr "relleno de región"
 
 #: operations.cc:50
 msgid "fill selection"
-msgstr ""
+msgstr "rellenar selección"
 
 #: operations.cc:51
 msgid "create region"
-msgstr ""
+msgstr "crear región"
 
 #: operations.cc:52
 msgid "region copy"
-msgstr ""
+msgstr "copia de región"
 
 #: operations.cc:53
 msgid "fixed time region copy"
-msgstr ""
+msgstr "copia de región de tiempo fijo"
 
 #: pannable.cc:207
 msgid "Pannable given XML data for %1 - ignored"
-msgstr ""
+msgstr "Datos XML dados que se pueden desplazar para %1: ignorados"
 
 #: panner_manager.cc:100
 msgid "looking for panners in %1\n"
-msgstr ""
+msgstr "buscando panoramizadores en %1\n"
 
 #: panner_manager.cc:126
 msgid "Panner discovered: \"%1\" in %2\n"
-msgstr ""
+msgstr "Panner descubrió: \"%1\" en %2\n"
 
 #: panner_manager.cc:145
 msgid "PannerManager: cannot load module \"%1\" (%2)"
-msgstr ""
+msgstr "PannerManager: no se puede cargar el módulo \"%1\" (%2)"
 
 #: panner_manager.cc:152
 msgid "PannerManager: module \"%1\" has no descriptor function."
-msgstr ""
+msgstr "PannerManager: el módulo \"%1\" no tiene función de descriptor."
 
 #: panner_manager.cc:253
 msgid "no panner discovered for in/out = %1/%2"
-msgstr ""
+msgstr "no se descubrió ningún panoramizador para entrada/salida = %1/%2"
 
 #: panner_shell.cc:127
 msgid ""
 "No panner found: check that panners are being discovered correctly during "
 "startup."
 msgstr ""
+"No se encontró ningún panoramizador: verifique que los panoramizadores se "
+"descubran correctamente durante el inicio."
 
 #: panner_shell.cc:134
 msgid "select panner: %1\n"
-msgstr ""
+msgstr "seleccionar panoramizador : %1\n"
 
 #: panner_shell.cc:260
 msgid "Unknown panner plugin \"%1\" found in pan state - ignored"
 msgstr ""
+"Complemento de paneo desconocido \"%1\" encontrado en estado paneo: ignorado"
 
 #: panner_shell.cc:266
 msgid "panner plugin node has no type information!"
-msgstr ""
+msgstr "¡El nodo del plugin panner no tiene información de tipo!"
 
 #: parameter_descriptor.cc:119
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: parameter_descriptor.cc:120
 msgid "Invert"
-msgstr ""
+msgstr "Invertir"
 
 #: parameter_descriptor.cc:128
 msgid "Auto"
-msgstr ""
+msgstr "Automático"
 
 #: parameter_descriptor.cc:129
 msgid "Input"
-msgstr ""
+msgstr "Entrada"
 
 #: parameter_descriptor.cc:130
 msgid "Disk"
-msgstr ""
+msgstr "Disco"
 
 #: parameter_descriptor.cc:259
 msgid "Note|C"
-msgstr ""
+msgstr "C"
 
 #: parameter_descriptor.cc:260
 msgid "Note|C#"
-msgstr ""
+msgstr "C#"
 
 #: parameter_descriptor.cc:261
 msgid "Note|D"
-msgstr ""
+msgstr "D"
 
 #: parameter_descriptor.cc:262
 msgid "Note|D#"
-msgstr ""
+msgstr "D#"
 
 #: parameter_descriptor.cc:263
 msgid "Note|E"
-msgstr ""
+msgstr "E"
 
 #: parameter_descriptor.cc:264
 msgid "Note|F"
-msgstr ""
+msgstr "F"
 
 #: parameter_descriptor.cc:265
 msgid "Note|F#"
-msgstr ""
+msgstr "F#"
 
 #: parameter_descriptor.cc:266
 msgid "Note|G"
-msgstr ""
+msgstr "G"
 
 #: parameter_descriptor.cc:267
 msgid "Note|G#"
-msgstr ""
+msgstr "G#"
 
 #: parameter_descriptor.cc:268
 msgid "Note|A"
-msgstr ""
+msgstr "A"
 
 #: parameter_descriptor.cc:269
 msgid "Note|A#"
-msgstr ""
+msgstr "A#"
 
 #: parameter_descriptor.cc:270
 msgid "Note|B"
-msgstr ""
+msgstr "B"
 
 #: playlist.cc:2327
 msgid "region state node has no ID, ignored"
-msgstr ""
+msgstr "el nodo de estado de la región no tiene ID, se ignora"
 
 #: playlist.cc:2343
 msgid "Playlist: cannot create region from XML"
-msgstr ""
+msgstr "Lista de reproducción: no se puede crear una región desde XML"
 
 #: playlist_source.cc:111
 msgid "No playlist ID in PlaylistSource XML!"
-msgstr ""
+msgstr "¡No hay ID de lista de reproducción en PlaylistSource XML!"
 
 #: playlist_source.cc:130
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
+"¡No se pudo crear una lista de reproducción para PlaylistSource a partir de "
+"los datos de la sesión!"
 
 #: plugin.cc:132
 msgid "Trying to remove nonexistent preset."
-msgstr ""
+msgstr "Intentando eliminar un ajuste preestablecido inexistente."
 
 #: plugin.cc:136
 msgid "Cannot remove plugin factory preset."
-msgstr ""
+msgstr "No se puede eliminar el ajuste preestablecido de fábrica del plugin."
 
 #: plugin.cc:154
 msgid "Preset with given name already exists."
-msgstr ""
+msgstr "El ajuste preestablecido con el nombre de pila ya existe."
 
 #: plugin.cc:280
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #: plugin.cc:283
 msgid "Midi"
-msgstr ""
+msgstr "Midi"
 
 #: plugin.cc:286
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: plugin_insert.cc:525
 msgid "Plugin Enable"
-msgstr ""
+msgstr "Habilitar plugin"
 
 #: plugin_insert.cc:728
 msgid "PluginInsert: VST Bypass failed, falling back to host bypass."
 msgstr ""
+"PluginInsert: Falló la omisión de VST, recurriendo a la omisión del host."
 
 #: plugin_insert.cc:1329
 msgid "programming error: "
-msgstr "error de programación:"
+msgstr "error de programación: "
 
 #: plugin_insert.cc:1890
 msgid "SC %1"
-msgstr ""
+msgstr "SC %1"
 
 #: plugin_insert.cc:2579
 msgid "XML node describing plugin is missing the `type' field"
-msgstr ""
+msgstr "Al nodo XML que describe el plugin le falta el campo \"tipo\""
 
 #: plugin_insert.cc:2598
 msgid "unknown plugin type %1 in plugin insert state"
@@ -1794,7 +1900,7 @@ msgstr "Tipo de plugin desconocido %1 en estado de inserción de plugins"
 
 #: plugin_insert.cc:2622
 msgid "Plugin has no unique ID field"
-msgstr "El plugin no tiene un campo de ID único."
+msgstr "El plugin no tiene un campo de ID único"
 
 #: plugin_insert.cc:2672
 msgid ""
@@ -1806,15 +1912,15 @@ msgstr ""
 
 #: plugin_insert.cc:2902
 msgid "PluginInsert: Auto: no ladspa port number"
-msgstr ""
+msgstr "PluginInsert: Auto: sin número de puerto ladspa"
 
 #: plugin_insert.cc:2907
 msgid "PluginInsert: Auto: port id out of range"
-msgstr ""
+msgstr "PluginInsert: Automático: ID de puerto fuera de rango"
 
 #: plugin_insert.cc:2919
 msgid "PluginInsert: automatable control %1 not found - ignored"
-msgstr ""
+msgstr "PluginInsert: control automatizable %1 no encontrado - ignorado"
 
 #: plugin_manager.cc:247
 msgid "Discovering Plugins"
@@ -1822,197 +1928,205 @@ msgstr "Descubriendo plugins"
 
 #: plugin_manager.cc:352
 msgid "Scanning LADSPA Plugins"
-msgstr ""
+msgstr "Escaneo de plugins de LADSPA"
 
 #: plugin_manager.cc:354
 msgid "Scanning Lua DSP Processors"
-msgstr ""
+msgstr "Escaneo de procesadores Lua DSP"
 
 #: plugin_manager.cc:357
 msgid "Scanning LV2 Plugins"
-msgstr ""
+msgstr "Escaneo de plugins LV2"
 
 #: plugin_manager.cc:384
 msgid "Scanning Windows VST Plugins"
-msgstr ""
+msgstr "Escaneo de plugins VST de Windows"
 
 #: plugin_manager.cc:386
 msgid "Discovering Windows VST Plugins"
-msgstr ""
+msgstr "Descubriendo plugins VST de Windows"
 
 #: plugin_manager.cc:395
 msgid "Scanning Linux VST Plugins"
-msgstr ""
+msgstr "Escaneo de plugins VST de Linux"
 
 #: plugin_manager.cc:397
 msgid "Discovering Linux VST Plugins"
-msgstr ""
+msgstr "Descubriendo plugins VST de Linux"
 
 #: plugin_manager.cc:406
 msgid "Scanning Mac VST Plugins"
-msgstr ""
+msgstr "Escaneo de plugins VST de Mac"
 
 #: plugin_manager.cc:408
 msgid "Discovering Mac VST Plugins"
-msgstr ""
+msgstr "Descubriendo plugins VST de Mac"
 
 #: plugin_manager.cc:425
 msgid "VST Blacklist: "
-msgstr ""
+msgstr "Lista Negra de VST:"
 
 #: plugin_manager.cc:427
 msgid "VST Blacklist:"
-msgstr ""
+msgstr "Lista Negra de VST:"
 
 #: plugin_manager.cc:437
 msgid "Scanning AU Plugins"
-msgstr ""
+msgstr "Escaneo de plugins de AU"
 
 #: plugin_manager.cc:439
 msgid "Discovering AU Plugins"
-msgstr ""
+msgstr "Descubriendo plugins de AU"
 
 #: plugin_manager.cc:444
 msgid "Plugin Scan Complete..."
-msgstr ""
+msgstr "Escaneo de plugins completo..."
 
 #: plugin_manager.cc:449
 msgid "Indexing Plugins..."
-msgstr ""
+msgstr "Indexando Plugins..."
 
 #: plugin_manager.cc:685
 msgid "LADSPA"
-msgstr ""
+msgstr "LADSPA"
 
 #: plugin_manager.cc:743
 msgid "Could not parse rdf file: %1"
-msgstr ""
+msgstr "No se pudo analizar el archivo rdf: %1"
 
 #: plugin_manager.cc:780
 msgid "LADSPA: cannot load module \"%1\" (%2)"
-msgstr ""
+msgstr "LADSPA: no se puede cargar el módulo \"%1\" (%2)"
 
 #: plugin_manager.cc:787
 msgid "LADSPA: module \"%1\" has no descriptor function."
-msgstr ""
+msgstr "LADSPA: el módulo \"%1\" no tiene función de descriptor."
 
 #: plugin_manager.cc:1020
 msgid "Disabled WindowsVST scan (safe mode)"
-msgstr ""
+msgstr "Escaneo WindowsVST deshabilitado (modo seguro)"
 
 #: plugin_manager.cc:1025
 msgid "--- Windows VST plugins Scan: %1"
-msgstr ""
+msgstr "--- Plugins VST de Windows Escaneo: %1"
 
 #: plugin_manager.cc:1031
 msgid "VST"
-msgstr ""
+msgstr "VST"
 
 #: plugin_manager.cc:1036
 msgid "--- Windows VST plugins Scan Done"
-msgstr ""
+msgstr "--- Plugins VST de Windows Escaneo Finalizado"
 
 #: plugin_manager.cc:1051
 msgid "cannot open dll"
-msgstr ""
+msgstr "no se puede abrir dll"
 
 #: plugin_manager.cc:1055
 msgid "invalid dll, file too small"
-msgstr ""
+msgstr "dll inválido, archivo demasiado pequeño"
 
 #: plugin_manager.cc:1059
 msgid "not a dll"
-msgstr ""
+msgstr "no es un dll"
 
 #: plugin_manager.cc:1065
 msgid "cannot determine dll type"
-msgstr ""
+msgstr "no se puede determinar el tipo de dll"
 
 #: plugin_manager.cc:1069
 msgid "cannot read dll PE header"
-msgstr ""
+msgstr "no se puede leer el encabezado dll PE"
 
 #: plugin_manager.cc:1074
 msgid "invalid dll PE header"
-msgstr ""
+msgstr "encabezado dll PE no válido"
 
 #: plugin_manager.cc:1081
 msgid "i386 (32-bit)"
-msgstr ""
+msgstr "i386 (32-bit)"
 
 #: plugin_manager.cc:1084
 msgid "Itanium"
-msgstr ""
+msgstr "itanio"
 
 #: plugin_manager.cc:1087
 msgid "x64 (64-bit)"
-msgstr ""
+msgstr "x64 (64-bit)"
 
 #: plugin_manager.cc:1090
 msgid "Native Architecture"
-msgstr ""
+msgstr "Arquitectura Nativa"
 
 #: plugin_manager.cc:1093
 msgid "Unknown Architecture"
-msgstr ""
+msgstr "Arquitectura desconocida"
 
 #: plugin_manager.cc:1109
 msgid " *  %1 (cache only)"
-msgstr ""
+msgstr "* %1 (solo caché)"
 
 #: plugin_manager.cc:1111
 msgid " *  %1 - %2"
-msgstr ""
+msgstr " *  %1 - %2"
 
 #: plugin_manager.cc:1125
 msgid " -> Cannot get Windows VST information, plugin ignored."
 msgstr ""
+"-> No se puede obtener información VST de Windows, se ignora el plugin."
 
 #: plugin_manager.cc:1135
 msgid ""
 "VST plugin %1 does not support processReplacing, and cannot be used in %2 at "
 "this time"
 msgstr ""
+"El plugin VST %1 no admite la sustitución de procesos y no se puede utilizar "
+"en %2 en este momento"
 
 #: plugin_manager.cc:1158
 msgid "Ignoring duplicate Windows VST plugin \"%1\""
-msgstr ""
+msgstr "Ignorando el plugin VST de Windows duplicado \"%1\""
 
 #: plugin_manager.cc:1170
 msgid " -> OK (VST Plugin \"%1\" was added)."
-msgstr ""
+msgstr "-> Aceptar (se agregó el plugin VST \"%1\")."
 
 #: plugin_manager.cc:1211
 msgid "Disabled MacVST scan (safe mode)"
-msgstr ""
+msgstr "Escaneo MacVST deshabilitado (modo seguro)"
 
 #: plugin_manager.cc:1231
 msgid "MacVST"
-msgstr ""
+msgstr "MacVST"
 
 #: plugin_manager.cc:1270
 msgid ""
 "Mac VST plugin %1 does not support processReplacing, and so cannot be used "
 "in %2 at this time"
 msgstr ""
+"El plugin VST para Mac %1 no admite la sustitución de procesos, por lo que "
+"no se puede utilizar en %2 en este momento"
 
 #: plugin_manager.cc:1338
 msgid "Disabled LinuxVST scan (safe mode)"
-msgstr ""
+msgstr "Escaneo LinuxVST deshabilitado (modo seguro)"
 
 #: plugin_manager.cc:1351
 msgid "LXVST"
-msgstr ""
+msgstr "LXVST"
 
 #: plugin_manager.cc:1377
 msgid ""
 "linuxVST plugin %1 does not support processReplacing, and so cannot be used "
 "in %2 at this time"
 msgstr ""
+"el plugin LinuxVST %1 no admite la sustitución de procesos y, por lo tanto, "
+"no se puede utilizar en %2 en este momento."
 
 #: plugin_manager.cc:1542
 msgid "unknown plugin status type \"%1\" - all entries ignored"
-msgstr "unknown plugin status type \"%1\" - all entries ignored"
+msgstr ""
+"tipo de estado de plugin desconocido \"%1\": se ignoran todas las entradas"
 
 #: plugin_manager.cc:1562
 msgid "unknown plugin type \"%1\" - ignored"
@@ -2020,35 +2134,35 @@ msgstr "Tipo de plugin desconocido \"%1\" - ignorado"
 
 #: plugin_manager.cc:1650
 msgid "Loading plugin order file %1"
-msgstr ""
+msgstr "Cargando archivo de pedido de plugin %1"
 
 #: plugin_manager.cc:1660
 msgid "Cannot parse Plugin Order info from %1"
-msgstr ""
+msgstr "No se puede analizar la información del pedido del plugin de %1"
 
 #: plugin_manager.cc:1674
 msgid "Could not save Plugin Order info to %1"
-msgstr ""
+msgstr "No se pudo guardar la información del pedido del plugin en %1"
 
 #: plugin_manager.cc:1711
 msgid "Could not save Plugin Tags info to %1"
-msgstr ""
+msgstr "No se pudo guardar la información de las etiquetas de plugin en %1"
 
 #: plugin_manager.cc:1724
 msgid "Loading plugin meta data file %1"
-msgstr ""
+msgstr "Cargando el archivo de metadatos del plugin %1"
 
 #: plugin_manager.cc:1731
 msgid "Cannot parse plugin tag info from %1"
-msgstr ""
+msgstr "No se puede analizar la información de la etiqueta del plugin de %1"
 
 #: plugin_manager.cc:1808
 msgid "PluginManager::sanitize_tag could not tokenize string: "
-msgstr ""
+msgstr "PluginManager::sanitize_tag no pudo tokenizar la cadena: "
 
 #: plugin_manager.cc:1858
 msgid "PluginManager: Could not tokenize string: "
-msgstr ""
+msgstr "PluginManager: No se pudo tokenizar la cadena:"
 
 #: port.cc:546
 msgid "could not reregister %1"
@@ -2056,117 +2170,119 @@ msgstr "no se pudo registrar %1"
 
 #: port_engine_shared.cc:50
 msgid "BackendPort::connect (): invalid (null) port"
-msgstr ""
+msgstr "BackendPort::connect (): puerto no válido (nulo)"
 
 #: port_engine_shared.cc:55
 msgid "BackendPort::connect (): wrong port-type"
-msgstr ""
+msgstr "BackendPort::connect (): tipo de puerto incorrecto"
 
 #: port_engine_shared.cc:60
 msgid "BackendPort::connect (): cannot inter-connect output ports."
-msgstr ""
+msgstr "BackendPort::connect (): no puede interconectar puertos de salida."
 
 #: port_engine_shared.cc:65
 msgid "BackendPort::connect (): cannot inter-connect input ports."
-msgstr ""
+msgstr "BackendPort::connect (): no puede interconectar puertos de entrada."
 
 #: port_engine_shared.cc:70
 msgid "BackendPort::connect (): cannot self-connect ports."
-msgstr ""
+msgstr "BackendPort::connect (): no puede autoconectar puertos."
 
 #: port_engine_shared.cc:76
 msgid "BackendPort::connect (): ports are already connected:"
-msgstr ""
+msgstr "BackendPort::connect (): los puertos ya están conectados:"
 
 #: port_engine_shared.cc:101
 msgid "BackendPort::disconnect (): invalid (null) port"
-msgstr ""
+msgstr "BackendPort::disconnect (): puerto no válido (nulo)"
 
 #: port_engine_shared.cc:106
 msgid "BackendPort::disconnect (): ports are not connected:"
-msgstr ""
+msgstr "BackendPort::disconnect (): los puertos no están conectados:"
 
 #: port_engine_shared.cc:234
 msgid "BackendPort::port_is_physical (): invalid port."
-msgstr ""
+msgstr "BackendPort::port_is_physical (): puerto no válido."
 
 #: port_engine_shared.cc:320
 msgid "%1::register_port: Port already exists: (%2)"
-msgstr ""
+msgstr "%1::register_port: El puerto ya existe: (%2)"
 
 #: port_engine_shared.cc:359
 msgid "%1::unregister_port: Failed to find port"
-msgstr ""
+msgstr "%1::unregister_port: No se pudo encontrar el puerto"
 
 #: port_engine_shared.cc:416
 msgid ""
 "PortEngineSharedImpl: recovering from unclean shutdown, port registry is not "
 "empty."
 msgstr ""
+"PortEngineSharedImpl: recuperándose de un cierre incorrecto, el registro del "
+"puerto no está vacío."
 
 #: port_engine_shared.cc:444
 msgid "%1::set_port_name: Invalid Port"
-msgstr ""
+msgstr "%1::set_port_name: puerto no válido"
 
 #: port_engine_shared.cc:449
 msgid "%1::set_port_name: Port with given name already exists"
-msgstr ""
+msgstr "%1::set_port_name: El puerto con el nombre de pila ya existe"
 
 #: port_engine_shared.cc:474
 msgid "%1::get_port_name: invalid port"
-msgstr ""
+msgstr "%1::get_port_name: puerto no válido"
 
 #: port_engine_shared.cc:485
 msgid "%1::get_port_flags: invalid port"
-msgstr ""
+msgstr "%1::get_port_flags: puerto no válido"
 
 #: port_engine_shared.cc:495
 msgid "%1::get_port_property: invalid port"
-msgstr ""
+msgstr "%1::get_port_property: puerto no válido"
 
 #: port_engine_shared.cc:512
 msgid "%1::set_port_property: invalid port"
-msgstr ""
+msgstr "%1::set_port_property: puerto no válido"
 
 #: port_engine_shared.cc:558
 msgid "%1::connect: Invalid Source port: (%2)"
-msgstr ""
+msgstr "%1::connect: Puerto de origen no válido: (%2)"
 
 #: port_engine_shared.cc:562
 msgid "%1::connect: Invalid Destination port: (%2)"
-msgstr ""
+msgstr "%1::connect: Puerto de destino no válido: (%2)"
 
 #: port_engine_shared.cc:578 port_engine_shared.cc:613
 msgid "%1::disconnect: invalid port"
-msgstr ""
+msgstr "%1::desconectar: ​​puerto no válido"
 
 #: port_engine_shared.cc:590
 msgid "%1::connect: Invalid Source Port Handle"
-msgstr ""
+msgstr "%1::connect: Identificador de puerto de origen no válido"
 
 #: port_engine_shared.cc:597
 msgid "%1::connect: Invalid Destination Port: (%2)"
-msgstr ""
+msgstr "%1::connect: Puerto de destino no válido: (%2)"
 
 #: port_engine_shared.cc:625
 msgid "%1::disconnect_all: invalid port"
-msgstr ""
+msgstr "%1::disconnect_all: puerto no válido"
 
 #: port_engine_shared.cc:640
 msgid "%1::disconnect_all: Invalid Port"
-msgstr ""
+msgstr "%1::disconnect_all: Puerto no válido"
 
 #: port_engine_shared.cc:653
 msgid "%1::connected_to: Invalid Port"
-msgstr ""
+msgstr "%1::connected_to: Puerto no válido"
 
 #: port_engine_shared.cc:666
 msgid "%1::physically_connected: Invalid Port"
-msgstr ""
+msgstr "%1::physiically_connected: puerto no válido"
 
 #: port_engine_shared.cc:678
 msgid "%1::get_connections: Invalid Port"
-msgstr ""
+msgstr "%1::get_connections: Puerto no válido"
 
 #: port_insert.cc:45 port_insert.cc:277
 msgid "insert %1"
@@ -2175,10 +2291,12 @@ msgstr "insert %1"
 #: port_insert.cc:196
 msgid "XML node describing port insert is missing the `type' field"
 msgstr ""
+"Al nodo XML que describe la inserción del puerto le falta el campo \"tipo\""
 
 #: port_insert.cc:201
 msgid "non-port insert XML used for port plugin insert"
 msgstr ""
+"XML de inserción sin puerto utilizado para la inserción de plugin de puerto"
 
 #: port_manager.cc:376
 msgid ""
@@ -2193,6 +2311,8 @@ msgid ""
 "No more ports are available. You will need to stop %1 and restart with more "
 "ports if you need this many tracks."
 msgstr ""
+"No hay más puertos disponibles. Deberá detener %1 y reiniciar con más "
+"puertos si necesita tantas pistas."
 
 #: port_manager.cc:381
 msgid "AudioEngine: cannot register port \"%1\": %2"
@@ -2200,11 +2320,11 @@ msgstr "AudioEngine: no se puede registrar el puerto \"%1\": %2"
 
 #: port_manager.cc:419
 msgid "(unknown type)"
-msgstr ""
+msgstr "(tipo desconocido)"
 
 #: port_manager.cc:436
 msgid "(unknown error)"
-msgstr ""
+msgstr "(error desconocido)"
 
 #: port_manager.cc:562
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
@@ -2212,31 +2332,33 @@ msgstr "AudioEngine: no se puede conectar %1 (%2) a %3 (%4)"
 
 #: port_manager.cc:624 port_manager.cc:625
 msgid "Re-establising port %1 failed"
-msgstr ""
+msgstr "Error al restablecer el puerto %1"
 
 #: port_manager.cc:1193
 msgid "Could not save MIDI port info to %1"
-msgstr ""
+msgstr "No se pudo guardar la información del puerto MIDI en %1"
 
 #: port_manager.cc:1208
 msgid "Cannot load MIDI port info from %1"
-msgstr ""
+msgstr "No se puede cargar la información del puerto MIDI desde %1"
 
 #: port_manager.cc:1228
 msgid "MIDI port info file %1 contains invalid information - please remove it."
 msgstr ""
+"El archivo de información del puerto MIDI %1 contiene información no válida; "
+"elimínela."
 
 #: port_manager.cc:1396
 msgid "Ambiguous latency for port '%1' (%2, %3)"
-msgstr ""
+msgstr "Latencia ambigua para el puerto '%1' (%2, %3)"
 
 #: processor.cc:235
 msgid "No %1 property flag in element %2"
-msgstr ""
+msgstr "No hay indicador de propiedad %1 en el elemento %2"
 
 #: processor.cc:244
 msgid "No child node with active property"
-msgstr ""
+msgstr "Ningún nodo secundario con propiedad activa"
 
 #: rc_configuration.cc:101
 msgid "Loading system configuration file %1"
@@ -2257,6 +2379,8 @@ msgid ""
 "Your system %1 configuration file is empty. This probably means that there "
 "was an error installing %1"
 msgstr ""
+"El archivo de configuración de su sistema %1 está vacío. Esto probablemente "
+"significa que hubo un error al instalar %1"
 
 #: rc_configuration.cc:129
 msgid "Loading user configuration file %1"
@@ -2283,52 +2407,58 @@ msgstr "Archivo de configuración %1 no guardado"
 #: rc_configuration.cc:160 rc_configuration.cc:168
 msgid "Could not remove temporary config file at path \"%1\" (%2)"
 msgstr ""
+"No se pudo eliminar el archivo de configuración temporal en la ruta "
+"\"%1\" (%2)"
 
 #: rc_configuration.cc:166
 msgid "Could not rename temporary config file %1 to %2 (%3)"
 msgstr ""
+"No se pudo cambiar el nombre del archivo de configuración temporal %1 a %2 "
+"(%3)"
 
 #: readable.cc:42
 msgid "Cannot open File \"%1\": %2"
-msgstr ""
+msgstr "No se puede abrir el archivo \"%1\": %2"
 
 #: readable.cc:61
 msgid "Could not read file \"%1\"."
-msgstr ""
+msgstr "No se pudo leer el archivo \"%1\"."
 
 #: recent_sessions.cc:59
 msgid "cannot open recent session file %1 (%2)"
-msgstr ""
+msgstr "no se puede abrir el archivo de sesión reciente %1 (%2)"
 
 #: recent_sessions.cc:72 recent_sessions.cc:130
 msgid "Error reading recent session file %1 (%2)"
-msgstr ""
+msgstr "Error al leer el archivo de sesión reciente %1 (%2)"
 
 #: recent_sessions.cc:117
 msgid "Cannot open recent template file %1 (%2)"
-msgstr ""
+msgstr "No se puede abrir el archivo de plantilla reciente %1 (%2)"
 
 #: recent_sessions.cc:180
 msgid "Error writing recent sessions file %1 (%2)"
-msgstr ""
+msgstr "Error al escribir el archivo de sesiones recientes %1 (%2)"
 
 #: recent_sessions.cc:215
 msgid "Error writing saved template file %1 (%2)"
-msgstr ""
+msgstr "Error al escribir el archivo de plantilla guardado %1 (%2)"
 
 #: region_factory.cc:83 region_factory.cc:122 region_factory.cc:161
 #: region_factory.cc:201
 msgid ""
 "programming error: RegionFactory::create() called with unknown Region type"
 msgstr ""
+"error de programación: RegionFactory::create() llamado con tipo de región "
+"desconocido"
 
 #: region_factory.cc:557
 msgid "%1 compound-%2 (%3)"
-msgstr ""
+msgstr "%1 compuesto-%2 (%3)"
 
 #: region_factory.cc:559
 msgid "%1 compound-%2.1 (%3)"
-msgstr ""
+msgstr "%1 compuesto-%2.1 (%3)"
 
 #: region_factory.cc:621
 msgid "cannot create new name for region \"%1\""
@@ -2340,7 +2470,7 @@ msgstr "Importar: %1"
 
 #: resampled_source.cc:139 srcfilesource.cc:74
 msgid "Import: src_new() failed : %1"
-msgstr ""
+msgstr "Importación: src_new() falló: %1"
 
 #: return.cc:44
 msgid "return %1"
@@ -2348,158 +2478,168 @@ msgstr "retorno %1"
 
 #: route.cc:949 route.cc:3174 track.cc:867
 msgid "unknown Processor type \"%1\"; ignored"
-msgstr ""
+msgstr "tipo de procesador desconocido \"%1\"; ignorado"
 
 #: route.cc:971
 msgid "processor could not be created. Ignored."
-msgstr ""
+msgstr "No se pudo crear el procesador. Ignorado."
 
 #: route.cc:2602 route.cc:2808
 msgid "Bad node sent to Route::set_state() [%1]"
-msgstr ""
+msgstr "Nodo incorrecto enviado a Ruta::set_state() [%1]"
 
 #: route.cc:2673
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
+"¡Se encontró un estado panoramizable para la ruta (%1) sin un panoramizador!"
 
 #: route.cc:3673
 msgid "Invalid Solo-Isolate propagation: from:%1 new:%2 - old:%3 = delta:%4"
 msgstr ""
+"Propagación de aislamiento individual no válida: desde:%1 nuevo:%2 - antiguo:"
+"%3 = delta:%4"
 
 #: route.cc:4940
 msgid "Amp/Fader on Route '%1' went AWOL. Re-added."
 msgstr ""
+"El amplificador/atenuador de la ruta '%1' desapareció sin permiso. "
+"Reagregado."
 
 #: route.cc:5789 route.cc:5800
 msgid "lo"
-msgstr ""
+msgstr "bajo"
 
 #: route.cc:5790
 msgid "mid"
-msgstr ""
+msgstr "medio"
 
 #: route.cc:5791 route.cc:5803
 msgid "hi"
-msgstr ""
+msgstr "alto"
 
 #: route.cc:5801
 msgid "lm"
-msgstr ""
+msgstr "m-b"
 
 #: route.cc:5802
 msgid "hm"
-msgstr ""
+msgstr "m-a"
 
 #: route.cc:5877
 msgid "Leveler"
-msgstr ""
+msgstr "Nivelador"
 
 #: route.cc:5879
 msgid "Compressor"
-msgstr ""
+msgstr "Compresor"
 
 #: route.cc:5881 route.cc:5883
 msgid "Limiter"
-msgstr ""
+msgstr "Limitador"
 
 #: route.cc:5883
 msgid "Sidechain"
-msgstr ""
+msgstr "Sidechain"
 
 #: route.cc:5886 route.cc:5888 route.cc:5905 route.cc:5907
 msgid "???"
-msgstr ""
+msgstr "???"
 
 #: route.cc:5898
 msgid "Attk"
-msgstr ""
+msgstr "Atq"
 
 #: route.cc:5900
 msgid "Ratio"
-msgstr ""
+msgstr "Ratio"
 
 #: route.cc:5903
 msgid "Rels"
-msgstr ""
+msgstr "Rels"
 
 #: route_group.cc:542
 msgid "You cannot subgroup MIDI tracks at this time"
-msgstr ""
+msgstr "No puedes crear subgrupos de pistas MIDI en este momento"
 
 #: route_group.cc:549
 msgid ""
 "You cannot subgroup tracks with different number of outputs at this time."
 msgstr ""
+"No puedes crear subgrupos de pistas con diferente número de salidas en este "
+"momento."
 
 #: rb_effect.cc:234 rb_effect.cc:271
 msgid "tempoize: error reading data from %1 at %2 (wanted %3, got %4)"
-msgstr ""
+msgstr "tempoize: error al leer datos de %1 en %2 (se busca %3, se obtiene %4)"
 
 #: rb_effect.cc:297 rb_effect.cc:326
 msgid "error writing tempo-adjusted data to %1"
-msgstr ""
+msgstr "error al escribir datos ajustados al tempo en %1"
 
 #: rt_tasklist.cc:94
 msgid "Cannot create thread for TaskList!"
-msgstr ""
+msgstr "¡No se puede crear un hilo para TaskList!"
 
 #: send.cc:75
 msgid "aux %1"
-msgstr ""
+msgstr "aux %1"
 
 #: send.cc:80 send.cc:518
 msgid "send %1"
-msgstr "send %1"
+msgstr "envío %1"
 
 #: send.cc:82
 msgid "foldback %1"
-msgstr ""
+msgstr "rotorno %1"
 
 #: send.cc:84
 msgid "programming error: send created using role %1"
-msgstr ""
+msgstr "error de programación: envío creado usando el rol %1"
 
 #: session.cc:354
 msgid "Session initialization failed"
-msgstr ""
+msgstr "La inicialización de la sesión falló"
 
 #: session.cc:371
 msgid "Failed to load template/snapshot state"
-msgstr ""
+msgstr "No se pudo cargar el estado de la plantilla/instantánea"
 
 #: session.cc:374
 msgid "Failed to parse template/snapshot state"
-msgstr ""
+msgstr "No se pudo analizar el estado de la plantilla/instantánea"
 
 #: session.cc:394
 msgid "Failed to load state"
-msgstr ""
+msgstr "No se pudo cargar el estado"
 
 #: session.cc:404 session.cc:408 session.cc:411 session.cc:414 session.cc:417
 msgid "Cannot initialize session/engine: %1"
-msgstr ""
+msgstr "No se puede inicializar la sesión/motor: %1"
 
 #: session.cc:404
 msgid "Failed to create background threads."
-msgstr ""
+msgstr "No se pudieron crear hilos en segundo plano."
 
 #: session.cc:408
 msgid "Invalid TempoMap in session-file."
-msgstr ""
+msgstr "TempoMap no válido en el archivo de sesión."
 
 #: session.cc:411
 msgid "Invalid or corrupt session state."
-msgstr ""
+msgstr "Estado de sesión no válido o corrupto."
 
 #: session.cc:414
 msgid "Port registration failed."
-msgstr ""
+msgstr "Error en el registro del puerto."
 
 #: session.cc:417
 msgid ""
 "Unexpected exception during session setup, possibly invalid audio/midi "
 "engine parameters. Please see stdout/stderr for details"
 msgstr ""
+"Excepción inesperada durante la configuración de la sesión, posiblemente "
+"parámetros del motor de audio/midi no válidos. Consulte stdout/stderr para "
+"obtener más detalles."
 
 #: session.cc:449
 msgid "Connect to engine"
@@ -2511,11 +2651,11 @@ msgstr "Carga de sesión completada"
 
 #: session.cc:530
 msgid "Set up LTC"
-msgstr ""
+msgstr "Configurar LTC"
 
 #: session.cc:532
 msgid "Set up Click"
-msgstr ""
+msgstr "Configurar clic"
 
 #: session.cc:534
 msgid "Set up standard connections"
@@ -2532,64 +2672,74 @@ msgstr "no se puede conectar salida master %1 a %2"
 #: session.cc:937
 msgid "Cannot remove monitor section while the engine is offline."
 msgstr ""
+"No se puede eliminar la sección del monitor mientras el motor está fuera de "
+"línea."
 
 #: session.cc:998
 msgid "Cannot create monitor section while the engine is offline."
 msgstr ""
+"No se puede crear una sección de monitor mientras el motor está fuera de "
+"línea."
 
 #: session.cc:1019
 msgid "Cannot create monitor section. 'Monitor' Port name is not unique."
 msgstr ""
+"No se puede crear la sección de monitor. El nombre del puerto 'Monitor' no "
+"es único."
 
 #: session.cc:1053 session.cc:1180
 msgid "cannot connect control input %1 to %2"
-msgstr ""
+msgstr "no se puede conectar la entrada de control %1 a %2"
 
 #: session.cc:1073 session.cc:1199
 msgid "The preferred I/O for the monitor bus (%1) cannot be found"
-msgstr ""
+msgstr "No se puede encontrar la E/S preferida para el bus de monitor (%1)"
 
 #: session.cc:1104 session.cc:1230
 msgid "cannot connect control output %1 to %2"
-msgstr ""
+msgstr "no se puede conectar la salida de control %1 a %2"
 
 #: session.cc:1309
 msgid "cannot create Auditioner: no auditioning of regions possible"
-msgstr ""
+msgstr "No se puede crear Auditioner: no es posible audicionar regiones."
 
 #: session.cc:1574
 msgid "Session: you can't use that location for auto punch (start <= end)"
 msgstr ""
+"Sesión: no puedes usar esa ubicación para el marcado automático (inicio <= "
+"fin)"
 
 #: session.cc:1595
 msgid "Session: you can't use that location for session start/end)"
-msgstr ""
+msgstr "Sesión: no puedes usar esa ubicación para iniciar/finalizar la sesión)"
 
 #: session.cc:1629
 msgid ""
 "You cannot use this location for auto-loop because it has zero or negative "
 "length"
 msgstr ""
+"No puede utilizar esta ubicación para el bucle automático porque tiene una "
+"longitud cero o negativa"
 
 #: session.cc:1821
 msgid "programming error: session range removed!"
-msgstr ""
+msgstr "Error de programación: ¡rango de sesión eliminado!"
 
 #: session.cc:2092
 msgid "feedback loop setup between %1 and %2"
-msgstr ""
+msgstr "Configuración del bucle de retroalimentación entre %1 y %2"
 
 #: session.cc:2357
 msgid "Audio "
-msgstr ""
+msgstr "Audio "
 
 #: session.cc:2361
 msgid "MIDI "
-msgstr ""
+msgstr "MIDI "
 
 #: session.cc:2430
 msgid "Session: could not create new midi track."
-msgstr ""
+msgstr "Sesión: no se pudo crear una nueva pista midi."
 
 #: session.cc:2436
 msgid ""
@@ -2601,39 +2751,43 @@ msgstr ""
 
 #: session.cc:2484 session.cc:2487
 msgid "Midi Bus"
-msgstr ""
+msgstr "Bus Midi"
 
 #: session.cc:2509
 msgid "cannot configure new midi bus input"
-msgstr ""
+msgstr "no se puede configurar una nueva entrada de bus midi"
 
 #: session.cc:2515
 msgid "cannot configure new midi bus output"
-msgstr ""
+msgstr "no se puede configurar una nueva salida de bus midi"
 
 #: session.cc:2529 session.cc:2809
 msgid "Session: could not create new audio route."
-msgstr "Sesión: No se pudo crear la ruta del nuevo audio"
+msgstr "Sesión: No se pudo crear la ruta del nuevo audio."
 
 #: session.cc:2703 session.cc:2711 session.cc:2785 session.cc:2793
 msgid "cannot configure %1 in/%2 out configuration for new audio track"
 msgstr ""
+"No se puede configurar la configuración de %1 entrada/%2 salida para una "
+"nueva pista de audio"
 
 #: session.cc:2727
 msgid "Session: could not create new audio track."
-msgstr ""
+msgstr "Sesión: no se pudo crear una nueva pista de audio."
 
 #: session.cc:2760 session.cc:2763
 msgid "Bus"
-msgstr ""
+msgstr "Bus"
 
 #: session.cc:2888 session.cc:2898
 msgid "Session: UINT_MAX routes? impossible!"
-msgstr ""
+msgstr "Sesión: ¿Rutas UINT_MAX? ¡imposible!"
 
 #: session.cc:3033
 msgid "Session: cannot create track/bus from template description"
 msgstr ""
+"Sesión: no se puede crear pista/autobús a partir de la descripción de la "
+"plantilla"
 
 #: session.cc:3062
 msgid "Session: could not create new route from template"
@@ -2641,140 +2795,155 @@ msgstr "Sesión: No se pudo crear la nueva ruta desde plantilla"
 
 #: session.cc:3097
 msgid "Adding new tracks/busses failed"
-msgstr ""
+msgstr "Error al agregar nuevas pistas/buses"
 
 #: session.cc:4675
 msgid "Merging embedded file %1: name collision AND md5 hash collision!"
 msgstr ""
+"Fusionando el archivo incrustado %1: ¡colisión de nombres Y colisión de hash "
+"md5!"
 
 #: session.cc:4799
 msgid "There are already %1 recordings for %2, which I consider too many."
-msgstr ""
+msgstr "Ya hay %1 grabaciones para %2, las cuales considero demasiadas."
 
 #: session.cc:4861
 msgid ""
 "There are already many recordings for %1, resulting in a too long file-path "
 "%2."
 msgstr ""
+"Ya hay muchas grabaciones para %1, lo que resulta en una ruta de archivo %2 "
+"demasiado larga."
 
 #: session.cc:5475
 msgid "send ID %1 appears to be in use already"
-msgstr ""
+msgstr "el ID de envío %1 parece estar ya en uso."
 
 #: session.cc:5487
 msgid "aux send ID %1 appears to be in use already"
-msgstr ""
+msgstr "el ID de envío auxiliar %1 parece estar ya en uso"
 
 #: session.cc:5499
 msgid "return ID %1 appears to be in use already"
-msgstr ""
+msgstr "el ID de retorno %1 parece estar ya en uso"
 
 #: session.cc:5511
 msgid "insert ID %1 appears to be in use already"
-msgstr ""
+msgstr "injerto ID %1 parece estar ya en uso"
 
 #: session.cc:5659
 msgid "Cannot write a range where end <= start (e.g. %1 <= %2)"
 msgstr ""
+"No se puede escribir un rango donde final <= inicio (por ejemplo, %1 <= %2)"
 
 #: session.cc:5672
 msgid "Cannot write a range with no data."
-msgstr ""
+msgstr "No se puede escribir un rango sin datos."
 
 #: session.cc:5714
 msgid "cannot create new file \"%1\" for %2"
-msgstr ""
+msgstr "No se puede crear un nuevo archivo \"%1\" para %2"
 
 #: session_bundles.cc:137
 #, c-format
 msgid "out %s"
-msgstr ""
+msgstr "out %s"
 
 #: session_bundles.cc:139
 #, c-format
 msgid "out %<PRIu32>"
-msgstr ""
+msgstr "out %<PRIu32>"
 
 #: session_bundles.cc:154
 #, c-format
 msgid "out %<PRIu32>+%<PRIu32>"
-msgstr ""
+msgstr "out %<PRIu32>+%<PRIu32>"
 
 #: session_bundles.cc:171
 #, c-format
 msgid "in %s"
-msgstr ""
+msgstr "in %s"
 
 #: session_bundles.cc:173
 #, c-format
 msgid "in %<PRIu32>"
-msgstr ""
+msgstr "in %<PRIu32>"
 
 #: session_bundles.cc:188
 #, c-format
 msgid "in %<PRIu32>+%<PRIu32>"
-msgstr ""
+msgstr "in %<PRIu32>+%<PRIu32>"
 
 #: session_click.cc:275
 msgid "cannot open click soundfile %1 (%2)"
-msgstr ""
+msgstr "no se puede abrir, haga clic en el archivo de sonido %1 (%2)"
 
 #: session_click.cc:288
 msgid "cannot read data from click soundfile"
-msgstr ""
+msgstr "no se pueden leer los datos del archivo de sonido de clic."
 
 #: session_command.cc:85
 msgid "Tried to reconstitute a MementoCommand with no contents, failing. id=%1"
 msgstr ""
+"Se intentó reconstituir un MementoCommand sin contenido, pero falló. "
+"identificación=%1"
 
 #: session_command.cc:147
 msgid ""
 "Could not reconstitute MementoCommand from XMLNode. object type = %1 id = %2"
 msgstr ""
+"No se pudo reconstituir MementoCommand desde XMLNode. tipo de objeto = %1 "
+"identificación = %2"
 
 #: session_command.cc:158
 msgid "Could get object ID and type name for StatefulDiffCommand from XMLNode."
 msgstr ""
+"Se pudo obtener el ID del objeto y el nombre del tipo para "
+"StatefulDiffCommand de XMLNode."
 
 #: session_command.cc:181
 msgid ""
 "Could not reconstitute StatefulDiffCommand from XMLNode. object type = %1 id "
 "= %2"
 msgstr ""
+"No se pudo reconstituir StatefulDiffCommand desde XMLNode. tipo de objeto = "
+"%1 identificación = %2"
 
 #: session_configuration.cc:152
 msgid "%1: cannot part default session options \"%2\""
-msgstr ""
+msgstr "%1: no se pueden separar las opciones de sesión predeterminadas \"%2\""
 
 #: session_configuration.cc:158
 msgid "Invalid session default XML Root."
-msgstr ""
+msgstr "Raíz XML predeterminada de sesión no válida."
 
 #: session_configuration.cc:165
 msgid "Loaded custom session defaults."
-msgstr ""
+msgstr "Valores predeterminados de sesión personalizados cargados."
 
 #: session_configuration.cc:167
 msgid "Found no session defaults in XML file."
-msgstr ""
+msgstr "No se encontraron valores predeterminados de sesión en el archivo XML."
 
 #: session_configuration.cc:193
 msgid "Could not save session options"
-msgstr ""
+msgstr "No se pudieron guardar las opciones de la sesión"
 
 #: session_directory.cc:70
 msgid "Cannot create Session directory at path %1 Error: %2"
-msgstr ""
+msgstr "No se puede crear el directorio de sesión en la ruta %1 Error: %2"
 
 #: session_directory.cc:87
 msgid "Session subdirectory does not exist at path %1"
-msgstr ""
+msgstr "El subdirectorio de sesión no existe en la ruta %1"
 
 #: session_directory.cc:166
 msgid ""
 "session-dir and session-name mismatch. Please use 'Menu > Session > Rename' "
 "in the future to rename sessions."
 msgstr ""
+"El directorio de sesión y el nombre de sesión no coinciden. Utilice 'Menú > "
+"Sesión > Cambiar nombre' en el futuro para cambiar el nombre de las sesiones."
 
 #: session_directory.cc:172
 msgid ""
@@ -2782,84 +2951,96 @@ msgid ""
 "There is more than one folder in '%1'.\n"
 "Please remove extra subdirs to reduce possible filename ambiguties."
 msgstr ""
+"El directorio de intercambio de la sesión está contaminado.\n"
+"Hay más de una carpeta en '%1'.\n"
+"Elimine los subdirectorios adicionales para reducir posibles ambigüedades en "
+"los nombres de archivos."
 
 #: session_events.cc:233
 msgid "Session: cannot have two events of type %1 at the same sample (%2)."
 msgstr ""
+"Sesión: no puede tener dos eventos de tipo %1 en la misma muestra (%2)."
 
 #: session_export.cc:149
 msgid "Cannot prepare transport for export"
-msgstr ""
+msgstr "No se puede preparar el transporte para la exportación"
 
 #: session_export.cc:168
 msgid "%1: cannot seek to %2 for export"
-msgstr ""
+msgstr "%1: no se puede buscar %2 para exportar"
 
 #: session_export.cc:265
 msgid "Export ended unexpectedly: %1"
-msgstr ""
+msgstr "La exportación finalizó inesperadamente: %1"
 
 #: session_ltc.cc:233
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
+"Codificador LTC: velocidad de fotogramas no válida: la codificación LTC está "
+"deshabilitada durante el resto de esta sesión."
 
 #: session_midi.cc:562
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
+"Sesión: no se puede enviar un mensaje MTC de un cuarto de fotograma (%1)"
 
 #: session_playlists.cc:132
 msgid "Session State: Unused playlist was listed as used."
 msgstr ""
+"Estado de la sesión: la lista de reproducción no utilizada figuraba como "
+"utilizada."
 
 #: session_playlists.cc:486 session_playlists.cc:506
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
+"Sesión: no se puede crear una lista de reproducción a partir de una "
+"descripción XML."
 
 #: session_process.cc:201
 msgid "Session: error in no roll for %1"
-msgstr ""
+msgstr "Sesión: error en no roll para %1"
 
 #: session_process.cc:1000
 msgid "Programming error: illegal event type in process_event (%1)"
-msgstr ""
+msgstr "Error de programación: tipo de evento ilegal en process_event (%1)"
 
 #: session_state.cc:204
 msgid "solo cut control (dB)"
-msgstr ""
+msgstr "control de corte en solo (dB)"
 
 #: session_state.cc:225
 msgid "Set block size and sample rate"
-msgstr ""
+msgstr "Establecer el tamaño del bloque y la frecuencia de muestreo"
 
 #: session_state.cc:230
 msgid "Using configuration"
-msgstr ""
+msgstr "Usando la configuración"
 
 #: session_state.cc:246
 msgid "Butler did not start"
-msgstr ""
+msgstr "Mayordomo no empezó"
 
 #: session_state.cc:251
 msgid "MIDI I/O thread did not start"
-msgstr ""
+msgstr "El hilo de E/S MIDI no se inició"
 
 #: session_state.cc:269 session_state.cc:391
 msgid "Unexpected exception during session setup: "
-msgstr ""
+msgstr "Excepción inesperada durante la configuración de la sesión:"
 
 #: session_state.cc:272 session_state.cc:394
 msgid "Unknown exception during session setup"
-msgstr ""
+msgstr "Excepción desconocida durante la configuración de la sesión"
 
 #: session_state.cc:298
 msgid "Could not set session state from XML"
-msgstr ""
+msgstr "No se pudo establecer el estado de la sesión desde XML"
 
 #: session_state.cc:302
 msgid "Session state: "
-msgstr ""
+msgstr "Estado de la sesión:"
 
 #: session_state.cc:398
 msgid "Reset Remote Controls"
@@ -2867,99 +3048,109 @@ msgstr "Restablecer controles remotos"
 
 #: session_state.cc:411 session_state.cc:441
 msgid "Filling playback buffers"
-msgstr ""
+msgstr "Llenar buffers de reproducción"
 
 #: session_state.cc:508
 msgid "Session: cannot create session peakfile folder \"%1\" (%2)"
 msgstr ""
+"Sesión: no se puede crear la carpeta de archivos picos de sesión \"%1\" (%2)"
 
 #: session_state.cc:515
 msgid "Session: cannot create session sounds dir \"%1\" (%2)"
 msgstr ""
+"Sesión: no se puede crear el directorio de sonidos de sesión \"%1\" (%2)"
 
 #: session_state.cc:522
 msgid "Session: cannot create session midi dir \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear el directorio midi de sesión \"%1\" (%2)"
 
 #: session_state.cc:529
 msgid "Session: cannot create session dead sounds folder \"%1\" (%2)"
 msgstr ""
+"Sesión: no se puede crear la carpeta de sonidos inactivos de la sesión "
+"\"%1\" (%2)"
 
 #: session_state.cc:536
 msgid "Session: cannot create session export folder \"%1\" (%2)"
 msgstr ""
+"Sesión: no se puede crear la carpeta de exportación de sesión \"%1\" (%2)"
 
 #: session_state.cc:544
 msgid "Session: cannot create session backup folder \"%1\" (%2)"
 msgstr ""
+"Sesión: no se puede crear la carpeta de copia de seguridad de la sesión "
+"\"%1\" (%2)"
 
 #: session_state.cc:552
 msgid "Session: cannot create session analysis folder \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear la carpeta de análisis de sesión \"%1\" (%2)"
 
 #: session_state.cc:559
 msgid "Session: cannot create session plugins folder \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear la carpeta de plugins de sesión \"%1\" (%2)"
 
 #: session_state.cc:566
 msgid "Session: cannot create session externals folder \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear la carpeta externa de la sesión \"%1\" (%2)"
 
 #: session_state.cc:580
 msgid "Session: cannot create session folder \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear la carpeta de sesión \"%1\" (%2)"
 
 #: session_state.cc:615
 msgid "Error reading session template file %1 (%2)"
-msgstr ""
+msgstr "Error al leer el archivo de plantilla de sesión %1 (%2)"
 
 #: session_state.cc:630
 msgid "Error writing session template file %1 (%2)"
-msgstr ""
+msgstr "Error al escribir el archivo de plantilla de sesión %1 (%2)"
 
 #: session_state.cc:645
 msgid "Could not open %1 for writing session template"
-msgstr ""
+msgstr "No se pudo abrir %1 para la plantilla de sesión de escritura"
 
 #: session_state.cc:652
 msgid "Could not open session template %1 for reading"
-msgstr ""
+msgstr "No se pudo abrir la plantilla de sesión %1 para lectura"
 
 #: session_state.cc:702
 msgid "Could not remove pending capture state at path \"%1\" (%2)"
-msgstr "Could not remove pending capture state at path \"%1\" (%2)"
+msgstr ""
+"No se pudo eliminar el estado de captura pendiente en la ruta \"%1\" (%2)"
 
 #: session_state.cc:731
 msgid "could not rename snapshot %1 to %2 (%3)"
-msgstr ""
+msgstr "No se pudo cambiar el nombre de la instantánea %1 a %2 (%3)"
 
 #: session_state.cc:759
 msgid "Could not remove session file at path \"%1\" (%2)"
-msgstr ""
+msgstr "No se pudo eliminar el archivo de sesión en la ruta \"%1\" (%2)"
 
 #: session_state.cc:883
 msgid "state could not be saved to %1"
-msgstr ""
+msgstr "El estado no se pudo guardar en %1."
 
 #: session_state.cc:885 session_state.cc:900
 msgid "Could not remove temporary session file at path \"%1\" (%2)"
 msgstr ""
+"No se pudo eliminar el archivo de sesión temporal en la ruta \"%1\" (%2)"
 
 #: session_state.cc:897
 msgid "could not rename temporary session file %1 to %2 (%3)"
 msgstr ""
+"No se pudo cambiar el nombre del archivo de sesión temporal %1 a %2 (%3)"
 
 #: session_state.cc:926
 msgid "Could not save backup file at path \"%1\" (%2)"
-msgstr ""
+msgstr "No se pudo guardar el archivo de respaldo en la ruta \"%1\" (%2)"
 
 #: session_state.cc:1002
 msgid "%1: session file \"%2\" doesn't exist!"
-msgstr ""
+msgstr "%1: ¡el archivo de sesión \"%2\" no existe!"
 
 #: session_state.cc:1014
 msgid "Could not understand session file %1"
-msgstr ""
+msgstr "No se pudo comprender el archivo de sesión %1"
 
 #: session_state.cc:1023
 msgid "Session file %1 is not a session"
@@ -2970,70 +3161,74 @@ msgid ""
 "Incompatible Session Version. That session was created with a newer version "
 "of %1"
 msgstr ""
+"Versión de sesión incompatible. Esa sesión fue creada con una versión más "
+"nueva de %1"
 
 #: session_state.cc:1347
 msgid "Session-Save: Failed to copy MIDI Source '%1' for snapshot"
 msgstr ""
+"Guardar sesión: no se pudo copiar la fuente MIDI '%1' para la instantánea"
 
 #: session_state.cc:1551
 msgid "programming error: Session: incorrect XML node sent to set_state()"
 msgstr ""
+"error de programación: Sesión: nodo XML incorrecto enviado a set_state()"
 
 #: session_state.cc:1621
 msgid "Session: XML state has no options section"
-msgstr ""
+msgstr "Sesión: El estado XML no tiene sección de opciones"
 
 #: session_state.cc:1626
 msgid "Session: XML state has no metadata section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de metadatos"
 
 #: session_state.cc:1637
 msgid "Session: XML state has no sources section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de fuentes"
 
 #: session_state.cc:1644
 msgid "Session: XML state has no Tempo Map section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene una sección de mapa de tempo"
 
 #: session_state.cc:1651
 msgid "Session: XML state has no locations section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de ubicaciones"
 
 #: session_state.cc:1664
 msgid "Session: XML state has no Regions section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de Regiones"
 
 #: session_state.cc:1671
 msgid "Session: XML state has no playlists section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de listas de reproducción"
 
 #: session_state.cc:1691
 msgid "Session: XML state has no bundles section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de paquetes"
 
 #: session_state.cc:1720
 msgid "Session: XML state has no routes section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de rutas"
 
 #: session_state.cc:1738
 msgid "Session: XML state has no route groups section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene una sección de grupos de rutas"
 
 #: session_state.cc:1747
 msgid "Session: XML state has no edit groups section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de grupos de edición"
 
 #: session_state.cc:1754
 msgid "Session: XML state has no mix groups section"
-msgstr ""
+msgstr "Sesión: El estado XML no tiene una sección de grupos mixtos"
 
 #: session_state.cc:1762
 msgid "Session: XML state has no click section"
-msgstr ""
+msgstr "Sesión: el estado XML no tiene sección de clic"
 
 #: session_state.cc:1834
 msgid "Session: cannot create Route from XML description."
-msgstr ""
+msgstr "Sesión: no se puede crear una ruta a partir de una descripción XML."
 
 #: session_state.cc:1838
 msgid "Loaded track/bus %1"
@@ -3041,19 +3236,21 @@ msgstr "Pista/bus %1 cargado"
 
 #: session_state.cc:1843
 msgid "Tracks/busses loaded;  Adding to Session"
-msgstr ""
+msgstr "Vías/autobuses cargados;  Agregar a la sesión"
 
 #: session_state.cc:1847
 msgid "Finished adding tracks/busses"
-msgstr ""
+msgstr "Terminado agregando pistas / autobuses"
 
 #: session_state.cc:1986
 msgid "Could not find diskstream for diskstream-id: '%1', playlist: '%2'"
 msgstr ""
+"No se pudo encontrar diskstream para diskstream-id: '%1', lista de "
+"reproducción: '%2'"
 
 #: session_state.cc:2043
 msgid "Session: cannot create Region from XML description."
-msgstr ""
+msgstr "Sesión: no se puede crear una región a partir de una descripción XML."
 
 #: session_state.cc:2047
 msgid "Can not load state for region '%1'"
@@ -3062,67 +3259,87 @@ msgstr "No se puede cargar el estado de la región '%1'"
 #: session_state.cc:2083
 msgid "Regions in compound description not found (ID's %1 and %2): ignored"
 msgstr ""
+"Regiones en la descripción compuesta no encontradas (ID %1 y %2): ignoradas"
 
 #: session_state.cc:2111
 msgid "Nested source has no ID info in session file! (ignored)"
 msgstr ""
+"¡La fuente anidada no tiene información de identificación en el archivo de "
+"sesión! (ignorado)"
 
 #: session_state.cc:2123
 msgid "Cannot reconstruct nested source for region %1"
-msgstr ""
+msgstr "No se puede reconstruir la fuente anidada para la región %1"
 
 #: session_state.cc:2183
 msgid "Session: XMLNode describing a AudioRegion is incomplete (no source)"
 msgstr ""
+"Sesión: El nodo XML que describe una región de audio está incompleto (sin "
+"fuente)"
 
 #: session_state.cc:2191 session_state.cc:2212 session_state.cc:2232
 msgid ""
 "Session: XMLNode describing a AudioRegion references an unknown source id =%1"
 msgstr ""
+"Sesión: El nodo XML que describe una región de audio hace referencia a una "
+"identificación de fuente desconocida =%1"
 
 #: session_state.cc:2197 session_state.cc:2218 session_state.cc:2238
 msgid ""
-"Session: XMLNode describing a AudioRegion references a non-audio source id ="
-"%1"
+"Session: XMLNode describing a AudioRegion references a non-audio source id "
+"=%1"
 msgstr ""
+"Sesión: XMLNode que describe AudioRegion hace referencia al ID de fuente que "
+"no es de audio =%1"
 
 #: session_state.cc:2261
 msgid ""
 "Session: XMLNode describing an AudioRegion is missing some master sources; "
 "ignored"
 msgstr ""
+"Sesión: Al XMLNode que describe una AudioRegion le faltan algunas fuentes "
+"maestras; ignorado"
 
 #: session_state.cc:2295
 msgid "Session: XMLNode describing a MidiRegion is incomplete (no source)"
 msgstr ""
+"Sesión: XMLNode que describe una Región Midi está incompleto (sin fuente)"
 
 #: session_state.cc:2303
 msgid ""
 "Session: XMLNode describing a MidiRegion references an unknown source id =%1"
 msgstr ""
+"Sesión: XMLNode que describe una Región Midi hace referencia a una "
+"identificación de fuente desconocida =%1"
 
 #: session_state.cc:2309
 msgid ""
 "Session: XMLNode describing a MidiRegion references a non-midi source id =%1"
 msgstr ""
+"Sesión: XMLNode que describe referencias de MidiRegion con ID de fuente no "
+"midi =%1"
 
 #: session_state.cc:2395
 msgid "Session: cannot create Source from XML description."
-msgstr ""
+msgstr "Sesión: no se puede crear la fuente a partir de una descripción XML."
 
 #: session_state.cc:2424
 msgid ""
 "An external MIDI file is missing. %1 cannot currently recover from missing "
 "external MIDI files"
 msgstr ""
+"Falta un archivo MIDI externo. %1 actualmente no puede recuperar archivos "
+"MIDI externos faltantes"
 
 #: session_state.cc:2517
 msgid "Found a sound file that cannot be used by %1. Talk to the programmers."
 msgstr ""
+"Se encontró un archivo de sonido que %1 no puede utilizar. Habla con los "
+"programadores."
 
 #: session_state.cc:2538
 msgid "Could not create templates directory \"%1\" (%2)"
-msgstr ""
+msgstr "No se pudo crear el directorio de plantillas \"%1\" (%2)"
 
 #: session_state.cc:2549
 msgid "Template \"%1\" already exists - new version not created"
@@ -3139,36 +3356,45 @@ msgstr "plantilla no guardada"
 #: session_state.cc:2838
 msgid "Unknown node \"%1\" found in Bundles list from session file"
 msgstr ""
+"Nodo desconocido \"%1\" encontrado en la lista de paquetes del archivo de "
+"sesión"
 
 #: session_state.cc:3320
 msgid "Cannot cleanup peak-files for read-only session."
 msgstr ""
+"No se pueden limpiar los archivos pico para una sesión de solo lectura."
 
 #: session_state.cc:3324
 msgid "Cannot cleanup peak-files while recording"
-msgstr ""
+msgstr "No se pueden limpiar los archivos pico durante la grabación"
 
 #: session_state.cc:3347
 msgid ""
 "Timeout waiting for peak-file creation to terminate before cleanup, please "
 "try again later."
 msgstr ""
+"Se agotó el tiempo de espera para que finalice la creación del archivo pico "
+"antes de la limpieza. Vuelva a intentarlo más tarde."
 
 #: session_state.cc:3616
 msgid "Session: cannot create dead file folder \"%1\" (%2)"
-msgstr ""
+msgstr "Sesión: no se puede crear la carpeta de archivos inactivos \"%1\" (%2)"
 
 #: session_state.cc:3649
 msgid "cannot rename unused file source from %1 to %2 (%3)"
 msgstr ""
+"no se puede cambiar el nombre del origen del archivo no utilizado de %1 a %2 "
+"(%3)"
 
 #: session_state.cc:3665
 msgid "cannot remove peakfile %1 for %2 (%3)"
-msgstr ""
+msgstr "no se puede eliminar el archivo pico %1 para %2 (%3)"
 
 #: session_state.cc:3844
 msgid "could not backup old history file, current history not saved"
 msgstr ""
+"no se pudo hacer una copia de seguridad del archivo de historial antiguo, el "
+"historial actual no se guardó"
 
 #: session_state.cc:3858
 msgid "history could not be saved to %1"
@@ -3176,15 +3402,16 @@ msgstr "No se pudo guardar el historial a %1"
 
 #: session_state.cc:3861
 msgid "Could not remove history file at path \"%1\" (%2)"
-msgstr "Could not remove history file at path \"%1\" (%2)"
+msgstr "No se pudo eliminar el archivo de historial en la ruta \"%1\" (%2)"
 
 #: session_state.cc:3865
 msgid "could not restore history file from backup %1 (%2)"
 msgstr ""
+"no se pudo restaurar el archivo histórico desde la copia de seguridad %1 (%2)"
 
 #: session_state.cc:3890
 msgid "%1: no history file \"%2\" for this session."
-msgstr ""
+msgstr "%1: no hay archivo de historial \"%2\" para esta sesión."
 
 #: session_state.cc:3896
 msgid "Could not understand session history file \"%1\""
@@ -3192,112 +3419,122 @@ msgstr "No se pudo interpretar el archivo de historial de sesión \"%1\"."
 
 #: session_state.cc:3946
 msgid "Failed to downcast MidiSource for NoteDiffCommand"
-msgstr ""
+msgstr "No se pudo abatir MidiSource para NoteDiffCommand"
 
 #: session_state.cc:3957
 msgid "Failed to downcast MidiSource for SysExDiffCommand"
-msgstr ""
+msgstr "No se pudo abatir MidiSource para SysExDiffCommand"
 
 #: session_state.cc:3968
 msgid "Failed to downcast MidiSource for PatchChangeDiffCommand"
-msgstr ""
+msgstr "No se pudo abatir MidiSource para PatchChangeDiffCommand"
 
 #: session_state.cc:3976
 msgid "Couldn't figure out how to make a Command out of a %1 XMLNode."
-msgstr ""
+msgstr "No pude descubrir cómo crear un comando a partir de un %1 XMLNode."
 
 #: session_state.cc:4326
 msgid "Cannot rename read-only session."
-msgstr ""
+msgstr "No se puede cambiar el nombre de la sesión de solo lectura."
 
 #: session_state.cc:4330
 msgid "Cannot rename session while recording"
-msgstr ""
+msgstr "No se puede cambiar el nombre de la sesión durante la grabación"
 
 #: session_state.cc:4415 session_state.cc:4416 session_state.cc:4458
 #: session_state.cc:4462
 msgid "renaming %s as %2 failed (%3)"
-msgstr ""
+msgstr "cambiar el nombre de %s como %2 falló (%3)"
 
 #: session_state.cc:4478 session_state.cc:4479 session_state.cc:4493
 #: session_state.cc:4494
 msgid "renaming %1 as %2 failed (%3)"
-msgstr ""
+msgstr "cambiar el nombre de %1 como %2 falló (%3)"
 
 #: session_state.cc:4870
 msgid "Cannot create new session folder %1"
-msgstr ""
+msgstr "No se puede crear una nueva carpeta de sesión %1"
 
 #: session_state.cc:4932 session_state.cc:5007
 msgid ""
 "\n"
 "copying \"%1\" failed !"
 msgstr ""
+"\n"
+"¡Error al copiar \"%1\"!"
 
 #: session_state.cc:5222
 msgid "unknown reason"
-msgstr ""
+msgstr "razón desconocida"
 
 #: session_time.cc:230
 msgid "Unknown transport state %1 in sync callback"
 msgstr ""
+"Estado de transporte desconocido %1 en devolución de llamada sincronizada"
 
 #: session_transport.cc:172
 msgid "Locate called for negative sample position - ignored"
-msgstr ""
+msgstr "Localización solicitada para posición de muestra negativa - ignorada"
 
 #: session_transport.cc:478
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
 msgstr ""
+"No se puede admitir la velocidad variable global mientras %1 está conectado "
+"al control de transporte JACK"
 
 #: session_transport.cc:987
 msgid "Cannot loop - no loop range defined"
-msgstr "No se puede reproducir en bucle - no se definió un rango de bucle."
+msgstr "No se puede reproducir en bucle - no se definió un rango de bucle"
 
 #: session_transport.cc:1577
 msgid ""
 "Looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
+"No se pueden realizar bucles mientras %1 utiliza el transporte JACK.\n"
+"Recomendamos cambiar las opciones configuradas."
 
 #: slavable.cc:124
 msgid "Master #%1 not found, assignment lost"
-msgstr ""
+msgstr "Maestro #%1 no encontrado, tarea perdida"
 
 #: slavable_automation_control.cc:387 slavable_automation_control.cc:460
 msgid "Merge VCA automation into %1"
-msgstr ""
+msgstr "Fusionar la automatización VCA en %1"
 
 #: smf_source.cc:361
 msgid "Unable to read event prefix, corrupt MIDI ring"
-msgstr ""
+msgstr "No se puede leer el prefijo del evento, anillo MIDI corrupto"
 
 #: smf_source.cc:374
 msgid "Event has time and size but no body, corrupt MIDI ring"
 msgstr ""
+"El evento tiene tiempo y tamaño pero no tiene cuerpo, anillo MIDI corrupto"
 
 #: smf_source.cc:380
 msgid "Event time is before MIDI source position"
-msgstr ""
+msgstr "El tiempo del evento es anterior a la posición de la fuente MIDI"
 
 #: smf_source.cc:428
 msgid ""
 "Skipping event with unordered beat time %1 < %2 (off by %3 beats, %4 ticks)"
 msgstr ""
+"Omitir evento con tiempo de ritmo desordenado %1 < %2 (desviado en %3 "
+"tiempos, %4 ticks)"
 
 #: smf_source.cc:473
 msgid "Skipping event with unordered sample time %1 < %2"
-msgstr ""
+msgstr "Omitir evento con tiempo de muestra desordenado %1 < %2"
 
 #: smf_source.cc:539
 msgid "cannot open MIDI file %1 for write"
-msgstr ""
+msgstr "no se puede abrir el archivo MIDI %1 para escribir"
 
 #: smf_source.cc:573
 msgid "Exception while writing %1, file may be corrupt/unusable"
-msgstr ""
+msgstr "Excepción al escribir %1, el archivo puede estar dañado o inutilizable"
 
 #: sndfile_helpers.cc:35
 msgid "WAV"
@@ -3313,15 +3550,15 @@ msgstr "CAF"
 
 #: sndfile_helpers.cc:38
 msgid "W64 (64-bit WAV)"
-msgstr ""
+msgstr "W64 (64-bit WAV)"
 
 #: sndfile_helpers.cc:39
 msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
 
 #: sndfile_helpers.cc:40
 msgid "Ogg/Vorbis"
-msgstr ""
+msgstr "Ogg/Vorbis"
 
 #: sndfile_helpers.cc:41
 msgid "raw (no header)"
@@ -3349,7 +3586,7 @@ msgstr ".flac"
 
 #: sndfile_helpers.cc:51
 msgid ".ogg"
-msgstr ""
+msgstr ".ogg"
 
 #: sndfile_helpers.cc:52
 msgid ".raw"
@@ -3357,23 +3594,23 @@ msgstr ".raw"
 
 #: sndfile_helpers.cc:67
 msgid "Signed 16-bit PCM"
-msgstr ""
+msgstr "Signed 16-bit PCM"
 
 #: sndfile_helpers.cc:68
 msgid "Signed 24-bit PCM"
-msgstr ""
+msgstr "Signed 24-bit PCM"
 
 #: sndfile_helpers.cc:69
 msgid "Signed 32-bit PCM"
-msgstr ""
+msgstr "Signed 32-bit PCM"
 
 #: sndfile_helpers.cc:70
 msgid "Signed 8-bit PCM"
-msgstr ""
+msgstr "Signed 8-bit PCM"
 
 #: sndfile_helpers.cc:71
 msgid "32-bit float"
-msgstr ""
+msgstr "32-bit float"
 
 #: sndfile_helpers.cc:84
 msgid "Little-endian (Intel)"
@@ -3385,44 +3622,51 @@ msgstr "Big-endian (PowerPC)"
 
 #: sndfilesource.cc:274
 msgid "Cannot set flac compression level: %1"
-msgstr ""
+msgstr "No se puede establecer el nivel de compresión flac: %1"
 
 #: sndfilesource.cc:359
 msgid "SndFileSource: cannot open file \"%1\" for %2"
-msgstr ""
+msgstr "SndFileSource: no se puede abrir el archivo \"%1\" para %2"
 
 #: sndfilesource.cc:377
 msgid ""
 "SndFileSource: file only contains %1 channels; %2 is invalid as a channel "
 "number"
 msgstr ""
+"SndFileSource: el archivo solo contiene %1 canales; %2 no es válido como "
+"número de canal"
 
 #: sndfilesource.cc:392
 msgid "Cannot mark RF64 audio file for automatic downgrade to WAV: %1"
 msgstr ""
+"No se puede marcar el archivo de audio RF64 para la degradación automática a "
+"WAV: %1"
 
 #: sndfilesource.cc:444 sndfilesource.cc:692
 msgid ""
 "cannot set broadcast info for audio file %1 (%2); dropping broadcast info "
 "for this file"
 msgstr ""
+"no se puede configurar la información de transmisión para el archivo de "
+"audio %1 (%2); soltando información de transmisión para este archivo"
 
 #: sndfilesource.cc:486
 msgid "could not open file %1 for reading."
-msgstr ""
+msgstr "No se pudo abrir el archivo %1 para leerlo."
 
 #: sndfilesource.cc:521
 msgid "SndFileSource: could not seek to sample %1 within %2 (%3)"
-msgstr ""
+msgstr "SndFileSource: no se pudo buscar la muestra de %1 dentro de %2 (%3)"
 
 #: sndfilesource.cc:530
 msgid ""
 "SndFileSource: @ %1 could not read %2 within %3 (%4) (len = %5, ret was %6)"
 msgstr ""
+"SndFileSource: @ %1 no pudo leer %2 dentro de %3 (%4) (len = %5, ret fue %6)"
 
 #: sndfilesource.cc:580
 msgid "attempt to write a non-writable audio file source (%1)"
-msgstr ""
+msgstr "intento de escribir una fuente de archivo de audio no grabable (%1)"
 
 #: sndfilesource.cc:585 utils.cc:517 utils.cc:545
 msgid "programming error: %1 %2"
@@ -3430,205 +3674,229 @@ msgstr "error de programación: %1 %2"
 
 #: sndfilesource.cc:623 sndfilesource.cc:641
 msgid "attempt to flush a non-writable audio file source (%1)"
-msgstr ""
+msgstr "intento de vaciar una fuente de archivo de audio no grabable (%1)"
 
 #: sndfilesource.cc:628
 msgid "could not allocate file %1 to write header"
-msgstr ""
+msgstr "No se pudo asignar el archivo %1 para escribir el encabezado."
 
 #: sndfilesource.cc:646
 msgid "could not allocate file %1 to flush contents"
-msgstr ""
+msgstr "No se pudo asignar el archivo %1 para vaciar el contenido."
 
 #: sndfilesource.cc:658
 msgid ""
 "attempt to store broadcast info in a non-writable audio file source (%1)"
 msgstr ""
+"intento de almacenar información de transmisión en una fuente de archivo de "
+"audio no grabable (%1)"
 
 #: sndfilesource.cc:663
 msgid "attempt to set BWF info for an un-opened audio file source (%1)"
 msgstr ""
+"intento de configurar información BWF para una fuente de archivo de audio no "
+"abierta (%1)"
 
 #: sndfilesource.cc:710
 msgid "%1: cannot seek to %2 (libsndfile error: %3)"
-msgstr ""
+msgstr "%1: no se puede buscar %2 (error de libsndfile: %3)"
 
 #: sndfilesource.cc:747
 msgid "SndFileSource: cannot open file \"%1\" for reading"
-msgstr ""
+msgstr "SndFileSource: no se puede abrir el archivo \"%1\" para leerlo"
 
 #: solo_control.cc:198
 msgid "Cleared Explicit solo: %1\n"
-msgstr ""
+msgstr "Solo explícito superado: %1\n"
 
 #: solo_control.cc:204
 msgid "Cleared upstream solo: %1 up:%2\n"
-msgstr ""
+msgstr "Solo ascendente superado: %1 arriba:%2\n"
 
 #: solo_control.cc:211
 msgid "Cleared downstream solo: %1 down:%2\n"
-msgstr ""
+msgstr "Solo descendente despejado: %1 abajo:%2\n"
 
 #: soundcloud_upload.cc:128
 msgid ""
 "Upload to Soundcloud failed.  Perhaps your email or password are incorrect?\n"
 msgstr ""
+"Error al subir a Soundcloud.  ¿Quizás tu correo electrónico o contraseña son "
+"incorrectos?\n"
 
 #: source_factory.cc:376
 msgid "Recovery attempted on a MIDI file - not implemented"
-msgstr ""
+msgstr "Recuperación intentada en un archivo MIDI - no implementada"
 
 #: speakers.cc:275
 msgid "Speaker information is missing - speaker ignored"
-msgstr ""
+msgstr "Falta información del orador: se ignora al orador"
 
 #: srcfilesource.cc:141
 msgid "SrcFileSource: %1"
-msgstr ""
+msgstr "SrcFileSource: %1"
 
 #: template_utils.cc:117 template_utils.cc:172
 msgid "(unknown)"
-msgstr ""
+msgstr "(desconocido)"
 
 #: template_utils.cc:127 template_utils.cc:182
 msgid "No Description"
-msgstr ""
+msgstr "Sin descripción"
 
 #: tempo.cc:143
 msgid "TempoSection XML node has no \"movable\" property"
-msgstr ""
+msgstr "El nodo XML TempoSection no tiene ninguna propiedad \"móvil\""
 
 #: tempo.cc:178
 msgid "Legacy session detected. TempoSection XML node will be altered."
-msgstr ""
+msgstr "Sesión heredada detectada. Se modificará el nodo XML TempoSection."
 
 #: tempo.cc:187
 msgid "TempoSection XML node has an illegal \"beats_per_minute\" value"
-msgstr ""
+msgstr "El nodo XML TempoSection tiene un valor \"beats_per_minuto\" ilegal"
 
 #: tempo.cc:194
 msgid "TempoSection XML node has an illegal \"note-type\" value"
-msgstr ""
+msgstr "El nodo XML TempoSection tiene un valor de \"tipo de nota\" ilegal"
 
 #: tempo.cc:208
 msgid "TempoSection XML node has an illegal \"end-beats-per-minute\" value"
 msgstr ""
+"El nodo XML TempoSection tiene un valor ilegal de \"tiempos finales por "
+"minuto\""
 
 #: tempo.cc:228
 msgid "TempoSection XML node has no \"active\" property"
-msgstr ""
+msgstr "El nodo XML TempoSection no tiene ninguna propiedad \"activa\""
 
 #: tempo.cc:567
 msgid "Legacy session detected - MeterSection XML node will be altered."
 msgstr ""
+"Se detectó una sesión heredada: se modificará el nodo XML MeterSection."
 
 #: tempo.cc:570
 msgid "MeterSection XML node has an illegal \"start\" value"
-msgstr ""
+msgstr "El nodo XML MeterSection tiene un valor de \"inicio\" ilegal"
 
 #: tempo.cc:580
 msgid "MeterSection XML node has an illegal \"bbt\" value"
-msgstr ""
+msgstr "El nodo XML MeterSection tiene un valor \"bbt\" ilegal"
 
 #: tempo.cc:584
 msgid "MeterSection XML node has no \"bbt\" property"
-msgstr ""
+msgstr "El nodo XML MeterSection no tiene la propiedad \"bbt\""
 
 #: tempo.cc:593
 msgid ""
 "MeterSection XML node has no \"beats-per-bar\" or \"divisions-per-bar\" "
 "property"
 msgstr ""
+"El nodo XML MeterSection no tiene ninguna propiedad de \"tiempos por "
+"compás\" o \"divisiones por compás\""
 
 #: tempo.cc:599
 msgid "MeterSection XML node has an illegal \"divisions-per-bar\" value"
 msgstr ""
+"El nodo XML MeterSection tiene un valor ilegal de \"divisiones por barra\""
 
 #: tempo.cc:604
 msgid "MeterSection XML node has no \"note-type\" property"
-msgstr ""
+msgstr "El nodo XML MeterSection no tiene propiedad de \"tipo de nota\""
 
 #: tempo.cc:609
 msgid "MeterSection XML node has an illegal \"note-type\" value"
-msgstr ""
+msgstr "El nodo XML MeterSection tiene un valor de \"tipo de nota\" ilegal"
 
 #: tempo.cc:908
 msgid ""
 "Meter changes can only be positioned on the first beat of a bar. Moving from "
 "%1 to %2"
 msgstr ""
+"Los cambios de compás sólo se pueden realizar en el primer tiempo de un "
+"compás. Pasando de %1 a %2"
 
 #: tempo.cc:1298
 msgid "no tempo sections defined in tempo map - cannot change tempo @ %1"
 msgstr ""
+"no hay secciones de tempo definidas en el mapa de tempo; no se puede cambiar "
+"el tempo @ %1"
 
 #: tempo.cc:1328
 msgid "programming error: no meter section in tempo map!"
-msgstr ""
+msgstr "Error de programación: ¡no hay sección de compás en el mapa de tempo!"
 
 #: tempo.cc:1346 tempo.cc:1369 tempo.cc:1390
 msgid "programming error: no tempo section in tempo map!"
-msgstr ""
+msgstr "Error de programación: ¡no hay sección de tempo en el mapa de tempo!"
 
 #: tempo.cc:2260
 msgid "tempo map was asked for BBT time at sample %1\n"
-msgstr ""
+msgstr "Se solicitó el mapa de tempo para el tiempo BBT en la muestra %1\n"
 
 #: tempo.cc:2368
 msgid "tempo map asked for sample time at bar < 1  (%1)\n"
-msgstr ""
+msgstr "mapa de tempo solicitó tiempo de muestra en el compás < 1 (%1)\n"
 
 #: tempo.cc:4639 tempo.cc:4653
 msgid "Tempo map: could not set new state, restoring old one."
 msgstr ""
+"Mapa de tempo: no se pudo establecer un nuevo estado, restaurando el "
+"anterior."
 
 #: tempo.cc:4695 tempo.cc:4696
 msgid "Multiple meter definitions found at %1"
-msgstr ""
+msgstr "Se encontraron múltiples definiciones de medidor en %1"
 
 #: tempo.cc:4701 tempo.cc:4702
 msgid "Multiple tempo definitions found at %1"
-msgstr ""
+msgstr "Se encontraron múltiples definiciones de tempo en %1"
 
 #: tempo_map_importer.cc:52
 msgid "Tempo map"
-msgstr ""
+msgstr "Mapa de tempo"
 
 #: tempo_map_importer.cc:60
 msgid "Tempo Map"
-msgstr ""
+msgstr "Mapa de Tempo"
 
 #: tempo_map_importer.cc:80
 msgid "Tempo marks: "
-msgstr ""
+msgstr "Marcas de tempo:"
 
 #: tempo_map_importer.cc:80
 msgid ""
 "\n"
 "Meter marks: "
 msgstr ""
+"\n"
+"Marcas del Medidor:"
 
 #: tempo_map_importer.cc:89
 msgid ""
 "This will replace the current tempo map!\n"
 "Are you sure you want to do this?"
 msgstr ""
+"¡Esto reemplazará el mapa de tempo actual!\n"
+"¿Estás seguro de que quieres hacer esto?"
 
 #: track.cc:630
 msgid "DiskIOProcessor: \"%1\" isn't an playlist"
-msgstr ""
+msgstr "DiskIOProcessor: \"%1\" no es una lista de reproducción"
 
 #: track.cc:677
 msgid "DiskIOProcessor %1: there is no existing playlist to make a copy of!"
 msgstr ""
+"DiskIOProcessor %1: ¡no existe ninguna lista de reproducción para hacer una "
+"copia!"
 
 #: track.cc:946
 msgid "%1: could not create region for complete midi file"
-msgstr ""
+msgstr "%1: no se pudo crear una región para el archivo midi completo"
 
 #: track.cc:993
 msgid "MidiDiskstream: could not create region for captured midi!"
-msgstr ""
+msgstr "MidiDiskstream: ¡no se pudo crear una región para el midi capturado!"
 
 #: track.cc:1046
 msgid "%1: could not create region for complete audio file"
@@ -3640,88 +3908,88 @@ msgstr "AudioDiskstream: ¡No se pudo crear región para el audio capturado!"
 
 #: transport_master.cc:392 transport_master.cc:393
 msgid "Construction of transport master object of type %1 failed"
-msgstr ""
+msgstr "Error en la construcción del objeto maestro de transporte de tipo %1"
 
 #: transport_master.cc:417 transport_master.cc:450
 msgid "SyncSource|JACK"
-msgstr ""
+msgstr "JACK"
 
 #: transport_master.cc:424
 msgid "SyncSource|MTC"
-msgstr ""
+msgstr "MTC"
 
 #: transport_master.cc:434
 msgid "SyncSource|M-Clk"
-msgstr ""
+msgstr "M-Clk"
 
 #: transport_master.cc:444
 msgid "SyncSource|LTC"
-msgstr ""
+msgstr "LTC"
 
 #: transport_master.cc:487
 msgid "All"
-msgstr ""
+msgstr "Todos"
 
 #: transport_master.cc:491
 msgid "Start/Stop"
-msgstr ""
+msgstr "Iniciar/Parar"
 
 #: transport_master.cc:493
 msgid "Speed"
-msgstr ""
+msgstr "Velocidad"
 
 #: transport_master.cc:495
 msgid "Locate"
-msgstr ""
+msgstr "Localizar"
 
 #: transport_master.cc:497
 msgid "Complex"
-msgstr ""
+msgstr "Complejo"
 
 #: transport_master_manager.cc:136
 msgid "programming error:%1"
-msgstr ""
+msgstr "error de programación:%1"
 
 #: transport_master_manager.cc:347
 msgid "Transport master adjusted framerate from %1 to %2."
-msgstr ""
+msgstr "El maestro de transporte ajustó la velocidad de fotogramas de %1 a %2."
 
 #: transport_master_manager.cc:396
 msgid "There is already a transport master named \"%1\" - not duplicated"
-msgstr ""
+msgstr "Ya existe un maestro de transporte llamado \"%1\" (no duplicado)"
 
 #: transport_master_manager.cc:713
 msgid "Cannot initialize transport master manager"
-msgstr ""
+msgstr "No se puede inicializar el administrador maestro de transporte"
 
 #: unknown_processor.cc:87
 msgid "Using plugin-stub with unknown i/o configuration for: "
-msgstr ""
+msgstr "Usando plugin-stub con configuración de E/S desconocida para:"
 
 #: unknown_processor.cc:108
 msgid "Using plugin-stub with mismatching i/o configuration for: "
-msgstr ""
+msgstr "Usando plugin-stub con una configuración de E/S que no coincide para:"
 
 #: user_bundle.cc:48
 msgid "Node for Bundle has no \"name\" property"
-msgstr ""
+msgstr "El nodo para paquete no tiene propiedad \"nombre\""
 
 #: user_bundle.cc:60 user_bundle.cc:81
 #, c-format
 msgid "Unknown node \"%s\" in Bundle"
-msgstr ""
+msgstr "Nodo desconocido \"%s\" en paquete"
 
 #: user_bundle.cc:65
 msgid "Node for Channel has no \"name\" property"
-msgstr ""
+msgstr "El nodo del canal no tiene propiedad \"nombre\""
 
 #: user_bundle.cc:71
 msgid "Node for Channel has no \"type\" property"
-msgstr ""
+msgstr "El nodo para canal no tiene propiedad de \"tipo\""
 
 #: user_bundle.cc:86
 msgid "Node for Port has no \"name\" property"
-msgstr ""
+msgstr "El nodo para Puerto no tiene propiedad \"nombre\""
 
 #: utils.cc:419 utils.cc:448
 msgid "Splice"
@@ -3733,7 +4001,7 @@ msgstr "Deslizar"
 
 #: utils.cc:423 utils.cc:444
 msgid "Ripple"
-msgstr ""
+msgstr "Rizado"
 
 #: utils.cc:425 utils.cc:441
 msgid "Lock"
@@ -3741,32 +4009,32 @@ msgstr "Bloquear"
 
 #: utils.cc:428
 msgid "programming error: unknown edit mode string \"%1\""
-msgstr ""
+msgstr "error de programación: cadena de modo de edición desconocida \"%1\""
 
 #: utils.cc:584
 msgid "programming error: unknown native header format: %1"
-msgstr ""
+msgstr "error de programación: formato de encabezado nativo desconocido: %1"
 
 #: utils.cc:599
 msgid "cannot open directory %1 (%2)"
-msgstr ""
+msgstr "no se puede abrir el directorio %1 (%2)"
 
 #: vca.cc:44
 #, c-format
 msgid "VCA %n"
-msgstr ""
+msgstr "VCA %n"
 
 #: vca.cc:116
 msgid "VCA %1 : %2"
-msgstr ""
+msgstr "VCA %1 : %2"
 
 #: vca.cc:217
 msgid "Master assignment ignored to prevent recursion"
-msgstr ""
+msgstr "Asignación maestra ignorada para evitar la recursividad"
 
 #: vca_manager.cc:206
 msgid "Cannot set state of a VCA"
-msgstr ""
+msgstr "No se puede establecer el estado de un VCA"
 
 #~ msgid "programmer error: %1"
 #~ msgstr "error de programador: %1"
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index ebbf028bda..7c8f7f3f86 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -70,7 +70,7 @@ RCConfiguration::RCConfiguration ()
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 	_control_protocol_state (0)
@@ -84,7 +84,7 @@ RCConfiguration::RCConfiguration ()
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var)));
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -243,7 +243,7 @@ RCConfiguration::get_variables (std::string const & node_name) const
 	var.add_to_node (*node);
 #define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
 	var.add_to_node (*node);
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -299,7 +299,7 @@ RCConfiguration::set_variables (const XMLNode& node)
     ParameterChanged (name);                                 \
   }
 
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -311,7 +311,7 @@ RCConfiguration::map_parameters (std::function<void (std::string)>& functor)
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(type,var,name,value)                 functor (name);
 #define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name);
-#include "ardour/rc_configuration_vars.h"
+#include "ardour/rc_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 }
diff --git a/libs/ardour/region_fx_plugin.cc b/libs/ardour/region_fx_plugin.cc
index c67729917a..984c9e7c5b 100644
--- a/libs/ardour/region_fx_plugin.cc
+++ b/libs/ardour/region_fx_plugin.cc
@@ -300,7 +300,11 @@ RegionFxPlugin::set_state (const XMLNode& node, int version)
 	node.get_property ("count", count);
 
 	if (_plugins.empty()) {
-		std::shared_ptr<Plugin> plugin = find_and_load_plugin (_session, node, type, unique_id, any_vst);
+		std::shared_ptr<Plugin> plugin;
+
+		if (!_session.get_disable_all_loaded_plugins ()) {
+			plugin = find_and_load_plugin (_session, node, type, unique_id, any_vst);
+		}
 
 		if (!plugin) {
 			delete _state;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 5808cfc707..bab931b366 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -358,6 +358,7 @@ Session::Session (AudioEngine &eng,
 	, _no_file_format_reset (0)
 	, _virtual_soundcheck (true)
 	, _no_livetrax_auto_connect (0)
+	, _global_quantization (Config->get_default_quantization())
 {
 	_suspend_save.store (0);
 	_playback_load.store (0);
@@ -6598,6 +6599,10 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
 		time (&now);
 		xnow = localtime (&now);
 
+		/* XXX we may want to round this up to the next beat or bar */
+
+		const timecnt_t duration (end - start);
+
 		for (vector<std::shared_ptr<Source> >::iterator src=srcs.begin(); src != srcs.end(); ++src) {
 			std::shared_ptr<AudioFileSource> afs = std::dynamic_pointer_cast<AudioFileSource>(*src);
 			std::shared_ptr<MidiSource> ms;
@@ -6609,9 +6614,9 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
 				plist.add (Properties::start, timepos_t (0));
 			} else if ((ms = std::dynamic_pointer_cast<MidiSource>(*src))) {
 				Source::WriterLock lock (ms->mutex());
-				ms->mark_streaming_write_completed(lock);
+				ms->mark_streaming_write_completed (lock, duration);
 				plist.add (Properties::start, timepos_t (Beats()));
-		}
+			}
 		}
 
 		/* construct a whole-file region to represent the bounced material */
diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 8d908dc927..4222975f22 100644
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -50,7 +50,7 @@ SessionConfiguration::SessionConfiguration ()
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 	foo (0) // needed because above macros end in a comma
@@ -62,7 +62,7 @@ SessionConfiguration::SessionConfiguration ()
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var)));
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -97,7 +97,7 @@ SessionConfiguration::get_variables (std::string const & node_name) const
 	var.add_to_node (*node);
 #define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
 	var.add_to_node (*node);
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -136,7 +136,7 @@ SessionConfiguration::set_variables (const XMLNode& node)
     ParameterChanged (name);                                 \
   }
 
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
@@ -148,7 +148,7 @@ SessionConfiguration::map_parameters (std::function<void (std::string)>& functor
 #undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(type,var,name,value)                 functor (name);
 #define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name);
-#include "ardour/session_configuration_vars.h"
+#include "ardour/session_configuration_vars.inc.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 }
diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 06c2228f23..22694c9a2d 100644
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -230,7 +230,7 @@ SessionEventManager::merge_event (SessionEvent* ev)
 
 	/* try to handle immediate events right here */
 
-	if (ev->type == SessionEvent::Locate || ev->type == SessionEvent::LocateRoll) {
+	if (ev->type == SessionEvent::Locate || ev->type == SessionEvent::LocateRoll || ev->type == SessionEvent::EndRoll) {
 		/* remove any existing Locates that are waiting to execute */
 		_clear_event_type (ev->type);
 	}
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 8650031a94..35c20c8ecb 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2712,14 +2712,14 @@ Session::get_sources_as_xml ()
 }
 
 void
-Session::reset_write_sources (bool mark_write_complete, bool force)
+Session::reset_write_sources (bool mark_write_complete)
 {
 	std::shared_ptr<RouteList const> rl = routes.reader();
 	for (auto const& i : *rl) {
 		std::shared_ptr<Track> tr = std::dynamic_pointer_cast<Track> (i);
 		if (tr) {
 			_state_of_the_state = StateOfTheState (_state_of_the_state | InCleanup);
-			tr->reset_write_sources(mark_write_complete, force);
+			tr->reset_write_sources (mark_write_complete);
 			_state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup);
 		}
 	}
@@ -5467,7 +5467,7 @@ Session::save_as (SaveAs& saveas)
 
 			/* ensure that all existing tracks reset their current capture source paths
 			 */
-			reset_write_sources (true, true);
+			reset_write_sources (true);
 
 			/* creating new write sources marks the session as
 			   dirty. If the new session is empty, then
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index caef600f8d..315d8f48c8 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -899,8 +899,27 @@ Session::request_stop (bool abort, bool clear_state, TransportRequestSource orig
 		solo_selection ( _soloSelection, false );
 	}
 
-	SessionEvent* ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, SessionEvent::Immediate, audible_sample(), 0.0, abort, clear_state);
-	DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_sample(), _transport_sample));
+	SessionEvent *ev;
+
+	if (Config->get_stop_on_grid() && _global_quantization.type == AnyTime::BBT_Offset && _transport_sample != 0) {
+		/* XXX for now this only does anything if we are quantized to
+		 * Beats. Other quantization settings require moving
+		 * Editor::snap_to() code into libardour, which is not in-scope
+		 * at the time this work is occuring.
+		 */
+
+		TempoMap::SharedPtr tmap (TempoMap::use());
+		BBT_Argument now = tmap->bbt_at (timepos_t (_transport_sample));
+		BBT_Argument rounded = tmap->round_up_to_bar (now);
+		samplepos_t samples = tmap->sample_at (rounded);
+
+		ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, samples, samples, 0.0, abort, clear_state);
+		DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop @ %4 snapped to %1 => %2 => %3\n", samples, now, rounded, _transport_sample));
+	} else {
+		ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, SessionEvent::Immediate, audible_sample(), 0.0, abort, clear_state);
+		DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_sample(), _transport_sample));
+	}
+
 	queue_event (ev);
 }
 
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index e5eeea6b88..a5d8ddabda 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -461,16 +461,29 @@ SMFSource::write_unlocked (const WriterLock&            lock,
 void
 SMFSource::update_length (timepos_t const & dur)
 {
+	/* no time domain switching here */
+
 	assert (!_length || (_length.time_domain() == dur.time_domain()));
+
+	if (_model) {
+		_model->set_duration (dur.beats());
+	}
+
 	_length = dur;
 }
 
+Temporal::Beats
+SMFSource::duration() const
+{
+	return _length.beats ();
+}
+
 /** Append an event with a timestamp in beats */
 void
 SMFSource::append_event_beats (const WriterLock&   lock,
                                const Evoral::Event<Temporal::Beats>& ev)
 {
-	if (!_writing || ev.size() == 0)  {
+	if (!_writing || ev.size() == 0 || ev.is_realtime())  {
 		return;
 	}
 
@@ -516,7 +529,7 @@ SMFSource::append_event_beats (const WriterLock&   lock,
 	const Temporal::Beats delta_time_beats = time - _last_ev_time_beats;
 	const uint32_t      delta_time_ticks = delta_time_beats.to_ticks(ppqn());
 
-	Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id);
+	Evoral::SMF::append_event_delta (delta_time_ticks, ev.size(), ev.buffer(), event_id);
 	_last_ev_time_beats = time;
 	_flags = Source::Flag (_flags & ~Empty);
 	_flags = Source::Flag (_flags & ~Missing);
@@ -528,7 +541,7 @@ SMFSource::append_event_samples (const WriterLock& lock,
                                 const Evoral::Event<samplepos_t>&  ev,
                                 samplepos_t                        position)
 {
-	if (!_writing || ev.size() == 0)  {
+	if (!_writing || ev.size() == 0 || ev.is_realtime())  {
 		return;
 	}
 
@@ -622,15 +635,15 @@ SMFSource::mark_streaming_midi_write_started (const WriterLock& lock, NoteMode m
 }
 
 void
-SMFSource::mark_streaming_write_completed (const WriterLock& lock)
+SMFSource::mark_streaming_write_completed (const WriterLock& lm, Temporal::timecnt_t const & duration)
 {
-	mark_midi_streaming_write_completed (lock, Evoral::Sequence<Temporal::Beats>::DeleteStuckNotes);
+	mark_midi_streaming_write_completed (lm, Evoral::Sequence<Temporal::Beats>::DeleteStuckNotes, duration);
 }
 
 void
-SMFSource::mark_midi_streaming_write_completed (const WriterLock& lm, Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_notes_option, Temporal::Beats when)
+SMFSource::mark_midi_streaming_write_completed (const WriterLock& lm, Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_notes_option, Temporal::timecnt_t const & duration)
 {
-	MidiSource::mark_midi_streaming_write_completed (lm, stuck_notes_option, when);
+	MidiSource::mark_midi_streaming_write_completed (lm, stuck_notes_option, duration);
 
 	if (!writable()) {
 		warning << string_compose ("attempt to write to unwritable SMF file %1", _path) << endmsg;
@@ -638,10 +651,11 @@ SMFSource::mark_midi_streaming_write_completed (const WriterLock& lm, Evoral::Se
 	}
 
 	if (_model) {
-		_model->set_edited(false);
+		_model->set_edited (false);
 	}
 
 	try {
+		update_length (timepos_t (duration.beats()));
 		Evoral::SMF::end_write (_path);
 	} catch (std::exception & e) {
 		error << string_compose (_("Exception while writing %1, file may be corrupt/unusable"), _path) << endmsg;
@@ -738,7 +752,11 @@ SMFSource::load_model_unlocked (bool force_reload)
 	std::list< std::pair< Evoral::Event<Temporal::Beats>*, gint > > eventlist;
 
 	for (unsigned i = 1; i <= num_tracks(); ++i) {
-		if (seek_to_track(i)) continue;
+		if (seek_to_track(i)) {
+			continue;
+		}
+
+		std::cerr << "Now loading track " << i << std::endl;
 
 		time = 0;
 		have_event_id = false;
@@ -821,7 +839,14 @@ SMFSource::load_model_unlocked (bool force_reload)
 		delete it->first;
 	}
 
-        // cerr << "----SMF-SRC-----\n";
+	/* Length ought to be based on data in the file (TrkEnd meta-event, not
+	   the final true event.
+	*/
+
+	_length = file_duration();
+	_model->set_duration (_length.beats());
+
+	// cerr << "----SMF-SRC-----\n";
         // _playback_buf->dump (cerr);
         // cerr << "----------------\n";
 
diff --git a/libs/ardour/test/test_ui.cc b/libs/ardour/test/test_ui.cc
index 867eafba7d..bc1406f016 100644
--- a/libs/ardour/test/test_ui.cc
+++ b/libs/ardour/test/test_ui.cc
@@ -25,7 +25,7 @@
 #include "ardour/session_event.h"
 #include "ardour/rc_configuration.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 using namespace ARDOUR;
 
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 3a26d38505..a4fd955624 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -592,9 +592,9 @@ Track::steal_write_source_name()
 }
 
 void
-Track::reset_write_sources (bool r, bool force)
+Track::reset_write_sources (bool mark_write_complete)
 {
-	_disk_writer->reset_write_sources (r, force);
+	_disk_writer->reset_write_sources (mark_write_complete);
 }
 
 float
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 276fe1acf4..403d5c90aa 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -97,6 +97,7 @@ namespace ARDOUR {
 		PBD::PropertyDescriptor<bool> patch_change;  /* only to transmit updates, not storage */
 		PBD::PropertyDescriptor<bool> channel_map;  /* only to transmit updates, not storage */
 		PBD::PropertyDescriptor<bool> used_channels;  /* only to transmit updates, not storage */
+		PBD::PropertyDescriptor<bool> region;  /* only to transmit updates, not storage */
 	}
 }
 
@@ -126,6 +127,7 @@ TriggerBox::all_trigger_props()
 	all.add(Properties::patch_change);
 	all.add(Properties::channel_map);
 	all.add(Properties::used_channels);
+	all.add(Properties::region);
 
 	return all;
 }
@@ -290,17 +292,32 @@ Trigger::request_trigger_delete (Trigger* t)
 void
 Trigger::arm ()
 {
-#warning paul need channel count here, somehow
-	_box.arm_from_another_thread (*this, _box.session().transport_sample(), 2);
+	if (_box.record_enabled() == Recording) {
+		return;
+	}
+
+	/* trigger arming is mutually exclusive within a given TriggerBox */
+
+	_box.disarm_all ();
+
+	Track* trk = static_cast<Track*> (_box.owner());
+	int chns;
+
+	if (trk->data_type() == DataType::AUDIO) {
+		chns = dynamic_cast<AudioTrack*> (trk)->input()->n_ports().n_audio();
+	} else {
+		chns = 0;
+	}
+
+	_box.arm_from_another_thread (*this, _box.session().transport_sample(), chns);
 	_armed = true;
 	ArmChanged(); /* EMIT SIGNAL */
-	TriggerArmChanged (this);
+	TriggerArmChanged (this); /* EMIT SIGNAL */
 }
 
 void
 Trigger::disarm ()
 {
-	_box.disarm ();
 	_armed = false;
 	ArmChanged(); /* EMIT SIGNAL */
 	TriggerArmChanged (this);
@@ -1952,10 +1969,12 @@ AudioTrigger::captured (SlotArmInfo& ai, BufferSet&)
 	delete &ai; // XXX delete is not RT-safe
 
 	_box.queue_explict (index());
-	TriggerBox::worker->request_build_source (this);
+
+	TriggerBox::worker->request_build_source (this, timecnt_t (data.length));
 
 	_armed = false;
 	ArmChanged(); /* EMIT SIGNAL */
+	TriggerArmChanged (this);
 }
 
 int
@@ -2437,8 +2456,11 @@ MIDITrigger::captured (SlotArmInfo& ai, BufferSet& bufs)
 
 	old_rt_midibuffer = rt_midibuffer.exchange (ai.midi_buf);
 
+	Temporal::TempoMap::SharedPtr tmap (Temporal::TempoMap::use());
+	timecnt_t dur = tmap->convert_duration (timecnt_t (ai.captured), timepos_t (ai.start_samples), Temporal::BeatTime);
+
 	loop_start = Temporal::Beats();
-	loop_end = (*ai.midi_buf)[ai.midi_buf->size()-1].timestamp;
+	loop_end = dur.beats();
 	data_length = loop_end;
 	_follow_length = Temporal::BBT_Offset (0, data_length.get_beats(), 0);
 	set_length (timecnt_t (data_length));
@@ -2455,10 +2477,13 @@ MIDITrigger::captured (SlotArmInfo& ai, BufferSet& bufs)
 	_box.queue_explict (index());
 
 	/* Meanwhile, build a new source and region from the data now in rt_midibuffer */
-	TriggerBox::worker->request_build_source (this);
+
+	// std::cerr << "capture done, ask for a source of length " << loop_end.str() << std::endl;
+	TriggerBox::worker->request_build_source (this, timecnt_t (loop_end));
 
 	_armed = false;
 	ArmChanged(); /* EMIT SIGNAL */
+	TriggerArmChanged (this);
 }
 
 void
@@ -2950,10 +2975,7 @@ MIDITrigger::set_region_in_worker_thread_from_capture (std::shared_ptr<Region> r
 
 	DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 loaded midi region, span is %2\n", name(), data_length));
 
-	/* This is being used as a kind of shorthand for "everything" which is
-	   pretty stupid
-	*/
-	send_property_change (ARDOUR::Properties::name);
+	send_property_change (ARDOUR::Properties::region);
 
 	return 0;
 }
@@ -3423,6 +3445,7 @@ SlotArmInfo::SlotArmInfo (Trigger& s)
 	: slot (s)
 	, start_samples (0)
 	, end_samples (0)
+	, captured (0)
 	, midi_buf (nullptr)
 	, stretcher (nullptr)
 {
@@ -3559,11 +3582,9 @@ TriggerBox::arm_from_another_thread (Trigger& slot, samplepos_t now, uint32_t ch
 	ai->start_samples = t_samples;
 	ai->start_beats = t_beats;
 
-	if (_data_type == DataType::AUDIO) {
-		ai->captured = timecnt_t (timepos_t (0), timepos_t (0));
-	} else {
-		ai->captured = timecnt_t::from_ticks (0, timepos_t (Beats()));
-	}
+	// std::cerr << "Will start at " << t_beats.str() << std::endl;
+
+	ai->captured = 0;
 
 	_arm_info = ai;
 }
@@ -3571,6 +3592,16 @@ TriggerBox::arm_from_another_thread (Trigger& slot, samplepos_t now, uint32_t ch
 void
 TriggerBox::disarm ()
 {
+	delete _arm_info;
+	_arm_info = nullptr;
+}
+
+void
+TriggerBox::disarm_all ()
+{
+	for (auto & t : all_triggers) {
+		t->disarm ();
+	}
 }
 
 void
@@ -3578,8 +3609,13 @@ TriggerBox::finish_recording (BufferSet& bufs)
 {
 	SlotArmInfo* ai = _arm_info.load();
 	assert (ai);
+
+	/* This transfers responsibility for the SlotArmInfo object to the
+	   trigger
+	*/
 	ai->slot.captured (*ai, bufs);
 	_arm_info = nullptr;
+	_record_state = Enabled;
 }
 
 void
@@ -3611,7 +3647,8 @@ TriggerBox::maybe_capture (BufferSet& bufs, samplepos_t start_sample, samplepos_
 			                                       t_bbt, t_beats, t_samples, tmap, ai->slot.quantization());
 			ai->end_samples = t_samples;
 			ai->end_beats = t_beats;
-			return;
+
+			//std::cerr << "will end at " << t_beats.str() << " samples " << ai->start_samples << " .. " << ai->end_samples << " = " << (ai->end_samples - ai->start_samples) << std::endl;
 		}
 	}
 
@@ -3638,12 +3675,14 @@ TriggerBox::maybe_capture (BufferSet& bufs, samplepos_t start_sample, samplepos_
 		offset = ai->start_samples - start_sample;
 		nframes -= offset;
 		_record_state = Recording;
+		// std::cerr << "Hit start @ " << ai->start_samples << " within " << start_sample << " ... " << end_sample << " offset will be " << offset << " nf " << nframes << std::endl;
 	}
 
 	if ((ai->end_samples != 0) && (start_sample <= ai->end_samples && ai->end_samples < end_sample)) {
 		/* we're going to stop */
 		nframes -= (end_sample - ai->end_samples);
 		reached_end = true;
+		// std::cerr << "Hit end @ " << ai->end_samples << " within " << start_sample << " ... " << end_sample << " nf " << nframes << std::endl;
 	}
 
 	/* Audio */
@@ -3659,8 +3698,6 @@ TriggerBox::maybe_capture (BufferSet& bufs, samplepos_t start_sample, samplepos_
 			AudioBuffer& buf (bufs.get_audio (n));
 			ai->audio_buf.append (buf.data() + offset, nframes, n);
 		}
-
-		ai->captured += timecnt_t (start_sample, timepos_t (ai->start_samples));
 	}
 
 	n_buffers = bufs.count().n_midi();
@@ -3707,11 +3744,11 @@ TriggerBox::maybe_capture (BufferSet& bufs, samplepos_t start_sample, samplepos_
 				}
 			}
 		}
-
-		timecnt_t dur = tmap->convert_duration (timecnt_t (nframes), timepos_t (start_sample), Temporal::BeatTime);
-		ai->captured += dur;
 	}
 
+	ai->captured += nframes;
+	//std::cerr << "Captured " << nframes << " total " << ai->captured << std::endl;
+
 	Captured (ai->captured); /* EMIT SIGNAL */
 
 	if (reached_end) {
@@ -5539,7 +5576,7 @@ TriggerBoxThread::thread_work ()
 					delete_trigger (req->trigger);
 					break;
 				case BuildSourceAndRegion:
-					build_source (req->trigger);
+					build_source (req->trigger, req->duration);
 					break;
 				default:
 					break;
@@ -5609,10 +5646,11 @@ TriggerBoxThread::request_delete_trigger (Trigger* t)
 }
 
 void
-TriggerBoxThread::request_build_source (Trigger* t)
+TriggerBoxThread::request_build_source (Trigger* t, Temporal::timecnt_t const & len)
 {
 	TriggerBoxThread::Request* req = new TriggerBoxThread::Request (BuildSourceAndRegion);
 	req->trigger  = t;
+	req->duration = len;
 	queue_request (req);
 }
 
@@ -5623,20 +5661,20 @@ TriggerBoxThread::delete_trigger (Trigger* t)
 }
 
 void
-TriggerBoxThread::build_source (Trigger* t)
+TriggerBoxThread::build_source (Trigger* t, Temporal::timecnt_t const & duration)
 {
 	MIDITrigger* mt = dynamic_cast<MIDITrigger*> (t);
 	AudioTrigger* at;
 
 	if (mt) {
-		build_midi_source (mt);
+		build_midi_source (mt, duration);
 	} else if ((at = dynamic_cast<AudioTrigger*> (t))) {
-		build_audio_source (at);
+		build_audio_source (at, duration);
 	}
 }
 
 void
-TriggerBoxThread::build_audio_source (AudioTrigger* t)
+TriggerBoxThread::build_audio_source (AudioTrigger* t, Temporal::timecnt_t const & duration)
 {
 	Track* trk = static_cast<Track*> (t->box().owner());
 	SourceList sources;
@@ -5687,7 +5725,7 @@ TriggerBoxThread::build_audio_source (AudioTrigger* t)
 }
 
 void
-TriggerBoxThread::build_midi_source (MIDITrigger* t)
+TriggerBoxThread::build_midi_source (MIDITrigger* t, Temporal::timecnt_t const & duration)
 {
 	Track* trk = static_cast<Track*> (t->box().owner());
 	std::shared_ptr<MidiSource> ms = t->box().session().create_midi_source_for_session (trk->name());
@@ -5706,7 +5744,7 @@ TriggerBoxThread::build_midi_source (MIDITrigger* t)
 
 			ms->append_event_beats (lock, ev);
 		}
-		ms->mark_streaming_write_completed (lock);
+		ms->mark_streaming_write_completed (lock, duration);
 		ms->load_model (lock);
 	}
 
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 5cbb624620..5a184c4f54 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -355,7 +355,7 @@ def configure(conf):
             features  = 'c',
             mandatory = False,
             execute   = False,
-            fragment = "#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
+            fragment = "#include <unistd.h>\n#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
 
     if have_sys_ioprio:
             conf.define('HAVE_IOPRIO', 1)
@@ -736,18 +736,18 @@ def create_ardour_test_program(bld, includes, name, target, sources):
         'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
         ]
 
-def i18n(bld):
+def i18n_func(bld):
     autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
                        'Paul Davis')
 
-def i18n_pot(bld):
-    autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
+def i18n_pot_func(bld):
+    autowaf.build_i18n_pot(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
                        'Paul Davis')
 
-def i18n_po(bld):
+def i18n_po_func(bld):
     autowaf.build_i18n_po(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
                        'Paul Davis')
 
-def i18n_mo(bld):
+def i18n_mo_func(bld):
     autowaf.build_i18n_mo(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
                        'Paul Davis')
diff --git a/libs/audiographer/audiographer/general/silence_trimmer.h b/libs/audiographer/audiographer/general/silence_trimmer.h
index 81736246b2..becf99f82c 100644
--- a/libs/audiographer/audiographer/general/silence_trimmer.h
+++ b/libs/audiographer/audiographer/general/silence_trimmer.h
@@ -1,6 +1,8 @@
 #ifndef AUDIOGRAPHER_SILENCE_TRIMMER_H
 #define AUDIOGRAPHER_SILENCE_TRIMMER_H
 
+#include <cassert>
+
 #include "audiographer/visibility.h"
 #include "audiographer/debug_utils.h"
 #include "audiographer/flag_debuggable.h"
diff --git a/libs/audiographer/audiographer/general/threader.h b/libs/audiographer/audiographer/general/threader.h
index 828643def0..df21125905 100644
--- a/libs/audiographer/audiographer/general/threader.h
+++ b/libs/audiographer/audiographer/general/threader.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <algorithm>
 
+#include "glibmm/threads.h"
 #include <glibmm/threadpool.h>
 #include <glibmm/timeval.h>
 #include <sigc++/slot.h>
diff --git a/libs/audiographer/audiographer/process_context.h b/libs/audiographer/audiographer/process_context.h
index 4e0b08e74a..9ea33bbf1e 100644
--- a/libs/audiographer/audiographer/process_context.h
+++ b/libs/audiographer/audiographer/process_context.h
@@ -1,7 +1,7 @@
 #ifndef AUDIOGRAPHER_PROCESS_CONTEXT_H
 #define AUDIOGRAPHER_PROCESS_CONTEXT_H
 
-#include <boost/format.hpp>
+#include "pbd/compose.h"
 
 #include "audiographer/visibility.h"
 #include "exception.h"
@@ -71,9 +71,7 @@ public:
 	ProcessContext beginning (samplecnt_t samples)
 	{
 		if (throw_level (ThrowProcess) && samples > _samples) {
-			throw Exception (*this, boost::str (boost::format
-				("Trying to use too many samples of %1% for a new Context: %2% instead of %3%")
-				% DebugUtils::demangled_name (*this) % samples % _samples));
+			throw Exception (*this, string_compose ("Trying to use too many samples of %1 for a new Context: %2 instead of %3" ,DebugUtils::demangled_name (*this), samples, _samples));
 		}
 		validate_data ();
 
@@ -115,9 +113,7 @@ protected:
 	inline void validate_data()
 	{
 		if (throw_level (ThrowProcess) && (_samples % _channels != 0)) {
-			throw Exception (*this, boost::str (boost::format
-				("Number of samples given to %1% was not a multiple of channels: %2% samples with %3% channels")
-				% DebugUtils::demangled_name (*this) % _samples % _channels));
+			throw Exception (*this, string_compose ("Number of samples given to %1% was not a multiple of channels: %2 samples with %3 channels", DebugUtils::demangled_name (*this), _samples, _channels));
 		}
 	}
 };
diff --git a/libs/audiographer/tests/general/sr_converter_test.cc b/libs/audiographer/tests/general/sr_converter_test.cc
index 40e6081a22..4daf6e7fde 100644
--- a/libs/audiographer/tests/general/sr_converter_test.cc
+++ b/libs/audiographer/tests/general/sr_converter_test.cc
@@ -1,3 +1,5 @@
+#include <cassert>
+
 #include "tests/utils.h"
 
 #include "audiographer/general/sr_converter.h"
diff --git a/libs/backends/alsa/alsa_slave.h b/libs/backends/alsa/alsa_slave.h
index e2c0a0b2b5..159b501936 100644
--- a/libs/backends/alsa/alsa_slave.h
+++ b/libs/backends/alsa/alsa_slave.h
@@ -24,6 +24,7 @@
 #include <pthread.h>
 
 #include "pbd/ringbuffer.h"
+#include "pbd/signals.h"
 
 #include "zita-resampler/vresampler.h"
 #include "zita-alsa-pcmi.h"
diff --git a/libs/backends/alsa/select_sleep.h b/libs/backends/alsa/select_sleep.h
index adcdac2ccd..d370284c94 100644
--- a/libs/backends/alsa/select_sleep.h
+++ b/libs/backends/alsa/select_sleep.h
@@ -19,6 +19,8 @@
 #include <stdint.h>
 #include <sys/select.h>
 
+#include <cstddef>
+
 /* select() sleeps _at most_ a given time.
  * (compared to usleep() or nanosleep() which sleep at least a given time)
  */
diff --git a/libs/backends/portaudio/midi_device_info.h b/libs/backends/portaudio/midi_device_info.h
index 7b470df891..763a6abbf8 100644
--- a/libs/backends/portaudio/midi_device_info.h
+++ b/libs/backends/portaudio/midi_device_info.h
@@ -1,6 +1,9 @@
 #ifndef MIDI_DEVICE_INFO_H
 #define MIDI_DEVICE_INFO_H
 
+#include <cstdint>
+#include <string>
+
 /* midi settings */
 struct MidiDeviceInfo {
 	MidiDeviceInfo(const std::string& dev_name)
diff --git a/libs/backends/portaudio/midi_util.h b/libs/backends/portaudio/midi_util.h
index 0bb10839e2..65b13c69b4 100644
--- a/libs/backends/portaudio/midi_util.h
+++ b/libs/backends/portaudio/midi_util.h
@@ -19,6 +19,7 @@
 #ifndef MIDI_UTIL_H
 #define MIDI_UTIL_H
 
+#include <cstddef>
 #include <stdint.h>
 
 struct MidiEventHeader {
diff --git a/libs/canvas/box.cc b/libs/canvas/box.cc
index a50fc0483e..7060b9bb7c 100644
--- a/libs/canvas/box.cc
+++ b/libs/canvas/box.cc
@@ -194,40 +194,40 @@ Box::size_request (Distance& w, Distance& h) const
 	{
 		PBD::Unwinder<bool> uw (ignore_child_changes, true);
 
-		for (std::list<Item*>::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+		for (auto const & item : _items) {
 
 			double width;
 			double height;
 			Rect isize;
 
-			(*i)->size_request (width, height);
-			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, desires %2 x %3\n", (*i)->whoami(), width, height));
+			item->size_request (width, height);
+			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, desires %2 x %3\n", item->whoami(), width, height));
 
 
 			if (homogenous) {
-				if (((*i)->pack_options() & PackOptions (PackExpand|PackFill)) == PackOptions (PackExpand|PackFill)) {
+				if ((item->pack_options() & PackOptions (PackExpand|PackFill)) == PackOptions (PackExpand|PackFill)) {
 					if (orientation == Vertical) {
 						/* use the item's own height and our computed width */
 						isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + uniform_size.width(), previous_edge.y + height);
-						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed width to give %2\n", (*i)->whoami(), isize));
+						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed width to give %2\n", item->whoami(), isize));
 					} else {
 						/* use the item's own width and our computed height */
 						isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + uniform_size.height());
-						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed height to give %2\n", (*i)->whoami(), isize));
+						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed height to give %2\n", item->whoami(), isize));
 					}
 				} else {
 					isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height);
-					DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size to give %2\n", (*i)->whoami(), isize));
+					DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size to give %2\n", item->whoami(), isize));
 				}
 			} else {
 				isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height);
-				DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size (non-homogenous) to give %2\n", (*i)->whoami(), isize));
+				DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size (non-homogenous) to give %2\n", item->whoami(), isize));
 			}
 
 			width = isize.width();
 			height = isize.height();
 
-			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, initial size %2 x %3\n", (*i)->whoami(), width, height));
+			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, initial size %2 x %3\n", item->whoami(), width, height));
 
 			r = r.extend (Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height));
 
@@ -237,7 +237,7 @@ Box::size_request (Distance& w, Distance& h) const
 
 				Distance shift = 0;
 
-				if (!(*i)->visible()) {
+				if (!item->visible()) {
 					/* invisible child */
 					if (!collapse_on_hide) {
 						/* still add in its size */
@@ -253,7 +253,7 @@ Box::size_request (Distance& w, Distance& h) const
 
 				Distance shift = 0;
 
-				if (!(*i)->visible()) {
+				if (!item->visible()) {
 					if (!collapse_on_hide) {
 						shift += width;
 					}
@@ -289,13 +289,13 @@ Box::reposition_children (Distance width, Distance height, bool shrink_width, bo
 		return;
 	}
 
-	DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("allocating children within %1 x %2, shrink/w %3 shrink/h %4\n", width, height, shrink_width, shrink_height));
+	DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("allocating children within %1 x %2, shrink/w %3 shrink/h %4 homog %5\n", width, height, shrink_width, shrink_height, homogenous));
 
 	if (homogenous) {
 
-		for (std::list<Item*>::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+		for (auto const & item : _items) {
 			Distance iw, ih;
-			(*i)->size_request (iw, ih);
+			item->size_request (iw, ih);
 			if (!shrink_height) {
 				largest_height = std::max (largest_height, ih);
 			}
@@ -338,36 +338,37 @@ Box::reposition_children (Distance width, Distance height, bool shrink_width, bo
 	{
 		PBD::Unwinder<bool> uw (ignore_child_changes, true);
 
-		for (std::list<Item*>::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+		for (auto const & item : _items) {
 
 			double width;
 			double height;
 			Rect isize;
 
-			(*i)->size_request (width, height);
+			item->size_request (width, height);
+			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, desires %2 x %3\n", item->whoami(), width, height));
 
 			if (homogenous) {
-				if (((*i)->pack_options() & PackOptions (PackExpand|PackFill)) == PackOptions (PackExpand|PackFill)) {
+				if ((item->pack_options() & PackOptions (PackExpand|PackFill)) == PackOptions (PackExpand|PackFill)) {
 					if (orientation == Vertical) {
 						/* use the item's own height and our computed width */
 						isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + uniform_size.width(), previous_edge.y + height);
-						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed width to give %2\n", (*i)->whoami(), isize));
+						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed width to give %2\n", item->whoami(), isize));
 					} else {
 						/* use the item's own width and our computed height */
 						isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + uniform_size.height());
-						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed height to give %2\n", (*i)->whoami(), isize));
+						DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use computed height to give %2\n", item->whoami(), isize));
 					}
 				} else {
 					isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height);
-					DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size to give %2\n", (*i)->whoami(), isize));
+					DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size to give %2\n", item->whoami(), isize));
 				}
 			} else {
 				isize = Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height);
-				DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size %2 x %3 (non-homogenous) to give %4\n", (*i)->whoami(), width, height, isize));
+				DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1, use item size %2 x %3 (non-homogenous) to give %4\n", item->whoami(), width, height, isize));
 			}
 
-			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1 allocating %2\n", (*i)->whoami(), isize));
-			(*i)->size_allocate (isize);
+			DEBUG_TRACE (DEBUG::CanvasBox|DEBUG::CanvasSizeAllocate, string_compose ("\t%1 allocating %2\n", item->whoami(), isize));
+			item->size_allocate (isize);
 
 			width = isize.width();
 			height = isize.height();
@@ -376,7 +377,7 @@ Box::reposition_children (Distance width, Distance height, bool shrink_width, bo
 
 				Distance shift = 0;
 
-				if (!(*i)->visible()) {
+				if (!item->visible()) {
 					/* invisible child */
 					if (!collapse_on_hide) {
 						/* still add in its size */
@@ -392,7 +393,7 @@ Box::reposition_children (Distance width, Distance height, bool shrink_width, bo
 
 				Distance shift = 0;
 
-				if (!(*i)->visible()) {
+				if (!item->visible()) {
 					if (!collapse_on_hide) {
 						shift += width;
 					}
@@ -414,6 +415,7 @@ Box::add (Item* i)
 	}
 
 	Item::add (i);
+	i->set_layout_sensitive (true);
 	queue_resize ();
 }
 
@@ -425,6 +427,7 @@ Box::add_front (Item* i)
 	}
 
 	Item::add_front (i);
+	i->set_layout_sensitive (true);
 	queue_resize ();
 }
 
diff --git a/libs/canvas/button.cc b/libs/canvas/button.cc
new file mode 100644
index 0000000000..cb04c4294c
--- /dev/null
+++ b/libs/canvas/button.cc
@@ -0,0 +1,211 @@
+/*
+    Copyright (C) 2017 Paul Davis
+    Author: Carl Hetherington <cth@carlh.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; 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 "canvas/button.h"
+#include "canvas/canvas.h"
+#include "canvas/debug.h"
+#include "canvas/button.h"
+#include "canvas/text.h"
+
+#include "gtkmm2ext/utils.h"
+
+using namespace std;
+using namespace ArdourCanvas;
+using namespace Gtkmm2ext;
+using namespace Cairo;
+
+Button::Button (Canvas* canvas, double w, double h, Pango::FontDescription const & font_description)
+	: Rectangle (canvas)
+	, width (w)
+	, height (h)
+	, _label (new Text (canvas))
+	, prelight (false)
+	, highlight (false)
+	, clicking (false)
+{
+	_label->set_font_description (font_description);
+	init ();
+}
+
+Button::Button (Item* parent, double w, double h, Pango::FontDescription const & font_description)
+	: Rectangle (parent)
+	, _label (new Text (this))
+	, prelight (false)
+	, highlight (false)
+	, clicking (false)
+{
+	_label->set_font_description (font_description);
+	init ();
+}
+
+
+Button::Button (Canvas* canvas, std::string const & str, Pango::FontDescription const & font_description)
+	: Rectangle (canvas)
+	, _label (new Text (canvas))
+	, prelight (false)
+	, highlight (false)
+	, clicking (false)
+{
+	_label->set_font_description (font_description);
+	_label->set (str);
+
+	Rect r = _label->bounding_box();
+
+	width = r.width();
+	height = r.height();
+
+	init ();
+}
+
+Button::Button (Item* parent, std::string const & str, Pango::FontDescription const & font_description)
+	: Rectangle (parent)
+	, _label (new Text (this))
+	, prelight (false)
+	, highlight (false)
+	, clicking (false)
+{
+	_label->set_font_description (font_description);
+	_label->set (str);
+
+	Rect r = _label->bounding_box();
+
+	width = r.width();
+	height = r.height();
+
+	init ();
+}
+
+void
+Button::init ()
+{
+	Event.connect (sigc::mem_fun (*this, &Button::event_handler));
+	_label->Event.connect (sigc::mem_fun (*this, &Button::event_handler));
+
+	Rect r = _label->bounding_box ();
+	_label->set_position (Duple ((width - r.width())/2.0, (height - r.height())/2.0));
+
+	set_size_request (width, height);
+}
+
+void
+Button::compute_bounding_box () const
+{
+	_bounding_box = Rect (0, 0, width, height);
+
+	/* Item::bounding_box() will add children */
+
+	set_bbox_clean ();
+}
+
+#define CORNER_RADIUS 5
+
+void
+Button::set_size (double w, double h)
+{
+	width = w;
+	height = h;
+
+	set_bbox_dirty ();
+	redraw ();
+}
+
+void
+Button::set_label (std::string const & str)
+{
+	_label->set (str);
+
+	Rect r = _label->bounding_box ();
+
+	/* alter our own size request to fit text + padding */
+	set_size_request (r.width(), r.height());
+
+	/* move to recenter */
+
+	_label->set_position (Duple ((width - r.width())/2.0, (height - r.height())/2.0));
+
+	redraw ();
+}
+
+void
+Button::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
+{
+	Rect self = item_to_window (_bounding_box, false);
+	Rect draw = self.intersection (area);
+
+	if (!draw) {
+		return;
+	}
+
+	double cr, g, b, a;
+
+	context->save ();
+	context->set_operator (OPERATOR_OVER);
+
+	/* basic (rounded) rectangle, with pattern to fill */
+	rounded_rectangle (context, self.x0 + 2.5, self.y0 + 2.5, width - 4, height - 4, CORNER_RADIUS);
+
+	if (highlight) {
+		context->set_operator (Cairo::OPERATOR_OVER);
+		context->set_source_rgba (1.0, 0.0, 0.0, .2);
+		rounded_rectangle (context, self.x0 + 2.5, self.y0 + 2.5, width - 4, height - 4, CORNER_RADIUS);
+		context->fill();
+	}
+
+	if (prelight) {
+		context->set_operator (Cairo::OPERATOR_OVER);
+		color_to_rgba (contrasting_text_color (color.color()), cr, g, b, a);
+		context->set_source_rgba (cr, g, b, 0.1);
+		rounded_rectangle (context, self.x0 + 2.5, self.y0 + 2.5, width - 4, height - 4, CORNER_RADIUS);
+		context->fill();
+	}
+
+	context->restore ();
+
+	Item::render_children (area, context);
+}
+
+void
+Button::set_highlight (bool yn)
+{
+	if (highlight != yn) {
+		highlight = yn;
+		redraw ();
+	}
+}
+
+bool
+Button::event_handler (GdkEvent *ev)
+{
+	if (ev->type == GDK_ENTER_NOTIFY) {
+		prelight = true;
+		redraw ();
+	} else if (ev->type == GDK_LEAVE_NOTIFY) {
+		prelight = false;
+		redraw ();
+	}
+	return false;
+}
+
+std::string
+Button::label() const
+{
+	return _label->text();
+}
diff --git a/libs/canvas/canvas/button.h b/libs/canvas/canvas/button.h
new file mode 100644
index 0000000000..4f645413a0
--- /dev/null
+++ b/libs/canvas/canvas/button.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.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; 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.
+*/
+
+#pragma once
+
+#include <cairomm/pattern.h>
+
+#include "canvas/visibility.h"
+#include "canvas/rectangle.h"
+#include "canvas/types.h"
+
+namespace Pango {
+	class FontDescription;
+}
+
+namespace ArdourCanvas
+{
+class Text;
+
+class LIBCANVAS_API Button : public Rectangle
+{
+public:
+	Button (Canvas*, double width, double height, Pango::FontDescription const &);
+	Button (Item*, double width, double height, Pango::FontDescription const &);
+
+	Button (Canvas*, std::string const &, Pango::FontDescription const &);
+	Button (Item*, std::string const &, Pango::FontDescription const &);
+
+	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
+	void compute_bounding_box () const;
+
+	void set_label (std::string const &);
+	std::string label() const;
+	Text* text() const { return _label; }
+
+	void set_size (double w, double h);
+	void set_highlight (bool);
+
+  private:
+	double width;
+	double height;
+	Text* _label;
+	bool prelight;
+	bool highlight;
+	bool clicking;
+	Gtkmm2ext::HSV color;
+
+	bool event_handler (GdkEvent*);
+	void init ();
+};
+
+}
+
diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index 1d6320a94c..9b913d1d2c 100644
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -23,8 +23,6 @@
 #include <cstdint>
 #include <memory>
 
-#include <boost/shared_array.hpp>
-
 #include "canvas/visibility.h"
 #include "canvas/item.h"
 
diff --git a/libs/canvas/canvas/stateful_image.h b/libs/canvas/canvas/stateful_image.h
index 8b1bec5f58..a2a0570c23 100644
--- a/libs/canvas/canvas/stateful_image.h
+++ b/libs/canvas/canvas/stateful_image.h
@@ -25,6 +25,8 @@
 
 #include <cairomm/cairomm.h>
 
+#include "pbd/search_path.h"
+
 #include "canvas/item.h"
 
 class XMLNode;
diff --git a/libs/canvas/canvas/types.h b/libs/canvas/canvas/types.h
index 21f97d1a8a..57e3c3278f 100644
--- a/libs/canvas/canvas/types.h
+++ b/libs/canvas/canvas/types.h
@@ -25,7 +25,7 @@
 #include <vector>
 #include <stdint.h>
 #include <algorithm>
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <cairomm/refptr.h>
 
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index c11fc0559c..c301305b84 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -650,7 +650,7 @@ Item::size_request (double& w, double& h) const
 	Rect r (bounding_box());
 
 	w = _requested_width < 0 ? r.width()  : _requested_width;
-	h = _requested_width < 0 ? r.height() : _requested_height;
+	h = _requested_height < 0 ? r.height() : _requested_height;
 }
 
 void
@@ -1337,10 +1337,8 @@ Item::set_layout_sensitive (bool yn)
 {
 	_layout_sensitive = yn;
 
-	for (list<Item*>::const_iterator i = _items.begin(); i != _items.end(); ++i) {
-		if (!(*i)->layout_sensitive()) {
-			(*i)->set_layout_sensitive (yn);
-		}
+	for (auto & item : _items) {
+		item->set_layout_sensitive (yn);
 	}
 }
 
diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc
index 65a045ce8f..1e2f8f906f 100644
--- a/libs/canvas/rectangle.cc
+++ b/libs/canvas/rectangle.cc
@@ -163,8 +163,17 @@ Rectangle::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) con
 void
 Rectangle::size_request (double& w, double& h) const
 {
-	w = _rect.width();
-	h = _rect.height();
+	if (_requested_width > 0.) {
+		w = _requested_width;
+	} else {
+		w = _rect.width();
+	}
+
+	if (_requested_height > 0.) {
+		h = _requested_height;
+	} else {
+		h = _rect.height();
+	}
 }
 
 void
diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index 7553449900..9db7f20d14 100644
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -326,7 +326,7 @@ Text::dump (ostream& o) const
 	Item::dump (o);
 
 	o << _canvas->indent() << '\t' << " text = " << _text << endl
-	  << _canvas->indent() << " color = 0x" << hex << _color << dec;
+	  << _canvas->indent() << "\tcolor = 0x" << hex << _color << dec;
 
 	o << endl;
 }
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 9716882c66..b69020e52a 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -20,6 +20,7 @@ canvas_sources = [
         'arc.cc',
         'arrow.cc',
         'box.cc',
+        'button.cc',
         'canvas.cc',
         'circle.cc',
         'container.cc',
diff --git a/libs/ctrl-interface/control_protocol/control_protocol/types.h b/libs/ctrl-interface/control_protocol/control_protocol/types.h
index 7285fc1bde..a654be2ad1 100644
--- a/libs/ctrl-interface/control_protocol/control_protocol/types.h
+++ b/libs/ctrl-interface/control_protocol/control_protocol/types.h
@@ -19,6 +19,7 @@
 #ifndef __ardour_control_protocol_types_h__
 #define __ardour_control_protocol_types_h__
 
+#include <memory>
 #include <vector>
 
 namespace ARDOUR {
diff --git a/libs/ctrl-interface/midi_surface/midi_surface.cc b/libs/ctrl-interface/midi_surface/midi_surface.cc
index a295ac3df2..f77a91a572 100644
--- a/libs/ctrl-interface/midi_surface/midi_surface.cc
+++ b/libs/ctrl-interface/midi_surface/midi_surface.cc
@@ -35,7 +35,7 @@ using namespace ARDOUR;
 using namespace Glib;
 using namespace PBD;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 MIDISurface::MIDISurface (ARDOUR::Session& s, std::string const & namestr, std::string const & port_prefix, bool use_pad_filter)
 	: ControlProtocol (s, namestr)
diff --git a/libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h
index 7aaa3bb6e1..676deb99c2 100644
--- a/libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h
+++ b/libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h
@@ -21,8 +21,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/shared_array.hpp>
-
 //#include <midi++/types.h>
 namespace MIDI {
 	typedef unsigned char byte;
diff --git a/libs/evoral/MSVCevoral/evoral.vcproj b/libs/evoral/MSVCevoral/evoral.vcproj
index 792a34cec9..00f8a2d041 100644
--- a/libs/evoral/MSVCevoral/evoral.vcproj
+++ b/libs/evoral/MSVCevoral/evoral.vcproj
@@ -483,10 +483,6 @@
 				RelativePath="..\evoral\midi_util.h"
 				>
 			</File>
-			<File
-				RelativePath="..\evoral\MIDIXML.h"
-				>
-			</File>
 			<File
 				RelativePath="..\evoral\Note.h"
 				>
@@ -523,10 +519,6 @@
 				RelativePath="..\libsmf\smf_private.h"
 				>
 			</File>
-			<File
-				RelativePath="..\evoral\SMFReader.h"
-				>
-			</File>
 			<File
 				RelativePath="..\evoral\TimeConverter.h"
 				>
diff --git a/libs/evoral/SMF.cc b/libs/evoral/SMF.cc
index d5af69dc58..ca9bc1e26a 100644
--- a/libs/evoral/SMF.cc
+++ b/libs/evoral/SMF.cc
@@ -34,6 +34,7 @@
 #include "libsmf/smf.h"
 
 #include "temporal/tempo.h"
+#include "temporal/beats.h"
 
 #include "evoral/Event.h"
 #include "evoral/SMF.h"
@@ -48,7 +49,7 @@ using namespace std;
 namespace Evoral {
 
 SMF::SMF()
-	: _smf (0)
+	: _smf (nullptr)
 	, _smf_track (0)
 	, _empty (true)
 	, _n_note_on_events (0)
@@ -237,7 +238,7 @@ SMF::create(const std::string& path, int track, uint16_t ppqn)
 
 	_smf = smf_new();
 
-	if (_smf == NULL) {
+	if (_smf == nullptr) {
 		return -1;
 	}
 
@@ -507,7 +508,7 @@ SMF::begin_write()
 }
 
 void
-SMF::end_write(string const & path)
+SMF::end_write (string const & path)
 {
 	Glib::Threads::Mutex::Lock lm (_smf_lock);
 
@@ -520,6 +521,18 @@ SMF::end_write(string const & path)
 		throw FileError (path);
 	}
 
+	Temporal::Beats b = duration();
+
+	if (b != std::numeric_limits<Temporal::Beats>::max()) {
+
+		int64_t their_pulses = b.to_ticks (_smf->ppqn);
+
+		for (uint16_t n = 0; n < _smf->number_of_tracks; ++n) {
+			smf_track_t* trk = smf_get_track_by_number (_smf, n+1);
+			 (void) smf_track_add_eot_pulses (trk, their_pulses);
+		}
+	}
+
 	if (smf_save(_smf, f) != 0) {
 		fclose(f);
 		throw FileError (path);
@@ -528,6 +541,16 @@ SMF::end_write(string const & path)
 	fclose(f);
 }
 
+Temporal::Beats
+SMF::file_duration () const
+{
+	if (!_smf) {
+		return Temporal::Beats();
+	}
+
+	return Temporal::Beats::ticks_at_rate (smf_get_length_pulses (_smf), ppqn());
+}
+
 double
 SMF::round_to_file_precision (double val) const
 {
diff --git a/libs/evoral/SMFReader.cc b/libs/evoral/SMFReader.cc
deleted file mode 100644
index b0350e7956..0000000000
--- a/libs/evoral/SMFReader.cc
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2008-2011 David Robillard <d@drobilla.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; 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <cstring>
-#include <cstdio>
-#include <cassert>
-#include <iostream>
-
-#include <glib/gstdio.h>
-#include <glibmm/miscutils.h>
-
-#include "evoral/midi_util.h"
-#include "evoral/SMFReader.h"
-
-using namespace std;
-
-namespace Evoral {
-
-
-SMFReader::SMFReader(const string& filename)
-	: _fd(NULL)
-	, _ppqn(0)
-	, _track(0)
-	, _track_size(0)
-{
-	if (filename.length() > 0) {
-		open(filename);
-	}
-}
-
-
-SMFReader::~SMFReader()
-{
-	if (_fd)
-		close();
-}
-
-
-bool
-SMFReader::open(const string& filename) throw (logic_error, UnsupportedTime)
-{
-	if (_fd)
-		throw logic_error("Attempt to start new read while write in progress.");
-
-	cout << "Opening SMF file " << filename << " for reading." << endl;
-
-	_fd = g_fopen(filename.c_str(), "r+b");
-
-	if (_fd) {
-		// Read type (bytes 8..9)
-		fseek(_fd, 0, SEEK_SET);
-		char mthd[5];
-		mthd[4] = '\0';
-		fread(mthd, 1, 4, _fd);
-		if (strcmp(mthd, "MThd")) {
-			cerr << filename << " is not an SMF file, aborting." << endl;
-			fclose(_fd);
-			_fd = NULL;
-			return false;
-		}
-
-		// Read type (bytes 8..9)
-		fseek(_fd, 8, SEEK_SET);
-		uint16_t type_be = 0;
-		fread(&type_be, 2, 1, _fd);
-		_type = GUINT16_FROM_BE(type_be);
-
-		// Read number of tracks (bytes 10..11)
-		uint16_t num_tracks_be = 0;
-		fread(&num_tracks_be, 2, 1, _fd);
-		_num_tracks = GUINT16_FROM_BE(num_tracks_be);
-
-		// Read PPQN (bytes 12..13)
-		uint16_t ppqn_be = 0;
-		fread(&ppqn_be, 2, 1, _fd);
-		_ppqn = GUINT16_FROM_BE(ppqn_be);
-
-		// TODO: Absolute (SMPTE seconds) time support
-		if ((_ppqn & 0x8000) != 0)
-			throw UnsupportedTime();
-
-		seek_to_track(1);
-
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-/** Seek to the start of a given track, starting from 1.
- * Returns true if specified track was found.
- */
-bool
-SMFReader::seek_to_track(unsigned track) throw (std::logic_error)
-{
-	if (track == 0)
-		throw logic_error("Seek to track 0 out of range (must be >= 1)");
-
-	if (!_fd)
-		throw logic_error("Attempt to seek to track on unopened SMF file.");
-
-	unsigned track_pos = 0;
-
-	fseek(_fd, 14, SEEK_SET);
-	char id[5];
-	id[4] = '\0';
-	uint32_t chunk_size = 0;
-
-	while (!feof(_fd)) {
-		fread(id, 1, 4, _fd);
-
-		if (!strcmp(id, "MTrk")) {
-			++track_pos;
-		} else {
-			std::cerr << "Unknown chunk ID " << id << endl;
-		}
-
-		uint32_t chunk_size_be;
-		fread(&chunk_size_be, 4, 1, _fd);
-		chunk_size = GUINT32_FROM_BE(chunk_size_be);
-
-		if (track_pos == track)
-			break;
-
-		fseek(_fd, chunk_size, SEEK_CUR);
-	}
-
-	if (!feof(_fd) && track_pos == track) {
-		_track = track;
-		_track_size = chunk_size;
-		return true;
-	} else {
-		return false;
-	}
-}
-
-
-/** Read an event from the current position in file.
- *
- * File position MUST be at the beginning of a delta time, or this will die very messily.
- * ev.buffer must be of size ev.size, and large enough for the event.  The returned event
- * will have it's time field set to it's delta time (so it's the caller's responsibility
- * to keep track of delta time, even for ignored events).
- *
- * Returns event length (including status byte) on success, 0 if event was
- * skipped (eg a meta event), or -1 on EOF (or end of track).
- *
- * If @a buf is not large enough to hold the event, 0 will be returned, but ev_size
- * set to the actual size of the event.
- */
-int
-SMFReader::read_event(size_t    buf_len,
-                      uint8_t*  buf,
-                      uint32_t* ev_size,
-                      uint32_t* delta_time)
-		throw (std::logic_error, PrematureEOF, CorruptFile)
-{
-	if (_track == 0)
-		throw logic_error("Attempt to read from unopened SMF file");
-
-	if (!_fd || feof(_fd)) {
-		return -1;
-	}
-
-	assert(buf_len > 0);
-	assert(buf);
-	assert(ev_size);
-	assert(delta_time);
-
-	// Running status state
-	static uint8_t  last_status = 0;
-	static uint32_t last_size   = 0;
-
-	*delta_time = read_var_len(_fd);
-	int status = fgetc(_fd);
-	if (status == EOF)
-		throw PrematureEOF();
-	else if (status > 0xFF)
-		throw CorruptFile();
-
-	if (status < 0x80) {
-		if (last_status == 0)
-			throw CorruptFile();
-		status = last_status;
-		*ev_size = last_size;
-		fseek(_fd, -1, SEEK_CUR);
-	} else {
-		last_status = status;
-		*ev_size = midi_event_size(status);
-		last_size = *ev_size;
-	}
-
-	buf[0] = (uint8_t)status;
-
-	if (status == 0xFF) {
-		*ev_size = 0;
-		if (feof(_fd))
-			throw PrematureEOF();
-		uint8_t type = fgetc(_fd);
-		const uint32_t size = read_var_len(_fd);
-		/*cerr.flags(ios::hex);
-		cerr << "SMF - meta 0x" << (int)type << ", size = ";
-		cerr.flags(ios::dec);
-		cerr << size << endl;*/
-
-		if ((uint8_t)type == 0x2F) {
-			return -1; // we hit the logical EOF anyway...
-		} else {
-			fseek(_fd, size, SEEK_CUR);
-			return 0;
-		}
-	}
-
-	if (*ev_size > buf_len || *ev_size == 0 || feof(_fd)) {
-		//cerr << "SMF - Skipping event" << endl;
-		// Skip event, return 0
-		fseek(_fd, *ev_size - 1, SEEK_CUR);
-		return 0;
-	} else {
-		// Read event, return size
-		if (ferror(_fd))
-			throw CorruptFile();
-
-		fread(buf+1, 1, *ev_size - 1, _fd);
-
-		if ((buf[0] & 0xF0) == 0x90 && buf[2] == 0) {
-			buf[0] = (0x80 | (buf[0] & 0x0F));
-			buf[2] = 0x40;
-		}
-
-		return *ev_size;
-	}
-}
-
-
-void
-SMFReader::close()
-{
-	if (_fd)
-		fclose(_fd);
-
-	_fd = NULL;
-}
-
-
-uint32_t
-SMFReader::read_var_len(FILE* fd) throw (PrematureEOF)
-{
-	if (feof(fd))
-		throw PrematureEOF();
-
-	uint32_t value;
-	uint8_t  c;
-
-	if ( (value = getc(fd)) & 0x80 ) {
-		value &= 0x7F;
-		do {
-			if (feof(fd))
-				throw PrematureEOF();
-			value = (value << 7) + ((c = getc(fd)) & 0x7F);
-		} while (c & 0x80);
-	}
-
-	return value;
-}
-
-
-} // namespace Evoral
-
diff --git a/libs/evoral/Sequence.cc b/libs/evoral/Sequence.cc
index db9615b5f3..d74573feff 100644
--- a/libs/evoral/Sequence.cc
+++ b/libs/evoral/Sequence.cc
@@ -482,6 +482,7 @@ Sequence<Time>::Sequence(const TypeMap& type_map)
 	, _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
 	, _lowest_note(127)
 	, _highest_note(0)
+	, _explicit_duration (false)
 {
 	DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence constructed: %1\n", this));
 	assert(_end_iter._is_end);
@@ -503,6 +504,8 @@ Sequence<Time>::Sequence(const Sequence<Time>& other)
 	, _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
 	, _lowest_note(other._lowest_note)
 	, _highest_note(other._highest_note)
+	, _duration (other._duration)
+	, _explicit_duration (other._explicit_duration)
 {
 	for (typename Notes::const_iterator i = other._notes.begin(); i != other._notes.end(); ++i) {
 		NotePtr n (new Note<Time> (**i));
@@ -726,6 +729,8 @@ Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg)
 	_notes.insert (note);
 	_pitches[note->channel()].insert (note);
 
+	update_duration_unlocked (note->time());
+
 	_edited = true;
 
 	return true;
@@ -912,7 +917,7 @@ Sequence<Time>::remove_sysex_unlocked (const SysExPtr sysex)
  */
 template<typename Time>
 void
-Sequence<Time>::append(const Event<Time>& ev, event_id_t evid)
+Sequence<Time>::append (const Event<Time>& ev, event_id_t evid)
 {
 	WriteLock lock(write_lock());
 
@@ -924,6 +929,11 @@ Sequence<Time>::append(const Event<Time>& ev, event_id_t evid)
 		return;
 	}
 
+	if (ev.is_realtime()) {
+		/* relax - we do not store these in a Sequence */
+		return;
+	}
+
 	if (ev.is_note_on() && ev.velocity() > 0) {
 		append_note_on_unlocked (ev, evid);
 	} else if (ev.is_note_off() || (ev.is_note_on() && ev.velocity() == 0)) {
@@ -1090,6 +1100,7 @@ Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, doubl
 	std::shared_ptr<Control> c = control(param, true);
 	c->list()->add (Temporal::timepos_t (time), value, true, false);
 	/* XXX control events should use IDs */
+	update_duration_unlocked (time);
 }
 
 template<typename Time>
@@ -1106,6 +1117,7 @@ Sequence<Time>::append_sysex_unlocked(const Event<Time>& ev, event_id_t /* evid
 	std::shared_ptr< Event<Time> > event(new Event<Time>(ev, true));
 	/* XXX sysex events should use IDs */
 	_sysexes.insert(event);
+	update_duration_unlocked (ev.time());
 }
 
 template<typename Time>
@@ -1119,6 +1131,7 @@ Sequence<Time>::append_patch_change_unlocked (const PatchChange<Time>& ev, event
 	}
 
 	_patch_changes.insert (p);
+	update_duration_unlocked (ev.time());
 }
 
 template<typename Time>
@@ -1130,6 +1143,7 @@ Sequence<Time>::add_patch_change_unlocked (PatchChangePtr p)
 	}
 
 	_patch_changes.insert (p);
+	update_duration_unlocked (p->time());
 }
 
 template<typename Time>
@@ -1141,6 +1155,33 @@ Sequence<Time>::add_sysex_unlocked (SysExPtr s)
 	}
 
 	_sysexes.insert (s);
+	update_duration_unlocked (s->time());
+}
+
+template<typename Time>
+void
+Sequence<Time>::set_duration (Time const & t)
+{
+	WriteLock lock(write_lock());
+	_duration = t;
+	_explicit_duration = true;
+}
+
+template<typename Time>
+void
+Sequence<Time>::update_duration_unlocked (Time const & t, bool can_shorten)
+{
+	if (_explicit_duration) {
+		return;
+	}
+
+	if (t < _duration) {
+		if (can_shorten) {
+			_duration = t;
+		}
+	} else if (t > _duration) {
+		_duration = t;
+	}
 }
 
 template<typename Time>
@@ -1169,45 +1210,6 @@ Sequence<Time>::contains_unlocked (const NotePtr& note) const
 	return false;
 }
 
-template<typename Time>
-bool
-Sequence<Time>::overlaps (const NotePtr& note, const NotePtr& without) const
-{
-	ReadLock lock (read_lock());
-	return overlaps_unlocked (note, without);
-}
-
-template<typename Time>
-bool
-Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without) const
-{
-	Time sa = note->time();
-	Time ea  = note->end_time();
-
-	const Pitches& p (pitches (note->channel()));
-	NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
-
-	for (typename Pitches::const_iterator i = p.lower_bound (search_note);
-	     i != p.end() && (*i)->note() == note->note(); ++i) {
-
-		if (without && (**i) == *without) {
-			continue;
-		}
-
-		Time sb = (*i)->time();
-		Time eb = (*i)->end_time();
-
-		if (((sb > sa) && (eb <= ea)) ||
-		    ((eb >= sa) && (eb <= ea)) ||
-		    ((sb > sa) && (sb <= ea)) ||
-		    ((sa >= sb) && (sa <= eb) && (ea <= eb))) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 template<typename Time>
 void
 Sequence<Time>::set_notes (const typename Sequence<Time>::Notes& n)
diff --git a/libs/evoral/evoral/Event.h b/libs/evoral/evoral/Event.h
index 03b8b033d7..e410da41c4 100644
--- a/libs/evoral/evoral/Event.h
+++ b/libs/evoral/evoral/Event.h
@@ -155,12 +155,17 @@ public:
 	bool     is_channel_event()    const { return (0x80 <= type()) && (type() <= 0xE0); }
 	bool     is_smf_meta_event()   const { return _buf[0] == 0xFF; }
 	bool     is_sysex()            const { return _buf[0] == 0xF0 || _buf[0] == 0xF7; }
-	bool     is_spp()              const { return _buf[0] == 0xF2 && size() == 1; }
 	bool     is_mtc_quarter()      const { return _buf[0] == 0xF1 && size() == 1; }
+	bool     is_spp()              const { return _buf[0] == 0xF2 && size() == 1; }
+	bool     is_song()              const { return _buf[0] == 0xF3 && size() == 1; }
+	bool     is_tune()              const { return _buf[0] == 0xF6 && size() == 1; }
+	bool     is_eox()              const { return _buf[0] == 0xF7 && size() == 1; }
+	bool     is_clock()            const { return _buf[0] == 0xF8 && size() == 1; }
+	bool     is_tick()             const { return _buf[0] == 0xF9 && size() == 1; }
 	bool     is_mtc_full()         const { return (size() == 10 &&
 	                                               _buf[0] == 0xF0 && _buf[1] == 0x7F &&
 	                                               _buf[3] == 0x01 && _buf[4] == 0x01); }
-
+	bool     is_realtime()        const { return is_mtc_full() || ((_buf[0] >= 0xF1 && _buf[0] <= 0xfe) && size() == 1); }
 	uint8_t  note()               const { return _buf[1]; }
 	uint8_t  velocity()           const { return _buf[2]; }
 	uint8_t  poly_note()          const { return _buf[1]; }
diff --git a/libs/evoral/evoral/MIDIXML.h b/libs/evoral/evoral/MIDIXML.h
deleted file mode 100644
index 6d2dfaabee..0000000000
--- a/libs/evoral/evoral/MIDIXML.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2016 David Robillard <d@drobilla.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; 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef EVORAL_MIDI_XML_HPP
-#define EVORAL_MIDI_XML_HPP
-
-#include "evoral/Event.h"
-#include "pbd/xml++.h"
-
-namespace Evoral {
-namespace MIDIXML {
-
-template<typename Time>
-bool
-xml_to_midi(const XMLNode& node, Evoral::Event<Time>& ev)
-{
-	if (node.name() == "ControlChange") {
-		ev.set_type(MIDI_CMD_CONTROL);
-		ev.set_cc_number(atoi(node.property("Control")->value().c_str()));
-		ev.set_cc_value(atoi(node.property("Value")->value().c_str()));
-		return true;
-	} else if (node.name() == "ProgramChange") {
-		ev.set_type(MIDI_CMD_PGM_CHANGE);
-		ev.set_pgm_number(atoi(node.property("Number")->value().c_str()));
-		return true;
-	}
-
-	return false;
-}
-
-template<typename Time>
-std::shared_ptr<XMLNode>
-midi_to_xml(const Evoral::Event<Time>& ev)
-{
-	XMLNode* result = 0;
-
-	switch (ev.type()) {
-	case MIDI_CMD_CONTROL:
-		result = new XMLNode("ControlChange");
-		result->add_property("Channel", long(ev.channel()));
-		result->add_property("Control", long(ev.cc_number()));
-		result->add_property("Value",   long(ev.cc_value()));
-		break;
-
-	case MIDI_CMD_PGM_CHANGE:
-		result = new XMLNode("ProgramChange");
-		result->add_property("Channel", long(ev.channel()));
-		result->add_property("Number",  long(ev.pgm_number()));
-		break;
-
-	case MIDI_CMD_NOTE_ON:
-		result = new XMLNode("NoteOn");
-		result->add_property("Channel",  long(ev.channel()));
-		result->add_property("Note",     long(ev.note()));
-		result->add_property("Velocity", long(ev.velocity()));
-		break;
-
-	case MIDI_CMD_NOTE_OFF:
-		result = new XMLNode("NoteOff");
-		result->add_property("Channel",  long(ev.channel()));
-		result->add_property("Note",     long(ev.note()));
-		result->add_property("Velocity", long(ev.velocity()));
-		break;
-
-	case MIDI_CMD_BENDER:
-		result = new XMLNode("PitchBendChange");
-		result->add_property("Channel", long(ev.channel()));
-		result->add_property("Value",   long(ev.pitch_bender_value()));
-		break;
-
-	default:
-		return std::shared_ptr<XMLNode>();
-	}
-
-	return std::shared_ptr<XMLNode>(result);
-}
-
-} // namespace MIDIXML
-} // namespace Evoral
-
-#endif // EVORAL_MIDI_XML_HPP
diff --git a/libs/evoral/evoral/SMF.h b/libs/evoral/evoral/SMF.h
index 42ff9c6f0c..fd664df72a 100644
--- a/libs/evoral/evoral/SMF.h
+++ b/libs/evoral/evoral/SMF.h
@@ -23,8 +23,12 @@
 #define EVORAL_SMF_HPP
 
 #include <glibmm/threads.h>
+
+#include <memory>
 #include <set>
 
+#include "temporal/beats.h"
+
 #include "evoral/visibility.h"
 #include "evoral/types.h"
 
@@ -67,6 +71,8 @@ public:
 	SMF();
 	virtual ~SMF();
 
+	virtual Temporal::Beats duration() const { return std::numeric_limits<Temporal::Beats>::max(); }
+
 	static bool test(const std::string& path);
 	int open (const std::string& path, int track = 1, bool scan = true);
 	// XXX 19200 = 10 * Temporal::ticks_per_beat
@@ -87,11 +93,14 @@ public:
 	void end_write(std::string const &);
 
 	void flush() {};
+	void set_length (Temporal::Beats const &);
 
 	double round_to_file_precision (double val) const;
 
 	int smf_format () const;
 
+	Temporal::Beats file_duration() const;
+
 	int num_channels () const { return _num_channels; }
 	typedef std::bitset<16> UsedChannels;
 	UsedChannels const& used_channels () const { return _used_channels; }
diff --git a/libs/evoral/evoral/SMFReader.h b/libs/evoral/evoral/SMFReader.h
deleted file mode 100644
index 81f9f6a6ce..0000000000
--- a/libs/evoral/evoral/SMFReader.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2008-2011 David Robillard <d@drobilla.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; 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef EVORAL_SMF_READER_HPP
-#define EVORAL_SMF_READER_HPP
-
-#include <exception>
-#include <stdexcept>
-#include <string>
-#include <inttypes.h>
-
-#include "evoral/visibility.h"
-
-namespace Evoral {
-
-
-/** Standard MIDI File (Type 0) Reader
- *
- * Currently this only reads SMF files with tempo-based timing.
- */
-class LIBEVORAL_API SMFReader {
-public:
-	class PrematureEOF : public std::exception {
-		const char* what() const throw() { return "Unexpected end of file"; }
-	};
-	class CorruptFile : public std::exception {
-		const char* what() const throw() { return "Corrupted file"; }
-	};
-	class UnsupportedTime : public std::exception {
-		const char* what() const throw() { return "Unsupported time stamp type (SMPTE)"; }
-	};
-
-	SMFReader(const std::string& filename="");
-	~SMFReader();
-
-	bool open(const std::string& filename) throw (std::logic_error, UnsupportedTime);
-
-	bool seek_to_track(unsigned track) throw (std::logic_error);
-
-	const std::string& filename() const { return _filename; };
-
-	uint16_t type()       const { return _type; }
-	uint16_t ppqn()       const { return _ppqn; }
-	uint16_t num_tracks() const { return _num_tracks; }
-
-	int read_event(size_t    buf_len,
-	               uint8_t*  buf,
-	               uint32_t* ev_size,
-	               uint32_t* ev_delta_time)
-		throw (std::logic_error, PrematureEOF, CorruptFile);
-
-	void close();
-
-	static uint32_t read_var_len(FILE* fd) throw (PrematureEOF);
-
-protected:
-	/** size of SMF header, including MTrk chunk header */
-	static const uint32_t HEADER_SIZE = 22;
-
-	std::string _filename;
-	FILE*       _fd;
-	uint16_t    _type;
-	uint16_t    _ppqn;
-	uint16_t    _num_tracks;
-	uint32_t    _track;
-	uint32_t    _track_size;
-};
-
-
-} // namespace Evoral
-
-#endif // EVORAL_SMF_READER_HPP
-
diff --git a/libs/evoral/evoral/Sequence.h b/libs/evoral/evoral/Sequence.h
index b5f2a9e0d6..91ca530e3d 100644
--- a/libs/evoral/evoral/Sequence.h
+++ b/libs/evoral/evoral/Sequence.h
@@ -300,8 +300,6 @@ public:
 	bool edited() const      { return _edited; }
 	void set_edited(bool yn) { _edited = yn; }
 
-	bool overlaps (const NotePtr& ev,
-	               const NotePtr& ignore_this_note) const;
 	bool contains (const NotePtr& ev) const;
 
 	bool add_note_unlocked (const NotePtr note, void* arg = 0);
@@ -316,6 +314,8 @@ public:
 	uint8_t lowest_note()  const { return _lowest_note; }
 	uint8_t highest_note() const { return _highest_note; }
 
+	Time duration() const { return _duration; }
+	void set_duration (Time const &);
 
 protected:
 	bool                   _edited;
@@ -337,7 +337,6 @@ protected:
 private:
 	friend class const_iterator;
 
-	bool overlaps_unlocked (const NotePtr& ev, const NotePtr& ignore_this_note) const;
 	bool contains_unlocked (const NotePtr& ev) const;
 
 	void append_note_on_unlocked(const Event<Time>& event, Evoral::event_id_t);
@@ -370,6 +369,11 @@ private:
 
 	uint8_t _lowest_note;
 	uint8_t _highest_note;
+
+	Time    _duration;
+	bool    _explicit_duration;
+
+	void update_duration_unlocked (Time const &, bool can_shorten = false);
 };
 
 
diff --git a/libs/evoral/libsmf/smf_private.h b/libs/evoral/libsmf/smf_private.h
index 41ac7238fc..71958e4982 100644
--- a/libs/evoral/libsmf/smf_private.h
+++ b/libs/evoral/libsmf/smf_private.h
@@ -31,6 +31,8 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "smf.h"
+
 //#include "config.h"
 //#define SMF_VERSION PACKAGE_VERSION
 
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index af9d2bd198..2459fa32ae 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -69,7 +69,7 @@ BaseUI::RequestType Gtkmm2ext::SetTip = BaseUI::new_request_type();
 BaseUI::RequestType Gtkmm2ext::AddIdle = BaseUI::new_request_type();
 BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type();
 
-#include "pbd/abstract_ui.cc"  /* instantiate the template */
+#include "pbd/abstract_ui.inc.cc"  /* instantiate the template */
 
 template class AbstractUI<Gtkmm2ext::UIRequest>;
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
index a081d42077..27c10b79b6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
@@ -23,6 +23,8 @@
 
 #include <gtkmm/window.h>
 #include <gtkmm/box.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
 
 #include "gtkmm2ext/visibility.h"
 #include "gtkmm2ext/widget_state.h"
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
index e9734e520f..346bfe7422 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
@@ -22,6 +22,8 @@
 
 #include "gtkmm2ext/visibility.h"
 
+#include <glib.h>
+
 namespace Gtk {
 	class Widget;
 }
diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
index 1e0aea7a4b..9bcb7deaac 100644
--- a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
+++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
@@ -22,6 +22,9 @@
 #include <gdk/gdkevents.h>
 
 #include "gtkmm2ext/visibility.h"
+#include "gtkmm2ext/visibility_tracker.h"
+
+#include <sigc++/trackable.h>
 
 namespace Gtk {
 	class Window;
diff --git a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
index aa4cad5a5e..f613ad4b6f 100644
--- a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
+++ b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
@@ -26,6 +26,8 @@
 
 #include "pbd/statefuldestructible.h"
 
+#include <gtkmm/action.h>
+
 #include "gtkmm2ext/visibility.h"
 
 namespace Gtk {
diff --git a/libs/gtkmm2ext/po/es.po b/libs/gtkmm2ext/po/es.po
index e36faeb236..9893c6db2c 100644
--- a/libs/gtkmm2ext/po/es.po
+++ b/libs/gtkmm2ext/po/es.po
@@ -7,69 +7,72 @@ msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-30 12:44-0600\n"
-"PO-Revision-Date: 2013-02-09 16:21+0100\n"
+"PO-Revision-Date: 2024-11-06 09:59-0500\n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Spanish\n"
-"Language: Spanish\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #: actions.cc:215
 msgid "Unknown action name: %1/%2"
-msgstr ""
+msgstr "Nombre de acción desconocido: %1/%2"
 
 #: action_model.cc:56 action_model.cc:171
 msgid "Disabled"
-msgstr ""
+msgstr "Deshabilitado"
 
 #: action_model.cc:83
 msgid "Main_menu"
-msgstr ""
+msgstr "Menú_principal"
 
 #: action_model.cc:85
 msgid "JACK"
-msgstr ""
+msgstr "JACK"
 
 #: action_model.cc:87
 msgid "redirectmenu"
-msgstr ""
+msgstr "menuderedireccionamiento"
 
 #: action_model.cc:89
 msgid "Editor_menus"
-msgstr ""
+msgstr "Menúes_delEditor"
 
 #: action_model.cc:91
 msgid "RegionList"
-msgstr ""
+msgstr "ListaDeRegiones"
 
 #: action_model.cc:93
 msgid "ProcessorMenu"
-msgstr ""
+msgstr "MenúDelProcesador"
 
 #: bindings.cc:840 bindings.cc:842
 msgid "Window"
-msgstr ""
+msgstr "Ventana"
 
 #: bindings.cc:840
 msgid " (Categorized)"
-msgstr ""
+msgstr "(Categorizado)"
 
 #: bindings.cc:842
 msgid " (Alphabetical)"
-msgstr ""
+msgstr "(Alfabético)"
 
 #: bindings.cc:858
 msgid "Uncategorized"
-msgstr ""
+msgstr "SinCategoría"
 
 #: cursors.cc:81
 msgid "cursor hotspots info file %1 has an error on line %2"
 msgstr ""
+"El archivo de información de puntos de acceso del cursor %1 tiene un error "
+"en la línea %2"
 
 #: emscale.cc:52
 msgid "ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-msgstr ""
+msgstr "ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 
 #: gtk_ui.cc:126
 msgid "Log"
@@ -95,15 +98,15 @@ msgstr "Lo siento %1, no puedo hacer eso"
 
 #: keyboard.cc:75
 msgid "Command"
-msgstr ""
+msgstr "Comando"
 
 #: keyboard.cc:76 keyboard.cc:98
 msgid "Control"
-msgstr ""
+msgstr "Control"
 
 #: keyboard.cc:77 keyboard.cc:82 keyboard.cc:100 keyboard.cc:105
 msgid "Key|Shift"
-msgstr ""
+msgstr "Shift"
 
 #: keyboard.cc:78
 msgid "Option"
@@ -111,31 +114,31 @@ msgstr "Opci
 
 #: keyboard.cc:80
 msgid "Cmd"
-msgstr ""
+msgstr "Cmd"
 
 #: keyboard.cc:81 keyboard.cc:103
 msgid "Ctrl"
-msgstr ""
+msgstr "Ctrl"
 
 #: keyboard.cc:83
 msgid "Opt"
-msgstr ""
+msgstr "Opt"
 
 #: keyboard.cc:99 keyboard.cc:104
 msgid "Alt"
-msgstr ""
+msgstr "Alt"
 
 #: keyboard.cc:101
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: keyboard.cc:106
 msgid "Win"
-msgstr ""
+msgstr "Win"
 
 #: keyboard.cc:159 keyboard.cc:605
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: keyboard.cc:616
 msgid "key bindings file not found at \"%2\" or contains errors."
@@ -145,15 +148,15 @@ msgstr ""
 
 #: keyboard.cc:642
 msgid "Keyboard binding found without a name"
-msgstr ""
+msgstr "Enlace de teclado encontrado sin nombre"
 
 #: keyboard.cc:674
 msgid "Cannot save key bindings to %1"
-msgstr ""
+msgstr "No se pueden guardar los atajos del teclado en %1"
 
 #: keyboard.cc:690
 msgid "Cannot rename your own keybinding file (%1)"
-msgstr ""
+msgstr "No se puede cambiar el nombre de su propio atajo del teclado (%1)"
 
 #: textviewer.cc:32
 msgid "Close"
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 67e4cade26..d47ee0465a 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -99,18 +99,18 @@ def build(bld):
             bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
                             mo)
 
-def i18n(bld):
+def i18n_func(bld):
     autowaf.build_i18n(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')
 
-def i18n_pot(bld):
+def i18n_pot_func(bld):
     autowaf.build_i18n_pot(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')
 
-def i18n_po(bld):
+def i18n_po_func(bld):
     autowaf.build_i18n_po(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')
 
-def i18n_mo(bld):
+def i18n_mo_func(bld):
     autowaf.build_i18n_mo(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index 7fb5379d6c..f5e8a83159 100644
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -696,10 +696,6 @@
 				RelativePath="..\pbd\floating.h"
 				>
 			</File>
-			<File
-				RelativePath="..\pbd\functor_command.h"
-				>
-			</File>
 			<File
 				RelativePath="..\msvc\getopt.h"
 				>
diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.inc.cc
similarity index 100%
rename from libs/pbd/pbd/abstract_ui.cc
rename to libs/pbd/pbd/abstract_ui.inc.cc
diff --git a/libs/pbd/pbd/atomic_counter.h b/libs/pbd/pbd/atomic_counter.h
index 21023f1c56..1d5c517215 100644
--- a/libs/pbd/pbd/atomic_counter.h
+++ b/libs/pbd/pbd/atomic_counter.h
@@ -20,6 +20,8 @@
 #ifndef PBD_ATOMIC_COUNTER_H
 #define PBD_ATOMIC_COUNTER_H
 
+#include "pbd/atomic.h"
+
 #include <atomic>
 
 #include <glib.h>
diff --git a/libs/pbd/pbd/functor_command.h b/libs/pbd/pbd/functor_command.h
deleted file mode 100644
index e00bd8a5f8..0000000000
--- a/libs/pbd/pbd/functor_command.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2007-2015 Paul Davis <paul@linuxaudiosystems.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#pragma once
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <map>
-
-#include "pbd/libpbd_visibility.h"
-#include "pbd/xml++.h"
-#include "pbd/shiva.h"
-#include "pbd/command.h"
-#include "pbd/failed_constructor.h"
-
-/** This command class is initialized
- */
-
-namespace PBD {
-
-template <class obj_type, class arg_type>
-class /*LIBPBD_API*/ FunctorCommand : public PBD::Command
-{
-	private:
-	typedef void (obj_type::*functor_type)(arg_type);
-	typedef std::map< std::string, functor_type > FunctorMap;
-	typedef typename FunctorMap::iterator FunctorMapIterator;
-
-	public:
-	FunctorCommand(std::string functor, obj_type& object, arg_type b, arg_type a)
-		: functor_name(functor)
-		, object(object)
-		, before(b)
-		, after(a)
-	{
-		method = find_functor(functor);
-
-		/* catch destruction of the object */
-		new PBD::Shiva< obj_type, FunctorCommand<obj_type, arg_type> > (object, *this);
-	}
-
-	~FunctorCommand() {
-		GoingAway();
-	}
-
-	void operator() () {
-		(object.*method) (after);
-	}
-
-	void undo() {
-		(object.*method) (before);
-	}
-
-	virtual XMLNode &get_state() {
-		std::stringstream ss;
-
-		XMLNode *node = new XMLNode("FunctorCommand");
-		node->add_property("type_name", typeid(obj_type).name());
-		node->add_property("functor", functor_name);
-		ss << before;
-		node->add_property("before", ss.str());
-		ss.clear ();
-		ss << after;
-		node->add_property("after", ss.str());
-
-		return *node;
-	}
-
-	static void register_functor(std::string name, functor_type f) {
-		functor_map[name] = f;
-	}
-
-	private:
-	static functor_type find_functor(std::string name) {
-		FunctorMapIterator iter;
-
-		if((iter = functor_map.find(name)) == functor_map.end()) {
-			throw failed_constructor();
-		}
-
-		return iter->second;
-	}
-
-	protected:
-	std::string functor_name;
-	obj_type &object;
-	arg_type before;
-	arg_type after;
-	functor_type method;
-	static FunctorMap functor_map;
-};
-
-// static initialization of functor_map...
-template <class obj_type, class arg_type>
-typename FunctorCommand<obj_type, arg_type>::FunctorMap
-FunctorCommand<obj_type, arg_type>::functor_map;
-
-};
-
-
diff --git a/libs/pbd/pbd/property_basics_impl.h b/libs/pbd/pbd/property_basics_impl.h
index 5881b13d61..d557dbaafd 100644
--- a/libs/pbd/pbd/property_basics_impl.h
+++ b/libs/pbd/pbd/property_basics_impl.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "pbd/property_basics.h"
+
 namespace PBD {
 
 template<typename T>
diff --git a/libs/pbd/pbd/scoped_file_descriptor.h b/libs/pbd/pbd/scoped_file_descriptor.h
index 06c53d15fe..0d525275aa 100644
--- a/libs/pbd/pbd/scoped_file_descriptor.h
+++ b/libs/pbd/pbd/scoped_file_descriptor.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <unistd.h>
+
 namespace PBD {
 
 struct ScopedFileDescriptor {
diff --git a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
index cc25462109..cd177c4f87 100644
--- a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
+++ b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
@@ -99,17 +99,20 @@ struct BankProgram {
 		: name (n)
 		, bank (b)
 		, program (p)
+		, user_set (false)
 	{}
 
 	BankProgram (const BankProgram& other)
 		: name (other.name)
 		, bank (other.bank)
 		, program (other.program)
+		, user_set (other.user_set)
 	{}
 
 	std::string name;
 	int         bank;
 	int         program;
+	bool        user_set;
 };
 
 typedef std::vector<BankProgram>   BPList;
@@ -186,7 +189,11 @@ typedef struct {
 static bool
 load_sf2 (AFluidSynth* self, const char* fn)
 {
-	const int synth_id = fluid_synth_sfload (self->synth, fn, 1);
+	while (fluid_synth_sfcount (self->synth) > 0) {
+		fluid_synth_remove_sfont (self->synth, fluid_synth_get_sfont (self->synth, 0));
+	}
+
+	const int synth_id = fluid_synth_sfload (self->synth, fn, 0);
 
 #ifdef LV2_EXTENDED
 	pthread_mutex_lock (&self->bp_lock);
@@ -224,13 +231,20 @@ load_sf2 (AFluidSynth* self, const char* fn)
 		        fluid_preset_get_num (preset)));
 #endif // LV2_EXTENDED
 	}
-	pthread_mutex_unlock (&self->bp_lock);
 
-	if (chn == 0) {
-		return false;
+	if (chn > 0 && chn < 16) {
+		/* fill remaining channels */
+		fluid_sfont_iteration_start (sfont);
+		fluid_preset_t* preset = fluid_sfont_iteration_next (sfont);
+		for (;chn < 16; ++chn) {
+			fluid_synth_program_select (self->synth, chn, synth_id,
+			                            fluid_preset_get_banknum (preset), fluid_preset_get_num (preset));
+		}
 	}
 
-	return true;
+	pthread_mutex_unlock (&self->bp_lock);
+
+	return chn > 0;
 }
 
 static const LV2_Atom*
@@ -472,6 +486,7 @@ instantiate (const LV2_Descriptor*     descriptor,
 	self->queue_retune       = false;
 	for (int chn = 0; chn < 16; ++chn) {
 		self->program_state[chn].program = -1;
+		self->program_state[chn].user_set = false;
 	}
 
 	lv2_atom_forge_init (&self->forge, map);
@@ -676,8 +691,9 @@ run (LV2_Handle instance, uint32_t n_samples)
 				int chn = fluid_midi_event_get_channel (self->fmidi_event);
 				assert (chn >= 0 && chn < 16);
 				self->program_state[chn].program = data[1];
+				self->program_state[chn].user_set = true;
 #ifdef LV2_EXTENDED
-				if (self->bankpatch) {
+				if (self->bankpatch && self->initialized) {
 					self->bankpatch->notify (self->bankpatch->handle, chn,
 					                         self->program_state[chn].bank,
 					                         self->program_state[chn].program < 0 ? 255 : self->program_state[chn].program);
@@ -798,7 +814,7 @@ work_response (LV2_Handle  instance,
 		strcpy (self->current_sf2_file_path, self->queue_sf2_file_path);
 
 		for (int chn = 0; chn < 16; ++chn) {
-			if (self->program_state[chn].program < 0) {
+			if (self->program_state[chn].program < 0 || !self->program_state[chn].user_set) {
 				continue;
 			}
 			/* cannot direcly call fluid_channel_set_bank_msb/fluid_channel_set_bank_lsb, use CCs */
@@ -823,6 +839,8 @@ work_response (LV2_Handle  instance,
 			if (FLUID_OK == fluid_synth_get_program (self->synth, chn, &sfid, &bank, &program)) {
 				self->program_state[chn].bank    = bank;
 				self->program_state[chn].program = program;
+			} else {
+				self->program_state[chn].program = -1;
 			}
 		}
 		if (self->queue_retune) {
diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc
index f7e34cfec6..a3117ec4a3 100644
--- a/libs/surfaces/cc121/cc121.cc
+++ b/libs/surfaces/cc121/cc121.cc
@@ -69,7 +69,7 @@ using namespace std;
 
 #include "pbd/i18n.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 CC121::CC121 (Session& s)
 	: ControlProtocol (s, _("Steinberg CC121"))
diff --git a/libs/surfaces/console1/console1.cc b/libs/surfaces/console1/console1.cc
index 6269cf88d0..84336229be 100644
--- a/libs/surfaces/console1/console1.cc
+++ b/libs/surfaces/console1/console1.cc
@@ -18,7 +18,7 @@
 
 #include <optional>
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 #include "pbd/controllable.h"
 #include "pbd/i18n.h"
 
diff --git a/libs/surfaces/contourdesign/contourdesign.cc b/libs/surfaces/contourdesign/contourdesign.cc
index 21f13d856f..793e15547d 100644
--- a/libs/surfaces/contourdesign/contourdesign.cc
+++ b/libs/surfaces/contourdesign/contourdesign.cc
@@ -38,7 +38,7 @@ using namespace Glib;
 using namespace std;
 using namespace ArdourSurface;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 static const uint16_t ContourDesign = 0x0b33;
 static const uint16_t ShuttlePRO_id = 0x0010;
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc
index 5e298c4e59..e9d569768b 100644
--- a/libs/surfaces/faderport/faderport.cc
+++ b/libs/surfaces/faderport/faderport.cc
@@ -63,7 +63,7 @@ using namespace std;
 
 #include "pbd/i18n.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 FaderPort::FaderPort (Session& s)
 	: MIDISurface (s, X_("PreSonus FaderPort"), X_("FaderPort"), false)
diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 7854acb8da..f962a9458e 100644
--- a/libs/surfaces/faderport8/faderport8.cc
+++ b/libs/surfaces/faderport8/faderport8.cc
@@ -62,7 +62,7 @@ using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
 
 #include "pbd/i18n.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #ifndef NDEBUG
 //#define VERBOSE_DEBUG
diff --git a/libs/surfaces/frontier/kernel_drivers/BUILD b/libs/surfaces/frontier/kernel_drivers/BUILD
deleted file mode 100644
index dc612e20bf..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 223fcdb6fc..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 51b4af0f2e..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/README
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 651517a7f2..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/doc/keycodes.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<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
deleted file mode 100644
index 534bc7da4b..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tests/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
deleted file mode 100644
index f9efd18f69..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tests/README
+++ /dev/null
@@ -1,104 +0,0 @@
-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
deleted file mode 100644
index 480c49c7b6..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tests/tranzport.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * 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
deleted file mode 100644
index f116c50a74..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tests/tranzport_lights.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * 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
deleted file mode 100755
index 540c62fe16..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tests/tranzport_tests.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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
deleted file mode 100644
index 0be632529e..0000000000
--- a/libs/surfaces/frontier/kernel_drivers/tranzport.c
+++ /dev/null
@@ -1,1070 +0,0 @@
-/*
- * Copyright (C) 2008-2015 Paul Davis <paul@linuxaudiosystems.com>
- *
- * 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 drive
- * Copyright (C) 2003 David Glance <advidgsf@sourceforge.net>
- * Copyright (C) 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 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * 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 ::g_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 initialize 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
deleted file mode 100644
index aafb9aaa57..0000000000
--- a/libs/surfaces/frontier/tests/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
deleted file mode 100644
index f9efd18f69..0000000000
--- a/libs/surfaces/frontier/tests/README
+++ /dev/null
@@ -1,104 +0,0 @@
-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
deleted file mode 100644
index 1eeacd6578..0000000000
--- a/libs/surfaces/frontier/tests/tranzport.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 07867d6dd0..0000000000
--- a/libs/surfaces/frontier/tests/tranzport_lights.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * 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/interface.cc b/libs/surfaces/frontier/tranzport/interface.cc
deleted file mode 100644
index b76c113b8a..0000000000
--- a/libs/surfaces/frontier/tranzport/interface.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2008-2015 Paul Davis <paul@linuxaudiosystems.com>
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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",
-	module : 0,
-	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
deleted file mode 100644
index dd03f7814d..0000000000
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
+++ /dev/null
@@ -1,1947 +0,0 @@
-/*
- * Copyright (C) 2007-2017 Paul Davis <paul@linuxaudiosystems.com>
- * Copyright (C) 2009-2010 David Robillard <d@drobilla.net>
- * Copyright (C) 2010-2011 Carl Hetherington <carl@carlh.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; 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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/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 "pbd/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_samples;
-	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[22];
-	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 (samplepos_t where)
-{
-	if ((where != last_where) || lcd_isdamaged(1,9,8)) {
-		char buf[16];
-		Temporal::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 ()
-{
-	show_bbt (session->transport_sample ());
-}
-
-void
-TranzportControlProtocol::show_smpte (samplepos_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.samples);
-		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::notify_gui_about_thread_creation ("gui", 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]) {
-		std::shared_ptr<AudioTrack> at = std::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 (get_transport_speed() < 0) {
-			session->request_transport_speed (1.0);
-		} else {
-			session->request_transport_speed_nonzero (get_transport_speed() + 0.1);
-		}
-	} else {
-		if (get_transport_speed() > 0) {
-			session->request_transport_speed (-1.0);
-		} else {
-			session->request_transport_speed_nonzero (get_transport_speed() - 0.1);
-		}
-	}
-	session->request_roll ();
-}
-
-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 () const
-{
-	return ControlProtocol::get_state();
-}
-
-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
deleted file mode 100644
index 335c6b440b..0000000000
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
+++ /dev/null
@@ -1,320 +0,0 @@
-
-#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/threads.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 () const;
-	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::Threads::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_samples;
-	samplepos_t     last_where;
-	ARDOUR::gain_t last_track_gain;
-	uint32_t       last_meter_fill;
-	uint64_t       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 (samplepos_t where);
-	void show_smpte (samplepos_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/frontier/wscript b/libs/surfaces/frontier/wscript
deleted file mode 100644
index 7acc191129..0000000000
--- a/libs/surfaces/frontier/wscript
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-import os
-
-def options(opt):
-    pass
-
-def configure(conf):
-    pass
-
-def build(bld):
-    # Generic MIDI
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = '''
-            generic_midi_control_protocol.cc
-            interface.cc
-            midicontrollable.cc
-    '''
-    obj.defines      = [ 'PACKAGE="ardour_frontier"' ]
-    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
-    obj.includes     = ['.', './generic_midi']
-    obj.name         = 'libgeneric_midi'
-    obj.target       = 'generic_midi'
-    obj.uselib       = 'XML OSX'
-    obj.use          = 'libardour libardourcp'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index c1bf68a5bb..08e88716d1 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -66,7 +66,7 @@
 #include "midifunction.h"
 #include "midiaction.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #include "pbd/i18n.h"
 
diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.cc b/libs/surfaces/launch_control_xl/launch_control_xl.cc
index af77e5f225..732cc344fa 100644
--- a/libs/surfaces/launch_control_xl/launch_control_xl.cc
+++ b/libs/surfaces/launch_control_xl/launch_control_xl.cc
@@ -65,7 +65,7 @@ using namespace std;
 using namespace PBD;
 using namespace Glib;
 using namespace ArdourSurface;
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 /* init global object */
 LaunchControlXL* lcxl = 0;
diff --git a/libs/surfaces/launch_control_xl/midi_byte_array.h b/libs/surfaces/launch_control_xl/midi_byte_array.h
index c7d66c1b44..957c8f0e05 100644
--- a/libs/surfaces/launch_control_xl/midi_byte_array.h
+++ b/libs/surfaces/launch_control_xl/midi_byte_array.h
@@ -21,8 +21,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/shared_array.hpp>
-
 //#include <midi++/types.h>
 namespace MIDI {
 	typedef unsigned char byte;
diff --git a/libs/surfaces/launchkey_4/launchkey_4.cc b/libs/surfaces/launchkey_4/launchkey_4.cc
index ab5dfe218e..b03f52ad7b 100644
--- a/libs/surfaces/launchkey_4/launchkey_4.cc
+++ b/libs/surfaces/launchkey_4/launchkey_4.cc
@@ -78,7 +78,7 @@ using namespace ArdourSurface;
 using namespace ArdourSurface::LAUNCHPAD_NAMESPACE;
 using namespace Gtkmm2ext;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 /* USB IDs */
 
diff --git a/libs/surfaces/launchpad_pro/lppro.cc b/libs/surfaces/launchpad_pro/lppro.cc
index 913bfc17e2..e9ee1ca58d 100644
--- a/libs/surfaces/launchpad_pro/lppro.cc
+++ b/libs/surfaces/launchpad_pro/lppro.cc
@@ -73,7 +73,7 @@ using namespace Glib;
 using namespace ArdourSurface;
 using namespace Gtkmm2ext;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #define NOVATION          0x1235
 #define LAUNCHPADPROMK3   0x0123
diff --git a/libs/surfaces/launchpad_pro/wscript b/libs/surfaces/launchpad_pro/wscript
index 4586eca48c..4c6bb57a7c 100644
--- a/libs/surfaces/launchpad_pro/wscript
+++ b/libs/surfaces/launchpad_pro/wscript
@@ -12,9 +12,9 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
-	lppro.cc
-	interface.cc
-	gui.cc
+        lppro.cc
+        interface.cc
+        gui.cc
     '''
     obj.defines      = [ 'PACKAGE="ardour_launchpad_pro"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
diff --git a/libs/surfaces/launchpad_x/lpx.cc b/libs/surfaces/launchpad_x/lpx.cc
index c2393f6df7..e21f9bf970 100644
--- a/libs/surfaces/launchpad_x/lpx.cc
+++ b/libs/surfaces/launchpad_x/lpx.cc
@@ -80,7 +80,7 @@ using namespace ArdourSurface;
 using namespace ArdourSurface::LAUNCHPAD_NAMESPACE;
 using namespace Gtkmm2ext;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #define NOVATION     0x1235
 
diff --git a/libs/surfaces/launchpad_x/wscript b/libs/surfaces/launchpad_x/wscript
index f5588ce632..4473ed1f91 100644
--- a/libs/surfaces/launchpad_x/wscript
+++ b/libs/surfaces/launchpad_x/wscript
@@ -5,7 +5,7 @@ import os
 lpxm_sources = [
     'lpx.cc',
     'gui.cc',
-]    
+]
 
 def options(opt):
     pass
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 61d8f70807..8168717461 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -35,7 +35,6 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <boost/shared_array.hpp>
 #include <glibmm/miscutils.h>
 
 #include "midi++/types.h"
@@ -98,7 +97,7 @@ using namespace ArdourSurface::MACKIE_NAMESPACE;
 
 #include "pbd/i18n.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_OPTION = 0x1;
 const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_CONTROL = 0x2;
diff --git a/libs/surfaces/mackie/midi_byte_array.h b/libs/surfaces/mackie/midi_byte_array.h
index 99497ad2d9..15711eae74 100644
--- a/libs/surfaces/mackie/midi_byte_array.h
+++ b/libs/surfaces/mackie/midi_byte_array.h
@@ -22,8 +22,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/shared_array.hpp>
-
 //#include <midi++/types.h>
 namespace MIDI {
 	typedef unsigned char byte;
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
index f268b6f55e..695a716944 100644
--- a/libs/surfaces/mackie/surface_port.cc
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -25,7 +25,6 @@
 #include <cerrno>
 
 #include <sigc++/sigc++.h>
-#include <boost/shared_array.hpp>
 
 #include "pbd/failed_constructor.h"
 
diff --git a/libs/surfaces/mackie/timer.h b/libs/surfaces/mackie/timer.h
index 4d25ec6ce7..6afda5ed33 100644
--- a/libs/surfaces/mackie/timer.h
+++ b/libs/surfaces/mackie/timer.h
@@ -25,6 +25,8 @@
 
 #include "types.h"
 
+#include <cstdint>
+
 namespace ArdourSurface { namespace MACKIE_NAMESPACE {
 
 /**
diff --git a/libs/surfaces/maschine2/images.h b/libs/surfaces/maschine2/images.h
index 99ff7486d0..28736b5cde 100644
--- a/libs/surfaces/maschine2/images.h
+++ b/libs/surfaces/maschine2/images.h
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <cstdint>
+
 static const uint8_t maschine_png[] = {
   0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
   0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x40,
diff --git a/libs/surfaces/maschine2/m2_pad.h b/libs/surfaces/maschine2/m2_pad.h
index e93084ad34..55722cc40b 100644
--- a/libs/surfaces/maschine2/m2_pad.h
+++ b/libs/surfaces/maschine2/m2_pad.h
@@ -22,6 +22,8 @@
 #include <stdint.h>
 #include "pbd/signals.h"
 
+#include <cmath>
+
 namespace ArdourSurface {
 
 class M2PadInterface
@@ -106,7 +108,7 @@ class M2Pad : public M2PadInterface
 					released (); /* EMIT SIGNAL */
 					event (_pressure, true); /* EMIT SIGNAL */
 				} else {
-					if (fabsf (_last - _pressure) > mindelta) {
+					if (std::fabsf (_last - _pressure) > mindelta) {
 						_last = _pressure;
 						aftertouch (_pressure); /* EMIT SIGNAL */
 						event (_pressure, false); /* EMIT SIGNAL */
diff --git a/libs/surfaces/maschine2/m2device.h b/libs/surfaces/maschine2/m2device.h
index 0690325049..ef8756c99e 100644
--- a/libs/surfaces/maschine2/m2device.h
+++ b/libs/surfaces/maschine2/m2device.h
@@ -24,6 +24,8 @@
 #include <cairomm/surface.h>
 #include "pbd/signals.h"
 
+#include <cmath>
+
 namespace ArdourSurface {
 
 class M2Contols;
@@ -63,7 +65,7 @@ class M2Device
 	protected:
 		void bump_blink () {
 			_blink_counter = (_blink_counter + 1) % 12;
-			_blink_shade = fabsf (1.f - _blink_counter / 6.f);
+			_blink_shade = std::fabsf (1.f - _blink_counter / 6.f);
 		}
 
 		uint32_t _splashcnt;
diff --git a/libs/surfaces/maschine2/maschine2.cc b/libs/surfaces/maschine2/maschine2.cc
index 616f3eab2e..114cf5f74e 100644
--- a/libs/surfaces/maschine2/maschine2.cc
+++ b/libs/surfaces/maschine2/maschine2.cc
@@ -42,7 +42,7 @@
 
 #include "canvas.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template, includes i18n
+#include "pbd/abstract_ui.inc.cc" // instantiate template, includes i18n
 
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/libs/surfaces/maschine2/ui_menu.h b/libs/surfaces/maschine2/ui_menu.h
index e71a38c5d6..57ac3d9f1e 100644
--- a/libs/surfaces/maschine2/ui_menu.h
+++ b/libs/surfaces/maschine2/ui_menu.h
@@ -24,6 +24,7 @@
 
 #include "pbd/signals.h"
 #include "canvas/container.h"
+#include "canvas/rectangle.h"
 
 namespace ArdourCanvas {
 	class Text;
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 78f3e1943d..de1246074f 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -84,7 +84,7 @@ using namespace std;
 using namespace Glib;
 using namespace ArdourSurface;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 OSC* OSC::_instance = 0;
 
diff --git a/libs/surfaces/osc/osc_cue_observer.cc b/libs/surfaces/osc/osc_cue_observer.cc
index a4c86d2252..0774f3c70f 100644
--- a/libs/surfaces/osc/osc_cue_observer.cc
+++ b/libs/surfaces/osc/osc_cue_observer.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2017-2018 Len Ovens <len@ovenwerks.net>
+ * Copyright (C) 2024 Robin Gareus <robin@gareus.org>
  *
  * 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
@@ -90,12 +91,12 @@ OSCCueObserver::refresh_strip (std::shared_ptr<ARDOUR::Stripable> new_strip, Sor
 	_strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::name_changed, this,_1, 0), OSC::instance());
 	name_changed (ARDOUR::Properties::name, 0);
 
-	_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_change_message, this, X_("/cue/mute"), 0, _strip->mute_control()), OSC::instance());
+	_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_change_message, this, X_("/cue/mute"), 0, std::weak_ptr<Controllable>(_strip->mute_control())), OSC::instance());
 	send_change_message (X_("/cue/mute"), 0, _strip->mute_control());
 
-	gain_timeout.push_back (0);
-	_last_gain.push_back (-1.0);
-	_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control(), false), OSC::instance());
+	gain_timeout[0] = 0;
+	_last_gain[0] = -1; // unused
+	_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, 0, std::weak_ptr<Controllable>(_strip->gain_control()), false), OSC::instance());
 	send_gain_message (0, _strip->gain_control(), true);
 
 	send_init ();
@@ -161,15 +162,16 @@ OSCCueObserver::send_init()
 
 
 			if (send->gain_control()) {
-				gain_timeout.push_back (0);
-				_last_gain.push_back (-1.0);
-				send->gain_control()->Changed.connect (send_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, i + 1, send->gain_control(), false), OSC::instance());
+				gain_timeout[i + 1] = 0;
+				_last_gain[i + 1] = -1.0;
+				send->gain_control()->Changed.connect (send_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_gain_message, this, i + 1, std::weak_ptr<Controllable>(send->gain_control()), false), OSC::instance());
 				send_gain_message (i + 1, send->gain_control(), true);
 			}
 
 			std::shared_ptr<Processor> proc = std::dynamic_pointer_cast<Processor> (send);
-				proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_enabled_message, this, X_("/cue/send/enable"), i + 1, proc), OSC::instance());
-				send_enabled_message (X_("/cue/send/enable"), i + 1, proc);
+			std::weak_ptr<Processor> wproc (proc);
+			proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, std::bind (&OSCCueObserver::send_enabled_message, this, X_("/cue/send/enable"), i + 1, wproc), OSC::instance());
+			send_enabled_message (X_("/cue/send/enable"), i + 1, wproc);
 		}
 	}
 
@@ -218,8 +220,12 @@ OSCCueObserver::name_changed (const PBD::PropertyChange& what_changed, uint32_t
 }
 
 void
-OSCCueObserver::send_change_message (string path, uint32_t id, std::shared_ptr<Controllable> controllable)
+OSCCueObserver::send_change_message (string path, uint32_t id, std::weak_ptr<Controllable> weak_controllable)
 {
+	std::shared_ptr<Controllable> controllable = weak_controllable.lock ();
+	if (!controllable) {
+		return;
+	}
 	if (id) {
 		path = string_compose("%1/%2", path, id);
 	}
@@ -228,18 +234,20 @@ OSCCueObserver::send_change_message (string path, uint32_t id, std::shared_ptr<C
 }
 
 void
-OSCCueObserver::send_gain_message (uint32_t id,  std::shared_ptr<Controllable> controllable, bool force)
+OSCCueObserver::send_gain_message (uint32_t id,  std::weak_ptr<Controllable> weak_controllable, bool force)
 {
+	std::shared_ptr<Controllable> controllable = weak_controllable.lock ();
+	if (!controllable) {
+		return;
+	}
 	if (_last_gain[id] != controllable->get_value()) {
 		_last_gain[id] = controllable->get_value();
 	} else {
 		return;
 	}
 	if (id) {
-		_osc.text_message_with_id (X_("/cue/send/name"), id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), true, addr);
 		_osc.float_message_with_id (X_("/cue/send/fader"), id, controllable->internal_to_interface (controllable->get_value()), true, addr);
 	} else {
-		_osc.text_message (X_("/cue/name"), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
 		_osc.float_message (X_("/cue/fader"), controllable->internal_to_interface (controllable->get_value()), addr);
 	}
 
@@ -247,8 +255,12 @@ OSCCueObserver::send_gain_message (uint32_t id,  std::shared_ptr<Controllable> c
 }
 
 void
-OSCCueObserver::send_enabled_message (std::string path, uint32_t id, std::shared_ptr<ARDOUR::Processor> proc)
+OSCCueObserver::send_enabled_message (std::string path, uint32_t id, std::weak_ptr<ARDOUR::Processor> weak_proc)
 {
+	std::shared_ptr<ARDOUR::Processor> proc = weak_proc.lock ();
+	if (!proc) {
+		return;
+	}
 	if (id) {
 		_osc.float_message_with_id (path, id, (float) proc->enabled(), true, addr);
 	} else {
diff --git a/libs/surfaces/osc/osc_cue_observer.h b/libs/surfaces/osc/osc_cue_observer.h
index dfe13651da..0243e76c3b 100644
--- a/libs/surfaces/osc/osc_cue_observer.h
+++ b/libs/surfaces/osc/osc_cue_observer.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2017-2018 Len Ovens <len@ovenwerks.net>
+ * Copyright (C) 2024 Robin Gareus <robin@gareus.org>
  *
  * 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
@@ -19,6 +20,8 @@
 #ifndef __osc_osccueobserver_h__
 #define __osc_osccueobserver_h__
 
+#include "osc.h"
+
 #include <string>
 #include <memory>
 
@@ -57,14 +60,14 @@ class OSCCueObserver
 	ArdourSurface::OSC::OSCSurface* sur;
 	float _last_meter;
 	float _last_signal;
-	std::vector<uint32_t> gain_timeout;
+	std::map<uint32_t,float> gain_timeout;
 	bool tick_enable;
-	std::vector<float> _last_gain;
+	std::map<uint32_t,float> _last_gain;
 
 	void name_changed (const PBD::PropertyChange& what_changed, uint32_t id);
-	void send_change_message (std::string path, uint32_t id, std::shared_ptr<PBD::Controllable> controllable);
-	void send_gain_message (uint32_t id, std::shared_ptr<PBD::Controllable> controllable, bool force);
-	void send_enabled_message (std::string path, uint32_t id, std::shared_ptr<ARDOUR::Processor> proc);
+	void send_change_message (std::string path, uint32_t id, std::weak_ptr<PBD::Controllable> controllable);
+	void send_gain_message (uint32_t id, std::weak_ptr<PBD::Controllable> controllable, bool force);
+	void send_enabled_message (std::string path, uint32_t id, std::weak_ptr<ARDOUR::Processor> proc);
 	void send_init (void);
 	void send_end (uint32_t new_sends_size);
 	void send_restart (void);
diff --git a/libs/surfaces/osc/osc_global_observer.h b/libs/surfaces/osc/osc_global_observer.h
index a9fa201a3c..4c08ae6e0c 100644
--- a/libs/surfaces/osc/osc_global_observer.h
+++ b/libs/surfaces/osc/osc_global_observer.h
@@ -19,6 +19,8 @@
 #ifndef __osc_oscglobalobserver_h__
 #define __osc_oscglobalobserver_h__
 
+#include "osc.h"
+
 #include <memory>
 #include <string>
 
@@ -27,6 +29,9 @@
 
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
+
+#include "ardour/route_group.h"
+#include "ardour/session.h"
 #include "ardour/types.h"
 
 class OSCGlobalObserver
diff --git a/libs/surfaces/osc/osc_gui.h b/libs/surfaces/osc/osc_gui.h
index a78935953b..ed5d2bfab1 100644
--- a/libs/surfaces/osc/osc_gui.h
+++ b/libs/surfaces/osc/osc_gui.h
@@ -18,6 +18,10 @@
 #ifndef osc_gui_h
 #define osc_gui_h
 
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/spinbutton.h>
 
 #include "osc.h"
 
diff --git a/libs/surfaces/osc/osc_select_observer.h b/libs/surfaces/osc/osc_select_observer.h
index 0206bec2c6..9691d3fe53 100644
--- a/libs/surfaces/osc/osc_select_observer.h
+++ b/libs/surfaces/osc/osc_select_observer.h
@@ -28,8 +28,10 @@
 
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
-#include "ardour/types.h"
+
 #include "ardour/processor.h"
+#include "ardour/route_group.h"
+#include "ardour/types.h"
 
 #include "osc.h"
 
diff --git a/libs/surfaces/push2/follow_action.h b/libs/surfaces/push2/follow_action.h
index 3c4e6d18d4..03ddcef793 100644
--- a/libs/surfaces/push2/follow_action.h
+++ b/libs/surfaces/push2/follow_action.h
@@ -25,8 +25,12 @@
  * correctly.
  */
 
+#include "ardour/triggerbox.h"
+
 #include "canvas/rectangle.h"
 
+#include <pangomm/fontdescription.h>
+
 namespace ArdourCanvas  {
 
 class FollowActionIcon : public ArdourCanvas::Rectangle
diff --git a/libs/surfaces/push2/level_meter.h b/libs/surfaces/push2/level_meter.h
index 227d63bccc..a420c2c6c0 100644
--- a/libs/surfaces/push2/level_meter.h
+++ b/libs/surfaces/push2/level_meter.h
@@ -23,6 +23,9 @@
 #include "canvas/container.h"
 #include "canvas/meter.h"
 
+#include "ardour/chan_count.h"
+#include "ardour/types.h"
+
 namespace ARDOUR {
 	class PeakMeter;
 }
diff --git a/libs/surfaces/push2/midi_byte_array.h b/libs/surfaces/push2/midi_byte_array.h
index e336399849..01a9302e65 100644
--- a/libs/surfaces/push2/midi_byte_array.h
+++ b/libs/surfaces/push2/midi_byte_array.h
@@ -21,8 +21,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/shared_array.hpp>
-
 //#include <midi++/types.h>
 namespace MIDI {
 	typedef unsigned char byte;
diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc
index c7f45fc1ff..c666cc9be2 100644
--- a/libs/surfaces/push2/push2.cc
+++ b/libs/surfaces/push2/push2.cc
@@ -74,7 +74,7 @@ using namespace Glib;
 using namespace ArdourSurface;
 using namespace Gtkmm2ext;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #define ABLETON 0x2982
 #define PUSH2   0x1967
diff --git a/libs/surfaces/push2/scale.h b/libs/surfaces/push2/scale.h
index 67e0a2b7cf..8a6cb193ff 100644
--- a/libs/surfaces/push2/scale.h
+++ b/libs/surfaces/push2/scale.h
@@ -22,9 +22,11 @@
 #include <vector>
 
 #include "layout.h"
+#include "push2.h"
 
 namespace ArdourCanvas {
 	class Rectangle;
+	class Text;
 }
 
 namespace ArdourSurface {
diff --git a/libs/surfaces/push2/track_mix.h b/libs/surfaces/push2/track_mix.h
index 69f4f7f356..f6b564ec44 100644
--- a/libs/surfaces/push2/track_mix.h
+++ b/libs/surfaces/push2/track_mix.h
@@ -21,7 +21,10 @@
 
 #include <vector>
 
+#include "pbd/property_basics.h"
+
 #include "layout.h"
+#include "push2.h"
 
 namespace ARDOUR {
 	class Stripable;
diff --git a/libs/surfaces/tranzport/README b/libs/surfaces/tranzport/README
deleted file mode 100644
index e2d37c84bf..0000000000
--- a/libs/surfaces/tranzport/README
+++ /dev/null
@@ -1,90 +0,0 @@
-
-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/TODO b/libs/surfaces/tranzport/TODO
deleted file mode 100644
index 216a5bc9d0..0000000000
--- a/libs/surfaces/tranzport/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 308430af68..0000000000
--- a/libs/surfaces/tranzport/bling.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *   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
deleted file mode 100644
index eeb16d702a..0000000000
--- a/libs/surfaces/tranzport/button_events.cc
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- *   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 "pbd/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_sample 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(get_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
deleted file mode 100644
index 56d6d379cf..0000000000
--- a/libs/surfaces/tranzport/button_yn.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index a35f025489..0000000000
--- a/libs/surfaces/tranzport/buttons.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *   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
deleted file mode 100644
index dd5f33a441..0000000000
--- a/libs/surfaces/tranzport/general.cc
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *   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 "pbd/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]) {
-		std::shared_ptr<AudioTrack> at = std::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]       = session->config.get_punch_in() || session->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_sample());
-
-	if (location) {
-		session->request_locate (location->start());
-		notify(location->name().c_str());
-	} else {
-		session->goto_start ();
-		notify("START");
-	}
-
-}
-
-void
-TranzportControlProtocol::next_marker ()
-{
-	Location *location = session->locations()->first_location_after (session->transport_sample());
-
-	if (location) {
-		session->request_locate (location->start());
-		notify(location->name().c_str());
-	} else {
-		session->request_locate (session->current_end_sample());
-		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
deleted file mode 100644
index 56501b2c2c..0000000000
--- a/libs/surfaces/tranzport/init.cc
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *   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 "pbd/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)
-{
-	char *a = (char*) alloca(4096*2); a[0] = 'a'; a[4096] = 'b';
-	// 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 (set_thread_priority (SCHED_FIFO, priority)) {
-		PBD::info << string_compose (_("%1: thread not running with realtime scheduling."), 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, _monitor_work, this) == 0) {
-				_active = true;
-			} 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); }
-			}
-
-			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_samples;
-	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;
-
-	register_thread (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
deleted file mode 100644
index c2132980bd..0000000000
--- a/libs/surfaces/tranzport/interface.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *   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;
-
-static ControlProtocol*
-new_tranzport_protocol (Session* s)
-{
-	TranzportControlProtocol* tcp = new TranzportControlProtocol (*s);
-
-	if (tcp->set_active (true)) {
-		delete tcp;
-		return 0;
-	}
-
-	return tcp;
-
-}
-
-static void
-delete_tranzport_protocol (ControlProtocol* cp)
-{
-	delete cp;
-}
-
-static ControlProtocolDescriptor tranzport_descriptor = {
-	/* name       */ "Tranzport",
-	/* id         */ "uri://ardour.org/surfaces/tranzport:0",
-	/* module     */ 0,
-	/* available  */ TranzportControlProtocol::available,
-	/* probe_port */ 0,
-	/* match usb  */ 0,
-	/* initialize */ new_tranzport_protocol,
-	/* destroy    */ delete_tranzport_protocol,
-};
-
-
-extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &tranzport_descriptor; }
-
-
diff --git a/libs/surfaces/tranzport/io.cc b/libs/surfaces/tranzport/io.cc
deleted file mode 100644
index 3fe1b554ca..0000000000
--- a/libs/surfaces/tranzport/io.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 6c2bc37922..0000000000
--- a/libs/surfaces/tranzport/io_kernel.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *   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
deleted file mode 100644
index b484ef79d5..0000000000
--- a/libs/surfaces/tranzport/io_midi.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 467814d31a..0000000000
--- a/libs/surfaces/tranzport/io_usb.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *   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 "pbd/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::available ()
-{
-	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
deleted file mode 100644
index 7e9e03c8f2..0000000000
--- a/libs/surfaces/tranzport/lcd.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 89cf107ace..0000000000
--- a/libs/surfaces/tranzport/lights.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 5adc387a40..0000000000
--- a/libs/surfaces/tranzport/meter.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index cc45c785ca..0000000000
--- a/libs/surfaces/tranzport/mode.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 527dd17c95..0000000000
--- a/libs/surfaces/tranzport/mode_loop.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 2d2a99adaf..0000000000
--- a/libs/surfaces/tranzport/mode_tuner.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 9fd064a3b1..0000000000
--- a/libs/surfaces/tranzport/panner.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *   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
deleted file mode 100644
index aa88817300..0000000000
--- a/libs/surfaces/tranzport/screen.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *   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 <cstring>
-#include <tranzport_control_protocol.h>
-#include <cstring>
-
-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
deleted file mode 100644
index 624303888a..0000000000
--- a/libs/surfaces/tranzport/show.cc
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- *   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 "pbd/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(get_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[20] = '\0';
-
-	print (0, 0, buf);
-	print (1, 0, buf);
-}
-
-void
-TranzportControlProtocol::show_bbt (samplepos_t where)
-{
-	if (where != last_where) {
-		char buf[16];
-		Temporal::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(get_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 ()
-{
-	show_bbt (session->transport_sample ());
-}
-
-void
-TranzportControlProtocol::show_timecode (samplepos_t where)
-{
-	if ((where != last_where) || lcd_isdamaged(1,9,10)) {
-
-		char buf[5];
-		Timecode::Time timecode;
-
-		session->timecode_time (where, timecode);
-
-		if (timecode.negative) {
-			sprintf (buf, "-%02" PRIu32 ":", timecode.hours);
-		} else {
-			sprintf (buf, " %02" PRIu32 ":", timecode.hours);
-		}
-		print (1, 8, buf);
-
-		sprintf (buf, "%02" PRIu32 ":", timecode.minutes);
-		print (1, 12, buf);
-
-		sprintf (buf, "%02" PRIu32 ":", timecode.seconds);
-		print (1, 15, buf);
-
-		sprintf (buf, "%02" PRIu32, timecode.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
deleted file mode 100644
index c85930001d..0000000000
--- a/libs/surfaces/tranzport/slider_gain.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 3e86c0d7a8..0000000000
--- a/libs/surfaces/tranzport/state.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *   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 "pbd/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 () const
-{
-	return ControlProtocol::get_state();
-}
-
-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
deleted file mode 100644
index 84a5b680a8..0000000000
--- a/libs/surfaces/tranzport/tranzport_base.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *   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
-
-#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
deleted file mode 100644
index a0fe13d02b..0000000000
--- a/libs/surfaces/tranzport/tranzport_common.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *   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/rc_configuration.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
deleted file mode 100644
index 2353071aa9..0000000000
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-  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/threads.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 available ();
-
-	XMLNode& get_state () const;
-	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
-
-	int             last_read_error;
-
-	uint32_t        buttonmask;
-	uint32_t        timeout;
-	uint32_t        inflight;
-	uint32_t        current_track_id;
-	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::Threads::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_samples;
-	samplepos_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 (samplepos_t where);
-	void show_timecode (samplepos_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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_automation.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_bigmeter.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_bling.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_bus.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_config.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index a350c08687..0000000000
--- a/libs/surfaces/tranzport/view_layer.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_loop.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_manymeter.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_marker.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_master.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_plugins.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_std.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_tempo.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index ad9befd9b9..0000000000
--- a/libs/surfaces/tranzport/view_tuner.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *   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
deleted file mode 100644
index 9f193c5c5d..0000000000
--- a/libs/surfaces/tranzport/wheel.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *   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 "pbd/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 ();
-		}
-
-		last_wheel_motion = 0;
-
-	} else if ((buttonmask & ButtonPrev) || (buttonmask & ButtonNext)) {
-
-		if (_datawheel < WheelDirectionThreshold) {
-			next_marker ();
-		} else {
-			prev_marker ();
-		}
-
-		last_wheel_motion = 0;
-
-	} 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;
-
-			}
-		}
-
-		last_wheel_motion = 0;
-
-	} 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;
-	uint64_t now;
-	int dir;
-
-	now = g_get_monotonic_time();
-
-	if (_datawheel < WheelDirectionThreshold) {
-		dir = 1;
-	} else {
-		dir = -1;
-	}
-
-	if (dir != last_wheel_dir) {
-		/* changed direction, start over */
-		speed = 0.1f;
-	} else {
-		if (last_wheel_motion != 0) {
-			/* 10 clicks per second => speed == 1.0 */
-
-			speed = 100000.0f / (float) (now - last_wheel_motion)
-
-		} 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 (get_transport_speed() < 0) {
-			session->request_transport_speed (1.0);
-		} else {
-			session->request_transport_speed_nonzero (get_transport_speed() + 0.1);
-		}
-	} else {
-		if (session->get_transport_speed() > 0) {
-			session->request_transport_speed (-1.0);
-		} else {
-			session->request_transport_speed_nonzero (get_transport_speed() - 0.1);
-		}
-	}
-	session->request_roll ();
-}
diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc
deleted file mode 100644
index f235c1f348..0000000000
--- a/libs/surfaces/tranzport/wheel_modes.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *   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/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 "pbd/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(get_transport_speed() != 0) {
-	//    if session-transport_speed() < 1.0) show_big_bar/beat
-	//    if ? greater. dont
-
-	if(get_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());
-	}
-}
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
deleted file mode 100644
index f58a8acc95..0000000000
--- a/libs/surfaces/tranzport/wscript
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-import os
-
-def options(opt):
-    pass
-
-def configure(conf):
-    pass
-
-def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = '''
-            button_events.cc
-            buttons.cc
-            general.cc
-            init.cc
-            interface.cc
-            io.cc
-            io_usb.cc
-            lcd.cc
-            lights.cc
-            mode.cc
-            panner.cc
-            screen.cc
-            show.cc
-            state.cc
-            wheel.cc
-            wheel_modes.cc
-    '''
-    obj.defines      = [ 'PACKAGE="ardour_tranzport"' ]
-    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
-    obj.includes     = ['.', './tranzport']
-    obj.name         = 'libardour_tranzport'
-    obj.target       = 'ardour_tranzport'
-    obj.uselib       = 'XML OSX'
-    obj.use          = 'libardour libardour_cp'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
diff --git a/libs/surfaces/us2400/gui.h b/libs/surfaces/us2400/gui.h
index ff6ca5088e..22eb347ef2 100644
--- a/libs/surfaces/us2400/gui.h
+++ b/libs/surfaces/us2400/gui.h
@@ -20,9 +20,11 @@
 #include <vector>
 
 #include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
+#include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/notebook.h>
diff --git a/libs/surfaces/us2400/midi_byte_array.h b/libs/surfaces/us2400/midi_byte_array.h
index 0f4469c8df..b1ecdc63cf 100644
--- a/libs/surfaces/us2400/midi_byte_array.h
+++ b/libs/surfaces/us2400/midi_byte_array.h
@@ -21,8 +21,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/shared_array.hpp>
-
 //#include <midi++/types.h>
 namespace MIDI {
 	typedef unsigned char byte;
diff --git a/libs/surfaces/us2400/surface_port.cc b/libs/surfaces/us2400/surface_port.cc
index 00b084bc14..f0027c97f3 100644
--- a/libs/surfaces/us2400/surface_port.cc
+++ b/libs/surfaces/us2400/surface_port.cc
@@ -21,7 +21,6 @@
 #include <cerrno>
 
 #include <sigc++/sigc++.h>
-#include <boost/shared_array.hpp>
 
 #include "pbd/failed_constructor.h"
 
diff --git a/libs/surfaces/us2400/surface_port.h b/libs/surfaces/us2400/surface_port.h
index 8dc517825e..082a2828ef 100644
--- a/libs/surfaces/us2400/surface_port.h
+++ b/libs/surfaces/us2400/surface_port.h
@@ -21,6 +21,7 @@
 #include <midi++/types.h>
 
 #include "pbd/signals.h"
+#include "pbd/xml++.h"
 
 
 #include "midi_byte_array.h"
diff --git a/libs/surfaces/us2400/timer.h b/libs/surfaces/us2400/timer.h
index c2e5f04285..9c0cfa1a76 100644
--- a/libs/surfaces/us2400/timer.h
+++ b/libs/surfaces/us2400/timer.h
@@ -19,6 +19,10 @@
 #ifndef timer_h
 #define timer_h
 
+#include <glib.h>
+
+#include <cstdint>
+
 #ifdef _WIN32
 #include "windows.h"
 #else
diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc
index e025526660..d4c1ea5631 100644
--- a/libs/surfaces/us2400/us2400_control_protocol.cc
+++ b/libs/surfaces/us2400/us2400_control_protocol.cc
@@ -29,7 +29,6 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <boost/shared_array.hpp>
 #include <glibmm/miscutils.h>
 
 #include "midi++/types.h"
@@ -83,7 +82,7 @@ using namespace US2400;
 
 #include "pbd/i18n.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 const int US2400Protocol::MODIFIER_OPTION = 0x1;
 const int US2400Protocol::MODIFIER_CONTROL = 0x2;
diff --git a/libs/surfaces/websockets/ardour_websockets.cc b/libs/surfaces/websockets/ardour_websockets.cc
index 5fec5d5819..962845bd84 100644
--- a/libs/surfaces/websockets/ardour_websockets.cc
+++ b/libs/surfaces/websockets/ardour_websockets.cc
@@ -32,7 +32,7 @@
 using namespace ARDOUR;
 using namespace ArdourSurface;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 ArdourWebsockets::ArdourWebsockets (Session& s)
     : ControlProtocol (s, X_ (surface_name))
diff --git a/libs/surfaces/websockets/feedback.cc b/libs/surfaces/websockets/feedback.cc
index dd094052b8..3ca284460b 100644
--- a/libs/surfaces/websockets/feedback.cc
+++ b/libs/surfaces/websockets/feedback.cc
@@ -20,7 +20,7 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 #include "feedback.h"
 #include "transport.h"
diff --git a/libs/surfaces/websockets/feedback.h b/libs/surfaces/websockets/feedback.h
index 1a7a66704a..72daa2fe35 100644
--- a/libs/surfaces/websockets/feedback.h
+++ b/libs/surfaces/websockets/feedback.h
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <boost/unordered_map.hpp>
 #include <glibmm/threads.h>
 
 #include "pbd/abstract_ui.h"
diff --git a/libs/surfaces/websockets/json.h b/libs/surfaces/websockets/json.h
index 65cdfabd1b..9f11fca9f9 100644
--- a/libs/surfaces/websockets/json.h
+++ b/libs/surfaces/websockets/json.h
@@ -19,6 +19,8 @@
 #ifndef _ardour_surface_websockets_json_h_
 #define _ardour_surface_websockets_json_h_
 
+#include <string>
+
 namespace ArdourSurface {
 
 namespace WebSocketsJSON
diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc
index 0578d0c42d..a6ab558685 100644
--- a/libs/surfaces/wiimote/wiimote.cc
+++ b/libs/surfaces/wiimote/wiimote.cc
@@ -31,7 +31,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-#include "pbd/abstract_ui.cc" // instantiate template
+#include "pbd/abstract_ui.inc.cc" // instantiate template
 
 void wiimote_control_protocol_mesg_callback (cwiid_wiimote_t *wiimote, int mesg_count, union cwiid_mesg mesg[], timespec *t);
 
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 5a5fe03564..dc759484b7 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -34,9 +34,6 @@ def configure(conf):
 
     autowaf.set_recursive()
 
-    #if Options.options.tranzport and conf.is_defined('HAVE_USB'):
-    #    conf.define('BUILD_TRANZPORT', 1)
-
     if conf.is_defined('HAVE_USB'):
         children += [ 'push2' ]
         children += [ 'contourdesign' ]
@@ -86,8 +83,6 @@ def build(bld):
 
     if bld.is_defined('BUILD_WIIMOTE'):
         bld.recurse('wiimote')
-    if bld.is_defined('BUILD_TRANZPORT'):
-        bld.recurse('tranzport')
     if bld.is_defined('HAVE_USB'):
         bld.recurse('push2')
         bld.recurse('contourdesign')
diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc
index e607a27ed7..29c372db6d 100644
--- a/libs/temporal/tempo.cc
+++ b/libs/temporal/tempo.cc
@@ -359,6 +359,17 @@ Meter::round_to_bar (Temporal::BBT_Time const & bbt) const
 	return BBT_Time (bbt.bars, 1, 0);
 }
 
+Temporal::BBT_Time
+Meter::round_up_to_bar (Temporal::BBT_Time const & bbt) const
+{
+	if (bbt.beats == 1 && bbt.ticks == 0) {
+		/* on bar, do not round up */
+		return bbt;
+	}
+
+	return BBT_Time (bbt.bars+1, 1, 0);
+}
+
 Temporal::BBT_Time
 Meter::round_up_to_beat_div (Temporal::BBT_Time const & bbt, int beat_div) const
 {
diff --git a/libs/temporal/temporal/beats.h b/libs/temporal/temporal/beats.h
index 40541d974c..c72e0688ac 100644
--- a/libs/temporal/temporal/beats.h
+++ b/libs/temporal/temporal/beats.h
@@ -91,7 +91,7 @@ public:
 
 	/** Create from ticks at a given rate.
 	 *
-	 * Note this can also be used to create from frames by setting ppqn to the
+	 * Note this can also be used to create from samples by setting ppqn to the
 	 * number of samples per beat.  Note the resulting Beats will, like all
 	 * others, have the default PPQN, so this is a potentially lossy
 	 * conversion.
diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h
index d28066484a..d1405b710b 100644
--- a/libs/temporal/temporal/tempo.h
+++ b/libs/temporal/temporal/tempo.h
@@ -304,6 +304,7 @@ class LIBTEMPORAL_API Meter {
 	BBT_Time bbt_add (BBT_Time const & bbt, BBT_Offset const & add) const;
 	BBT_Time bbt_subtract (BBT_Time const & bbt, BBT_Offset const & sub) const;
 	BBT_Time round_to_bar (BBT_Time const &) const;
+	BBT_Time round_up_to_bar (BBT_Time const &) const;
 	BBT_Time round_up_to_beat_div (BBT_Time const &, int beat_div) const;
 	BBT_Time round_up_to_beat (BBT_Time const & bbt) const { return round_up_to_beat_div (bbt, 1); }
 	BBT_Time round_to_beat (BBT_Time const &) const;
@@ -470,6 +471,7 @@ class LIBTEMPORAL_API TempoMetric
 	BBT_Argument   bbt_add (BBT_Time const & bbt, BBT_Offset const & add) const { return BBT_Argument (reftime(), _meter->bbt_add (bbt, add)); }
 	BBT_Argument   bbt_subtract (BBT_Time const & bbt, BBT_Offset const & sub) const { return BBT_Argument (reftime(), _meter->bbt_subtract (bbt, sub)); }
 	BBT_Argument round_to_bar (BBT_Time const & bbt) const { return BBT_Argument (reftime(), _meter->round_to_bar (bbt)); }
+	BBT_Argument round_up_to_bar (BBT_Time const & bbt) const { return BBT_Argument (reftime(), _meter->round_up_to_bar (bbt)); }
 	Beats to_quarters (BBT_Offset const & bbo) const { return _meter->to_quarters (bbo); }
 
 	/* combination methods that require both tempo and meter information */
@@ -929,10 +931,13 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
 	 */
 	LIBTEMPORAL_API double quarters_per_minute_at (timepos_t const & pos) const;
 
-	/* convenience function */
+	/* convenience functions */
 	LIBTEMPORAL_API BBT_Argument round_to_bar (BBT_Argument const & bbt) const {
 		return metric_at (bbt).round_to_bar (bbt);
 	}
+	LIBTEMPORAL_API BBT_Argument round_up_to_bar (BBT_Argument const & bbt) const {
+		return metric_at (bbt).round_up_to_bar (bbt);
+	}
 
 	LIBTEMPORAL_API BBT_Argument bbt_at (timepos_t const &) const;
 	LIBTEMPORAL_API BBT_Argument bbt_at (Beats const &) const;
diff --git a/libs/temporal/temporal/types.h b/libs/temporal/temporal/types.h
index 0079f67bfb..ba81e361af 100644
--- a/libs/temporal/temporal/types.h
+++ b/libs/temporal/temporal/types.h
@@ -18,7 +18,9 @@
 
 #pragma once
 
+#include <cassert>
 #include <cstdlib>
+#include <ostream>
 #include <stdint.h>
 
 #include "pbd/integer_division.h"
diff --git a/libs/tk/ydk/gdk.c b/libs/tk/ydk/gdk.c
index f722dbf96a..18ae13dc8d 100644
--- a/libs/tk/ydk/gdk.c
+++ b/libs/tk/ydk/gdk.c
@@ -81,7 +81,8 @@ static const GDebugKey gdk_debug_keys[] = {
   {"multihead",	    GDK_DEBUG_MULTIHEAD},
   {"xinerama",	    GDK_DEBUG_XINERAMA},
   {"draw",	    GDK_DEBUG_DRAW},
-  {"eventloop",	    GDK_DEBUG_EVENTLOOP}
+  {"eventloop",	    GDK_DEBUG_EVENTLOOP},
+  {"touch",    	    GDK_DEBUG_TOUCH}
 };
 
 static const int gdk_ndebug_keys = G_N_ELEMENTS (gdk_debug_keys);
diff --git a/libs/tk/ydk/gdkdisplay.c b/libs/tk/ydk/gdkdisplay.c
index f7b43cf874..b9b036cebe 100644
--- a/libs/tk/ydk/gdkdisplay.c
+++ b/libs/tk/ydk/gdkdisplay.c
@@ -153,6 +153,11 @@ gdk_display_dispose (GObject *object)
   display->queued_events = NULL;
   display->queued_tail = NULL;
 
+  if (display->touch_grabs)
+    {
+      g_hash_table_destroy (display->touch_grabs);
+    }
+
   _gdk_displays = g_slist_remove (_gdk_displays, object);
 
   if (gdk_display_get_default() == display)
diff --git a/libs/tk/ydk/gdkenumtypes.c b/libs/tk/ydk/gdkenumtypes.c
index 3309edcde8..8156e97300 100644
--- a/libs/tk/ydk/gdkenumtypes.c
+++ b/libs/tk/ydk/gdkenumtypes.c
@@ -229,6 +229,9 @@ gdk_event_mask_get_type (void)
             { GDK_PROXIMITY_OUT_MASK, "GDK_PROXIMITY_OUT_MASK", "proximity-out-mask" },
             { GDK_SUBSTRUCTURE_MASK, "GDK_SUBSTRUCTURE_MASK", "substructure-mask" },
             { GDK_SCROLL_MASK, "GDK_SCROLL_MASK", "scroll-mask" },
+            { GDK_TOUCH_BEGIN_MASK, "GDK_TOUCH_BEGIN_MASK", "touch-begin-mask" },
+            { GDK_TOUCH_UPDATE_MASK, "GDK_TOUCH_UPDATE_MASK", "touch-update-mask" },
+            { GDK_TOUCH_END_MASK, "GDK_TOUCH_END_MASK", "touch-end-mask" },
             { GDK_ALL_EVENTS_MASK, "GDK_ALL_EVENTS_MASK", "all-events-mask" },
             { 0, NULL, NULL }
         };
diff --git a/libs/tk/ydk/gdkevents.c b/libs/tk/ydk/gdkevents.c
index 0f8bba2f0a..95a42c0ac0 100644
--- a/libs/tk/ydk/gdkevents.c
+++ b/libs/tk/ydk/gdkevents.c
@@ -387,6 +387,14 @@ gdk_event_new (GdkEventType type)
       new_event->button.x_root = 0.;
       new_event->button.y_root = 0.;
       break;
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_UPDATE:
+    case GDK_TOUCH_END:
+      new_event->touch.x = 0.;
+      new_event->touch.y = 0.;
+      new_event->touch.x_root = 0.;
+      new_event->touch.y_root = 0.;
+      break;
     case GDK_SCROLL:
       new_event->scroll.x = 0.;
       new_event->scroll.y = 0.;
@@ -596,6 +604,10 @@ gdk_event_get_time (const GdkEvent *event)
       case GDK_3BUTTON_PRESS:
       case GDK_BUTTON_RELEASE:
 	return event->button.time;
+      case GDK_TOUCH_BEGIN:
+      case GDK_TOUCH_UPDATE:
+      case GDK_TOUCH_END:
+	return event->touch.time;
       case GDK_SCROLL:
         return event->scroll.time;
       case GDK_KEY_PRESS:
@@ -674,6 +686,11 @@ gdk_event_get_state (const GdkEvent        *event,
       case GDK_BUTTON_RELEASE:
         *state =  event->button.state;
         return TRUE;
+      case GDK_TOUCH_BEGIN:
+      case GDK_TOUCH_UPDATE:
+      case GDK_TOUCH_END:
+        *state =  event->touch.state;
+        return TRUE;
       case GDK_SCROLL:
 	*state =  event->scroll.state;
         return TRUE;
@@ -770,6 +787,12 @@ gdk_event_get_coords (const GdkEvent *event,
       x = event->motion.x;
       y = event->motion.y;
       break;
+      case GDK_TOUCH_BEGIN:
+      case GDK_TOUCH_UPDATE:
+      case GDK_TOUCH_END:
+      x = event->touch.x;
+      y = event->touch.y;
+      break;
     default:
       fetched = FALSE;
       break;
@@ -820,6 +843,12 @@ gdk_event_get_root_coords (const GdkEvent *event,
       x = event->button.x_root;
       y = event->button.y_root;
       break;
+      case GDK_TOUCH_BEGIN:
+      case GDK_TOUCH_UPDATE:
+      case GDK_TOUCH_END:
+      x = event->touch.x_root;
+      y = event->touch.y_root;
+      break;
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       x = event->crossing.x_root;
diff --git a/libs/tk/ydk/gdkwindow.c b/libs/tk/ydk/gdkwindow.c
index 774b5b2cb0..96cf56c08a 100644
--- a/libs/tk/ydk/gdkwindow.c
+++ b/libs/tk/ydk/gdkwindow.c
@@ -39,6 +39,8 @@
 
 #undef DEBUG_WINDOW_PRINTING
 
+#define FIRST_TOUCH_EMULATE_BUTTON_EVENT
+
 #ifdef GDK_WINDOWING_X11
 #include "gdkx.h"           /* For workaround */
 #endif
@@ -9887,6 +9889,9 @@ static const guint type_masks[] = {
   0, /* GDK_OWNER_CHANGE = 34 */
   0, /* GDK_GRAB_BROKEN = 35 */
   0, /* GDK_DAMAGE = 36 */
+  GDK_TOUCH_BEGIN_MASK, /* GDK_TOUCH_BEGIN             = 37 */
+  GDK_TOUCH_UPDATE_MASK, /* GDK_TOUCH_UPDATE           = 38 */
+  GDK_TOUCH_END_MASK, /* GDK_TOUCH_END                 = 39 */
 };
 G_STATIC_ASSERT (G_N_ELEMENTS (type_masks) == GDK_EVENT_LAST);
 
@@ -9929,6 +9934,36 @@ is_motion_type (GdkEventType type)
 	 type == GDK_LEAVE_NOTIFY;
 }
 
+static gboolean
+is_touch_type (GdkEventType type)
+{
+  return type == GDK_TOUCH_BEGIN ||
+	 type == GDK_TOUCH_UPDATE ||
+	 type == GDK_TOUCH_END;
+}
+
+static gboolean
+is_button_press (GdkEvent* event)
+{
+#ifdef FIRST_TOUCH_EMULATE_BUTTON_EVENT
+  return event->any.type == GDK_BUTTON_PRESS ||
+	(event->any.type == GDK_TOUCH_BEGIN && event->touch.flags & 0x20000);
+#else
+  return event->any.type == GDK_BUTTON_PRESS;
+#endif
+}
+
+static gboolean
+is_button_release (GdkEvent* event)
+{
+#ifdef FIRST_TOUCH_EMULATE_BUTTON_EVENT
+  return event->any.type == GDK_BUTTON_RELEASE ||
+	(event->any.type == GDK_TOUCH_END && event->touch.flags & 0x20000);
+#else
+  return event->any.type == GDK_BUTTON_RELEASE;
+#endif
+}
+
 static GdkWindowObject *
 find_common_ancestor (GdkWindowObject *win1,
 		      GdkWindowObject *win2)
@@ -10796,7 +10831,7 @@ proxy_button_event (GdkEvent *source_event,
 						       toplevel_x, toplevel_y,
 						       &toplevel_x, &toplevel_y);
 
-  if (type == GDK_BUTTON_PRESS &&
+  if (is_button_press (source_event) &&
       !source_event->any.send_event &&
       _gdk_display_has_pointer_grab (display, serial) == NULL)
     {
@@ -10837,6 +10872,52 @@ proxy_button_event (GdkEvent *source_event,
 				type, state,
 				NULL, serial);
 
+#ifdef FIRST_TOUCH_EMULATE_BUTTON_EVENT
+  if (is_touch_type (type) && source_event->touch.flags & 0x20000)
+    {
+    if (type == GDK_TOUCH_UPDATE)
+      {
+	/* first touch moves the mouse already (at least on Linux/X11).
+	 * So there is no need to emulate GDK_MOTION_NOTIFY events.
+	 */
+	return TRUE;
+      }
+
+      event_win = get_event_window (display,
+				    pointer_window,
+				    type == GDK_TOUCH_BEGIN ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE, state,
+				    NULL, serial);
+    }
+  else
+#endif
+  /* multitouch grab */
+  if (type == GDK_TOUCH_BEGIN && !source_event->any.send_event)
+    {
+      GdkEventTouch* tev = (GdkEventTouch*) source_event;
+      if (!display->touch_grabs) {
+	display->touch_grabs = g_hash_table_new (g_direct_hash, NULL);
+      }
+      event_win = _gdk_window_find_descendant_at (toplevel_window, toplevel_x, toplevel_y, NULL, NULL);
+      g_hash_table_insert (display->touch_grabs, GUINT_TO_POINTER (tev->sequence), event_win);
+    }
+  else if (type == GDK_TOUCH_END && display->touch_grabs)
+    {
+      GdkEventTouch* tev = (GdkEventTouch*) source_event;
+      void* w = g_hash_table_lookup (display->touch_grabs, GUINT_TO_POINTER (tev->sequence));
+      if (w) {
+	event_win = GDK_WINDOW (w);
+      }
+      g_hash_table_remove (display->touch_grabs, GUINT_TO_POINTER (tev->sequence));
+    }
+  else if (type == GDK_TOUCH_UPDATE && display->touch_grabs)
+    {
+      GdkEventTouch* tev = (GdkEventTouch*) source_event;
+      void* w = g_hash_table_lookup (display->touch_grabs, GUINT_TO_POINTER (tev->sequence));
+      if (w) {
+	event_win = GDK_WINDOW (w);
+      }
+    }
+
   if (event_win == NULL || display->ignore_core_events)
     return TRUE;
 
@@ -10873,6 +10954,41 @@ proxy_button_event (GdkEvent *source_event,
       event->scroll.delta_y = source_event->scroll.delta_y;
       return TRUE;
 
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_UPDATE:
+    case GDK_TOUCH_END:
+#ifdef FIRST_TOUCH_EMULATE_BUTTON_EVENT
+      if (source_event->touch.flags & 0x20000) {
+        if (type == GDK_TOUCH_UPDATE) {
+	  g_assert (0);
+          return TRUE;
+        }
+        convert_toplevel_coords_to_window (event_win,
+                                           toplevel_x, toplevel_y,
+                                           &event->button.x, &event->button.y);
+
+        event->button.type   = type == GDK_TOUCH_BEGIN ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
+        event->button.time   = source_event->touch.time;
+        event->button.x_root = source_event->touch.x_root;
+        event->button.y_root = source_event->touch.y_root;
+        event->button.axes   = NULL;
+        event->button.state  = 0;
+        event->button.button = 1;
+        event->button.device = display->core_pointer;
+        return TRUE;
+      }
+#endif
+
+      convert_toplevel_coords_to_window (event_win,
+					 toplevel_x, toplevel_y,
+					 &event->touch.x, &event->touch.y);
+      event->touch.sequence = source_event->touch.sequence;
+      event->touch.deviceid = source_event->touch.deviceid;
+      event->touch.x_root = source_event->touch.x_root;
+      event->touch.y_root = source_event->touch.y_root;
+      event->touch.state  = state;
+      return TRUE;
+
     default:
       return FALSE;
     }
@@ -11024,8 +11140,7 @@ _gdk_windowing_got_event (GdkDisplay *display,
 	  _gdk_display_pointer_grab_update (display,
 					    serial);
 	}
-      if (event->type == GDK_BUTTON_RELEASE &&
-	  !event->any.send_event)
+      if (is_button_release (event) && !event->any.send_event)
 	{
 	  button_release_grab =
 	    _gdk_display_has_pointer_grab (display, serial);
@@ -11057,7 +11172,8 @@ _gdk_windowing_got_event (GdkDisplay *display,
     return;
 
   if (!(is_button_type (event->type) ||
-	is_motion_type (event->type)) ||
+	is_motion_type (event->type) ||
+	is_touch_type (event->type)) ||
       event_private->window_type == GDK_WINDOW_ROOT)
     return;
 
@@ -11147,9 +11263,11 @@ _gdk_windowing_got_event (GdkDisplay *display,
   else if (is_button_type (event->type))
     unlink_event = proxy_button_event (event,
 				       serial);
+  else if (is_touch_type (event->type))
+    unlink_event = proxy_button_event (event,
+				       serial);
 
-  if (event->type == GDK_BUTTON_RELEASE &&
-      !event->any.send_event)
+  if (is_button_release (event) && !event->any.send_event)
     {
       button_release_grab =
 	_gdk_display_has_pointer_grab (display, serial);
diff --git a/libs/tk/ydk/win32/gdkevents-win32.c b/libs/tk/ydk/win32/gdkevents-win32.c
index e78ed38f02..440695c468 100644
--- a/libs/tk/ydk/win32/gdkevents-win32.c
+++ b/libs/tk/ydk/win32/gdkevents-win32.c
@@ -88,6 +88,67 @@
 
 #define QS_YDK_RELEVANT_INPUT 0x4ff // = QS_KEY | QS_MOUSEMOVE | QS_MOUSEBUTTON | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY | QS_SENDMESSAGE | QS_RAWINPUT
 
+#ifndef WM_NCPOINTERUPDATE
+
+typedef DWORD  POINTER_INPUT_TYPE;
+typedef UINT32 POINTER_FLAGS;
+typedef UINT32 TOUCH_FLAGS;
+typedef UINT32 TOUCH_MASK;
+
+typedef enum _POINTER_BUTTON_CHANGE_TYPE
+{
+  POINTER_CHANGE_NONE,
+  POINTER_CHANGE_FIRSTBUTTON_DOWN,
+  POINTER_CHANGE_FIRSTBUTTON_UP,
+  POINTER_CHANGE_SECONDBUTTON_DOWN,
+  POINTER_CHANGE_SECONDBUTTON_UP,
+  POINTER_CHANGE_THIRDBUTTON_DOWN,
+  POINTER_CHANGE_THIRDBUTTON_UP,
+  POINTER_CHANGE_FOURTHBUTTON_DOWN,
+  POINTER_CHANGE_FOURTHBUTTON_UP,
+  POINTER_CHANGE_FIFTHBUTTON_DOWN,
+  POINTER_CHANGE_FIFTHBUTTON_UP
+} POINTER_BUTTON_CHANGE_TYPE;
+
+typedef struct _POINTER_INFO {
+  POINTER_INPUT_TYPE         pointerType;
+  UINT32                     pointerId;
+  UINT32                     frameId;
+  POINTER_FLAGS              pointerFlags;
+  HANDLE                     sourceDevice;
+  HWND                       hwndTarget;
+  POINT                      ptPixelLocation;
+  POINT                      ptHimetricLocation;
+  POINT                      ptPixelLocationRaw;
+  POINT                      ptHimetricLocationRaw;
+  DWORD                      dwTime;
+  UINT32                     historyCount;
+  INT32                      InputData;
+  DWORD                      dwKeyStates;
+  UINT64                     PerformanceCount;
+  POINTER_BUTTON_CHANGE_TYPE ButtonChangeType;
+} POINTER_INFO;
+
+typedef struct _POINTER_TOUCH_INFO {
+  POINTER_INFO pointerInfo;
+  TOUCH_FLAGS  touchFlags;
+  TOUCH_MASK   touchMask;
+  RECT         rcContact;
+  RECT         rcContactRaw;
+  UINT32       orientation;
+  UINT32       pressure;
+} POINTER_TOUCH_INFO;
+
+typedef BOOL (WINAPI *PFN_GetPointerType) (UINT32, POINTER_INPUT_TYPE*);
+typedef BOOL (WINAPI *PFN_GetPointerTouchInfo) (UINT32, POINTER_TOUCH_INFO*);
+
+#define GET_POINTERID_WPARAM(wParam) (LOWORD(wParam))
+
+#endif
+
+static PFN_GetPointerType      getPointerType      = 0;
+static PFN_GetPointerTouchInfo getPointerTouchInfo = 0;
+
 static gboolean gdk_event_translate (MSG        *msg,
 				     gint       *ret_valp);
 static void     handle_wm_paint     (MSG        *msg,
@@ -107,6 +168,11 @@ static gboolean gdk_event_dispatch (GSource     *source,
 
 static GList *client_filters;	/* Filters for client messages */
 
+static GList *touch_mapper = NULL;
+
+static int last_touch_x[32];
+static int last_touch_y[32];
+
 static HCURSOR p_grab_cursor;
 
 static GSourceFuncs event_funcs = {
@@ -170,6 +236,40 @@ track_mouse_event (DWORD dwFlags,
     GDK_NOTE (EVENTS, g_print(" (cancel TrackMouseEvent %p)", hwnd));
 }
 
+static int
+touch_idx_lookup (DWORD id)
+{
+  GList* g = g_list_find (touch_mapper, GUINT_TO_POINTER(id));
+  if (!g) {
+    return -1;
+  }
+  return g_list_position (touch_mapper, g);
+}
+
+static int
+touch_idx_map (DWORD id)
+{
+  GList* g = g_list_find (touch_mapper, GUINT_TO_POINTER(G_MAXUINT));
+  if (!g) {
+    touch_mapper = g_list_append (touch_mapper, GUINT_TO_POINTER(id));
+  } else {
+    g->data = GUINT_TO_POINTER(id);
+  }
+  return touch_idx_lookup (id);
+}
+
+static int
+touch_idx_unmap (DWORD id)
+{
+  GList* g = g_list_find (touch_mapper, GUINT_TO_POINTER(id));
+  if (!g) {
+    return -1;
+  }
+  int rv = g_list_position (touch_mapper, g);
+  g->data = GUINT_TO_POINTER(G_MAXULONG);
+  return rv;
+}
+
 gulong
 _gdk_win32_get_next_tick (gulong suggested_tick)
 {
@@ -273,6 +373,17 @@ _gdk_win32_window_procedure (HWND   hwnd,
 void 
 _gdk_events_init (void)
 {
+#ifdef G_ENABLE_DEBUG
+  if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+    g_message ("CHECK FOR Touch/Pointer API..\n");
+#endif
+  getPointerType         = (PFN_GetPointerType)      GetProcAddress (GetModuleHandle ("user32.dll"), "GetPointerType");
+  getPointerTouchInfo    = (PFN_GetPointerTouchInfo) GetProcAddress (GetModuleHandle ("user32.dll"), "GetPointerTouchInfo");
+#ifdef G_ENABLE_DEBUG
+  if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+    g_message ("Found GetPointerType = %p GetPointerTouchInfo = %p\n", getPointerType, getPointerTouchInfo);
+#endif
+
   GSource *source;
 
 #if 0
@@ -811,6 +922,9 @@ _gdk_win32_print_event (const GdkEvent *event)
     CASE (GDK_SETTING);
     CASE (GDK_OWNER_CHANGE);
     CASE (GDK_GRAB_BROKEN);
+    CASE (GDK_TOUCH_BEGIN);
+    CASE (GDK_TOUCH_UPDATE);
+    CASE (GDK_TOUCH_END);
 #undef CASE
     default: g_assert_not_reached ();
     }
@@ -935,6 +1049,7 @@ _gdk_win32_print_event (const GdkEvent *event)
       g_print ("%s: %s",
 	       _gdk_win32_window_state_to_string (event->window_state.changed_mask),
 	       _gdk_win32_window_state_to_string (event->window_state.new_window_state));
+      break;
     case GDK_SETTING:
       g_print ("%s: %s",
 	       (event->setting.action == GDK_SETTING_ACTION_NEW ? "NEW" :
@@ -942,11 +1057,21 @@ _gdk_win32_print_event (const GdkEvent *event)
 		 (event->setting.action == GDK_SETTING_ACTION_DELETED ? "DELETED" :
 		  "???"))),
 	       (event->setting.name ? event->setting.name : "NULL"));
+      break;
     case GDK_GRAB_BROKEN:
       g_print ("%s %s %p",
 	       (event->grab_broken.keyboard ? "KEYBOARD" : "POINTER"),
 	       (event->grab_broken.implicit ? "IMPLICIT" : "EXPLICIT"),
 	       (event->grab_broken.grab_window ? GDK_WINDOW_HWND (event->grab_broken.grab_window) : 0));
+      break;
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_UPDATE:
+    case GDK_TOUCH_END:
+      g_print ("Touch %s %d (%.4g,%.4g) (%.4g,%.4g) ",
+					(event->any.type == GDK_TOUCH_BEGIN) ? "Begin" : (event->any.type == GDK_TOUCH_END) ? "End" : "Update",
+	       event->touch.sequence,
+	       event->touch.x, event->touch.y,
+	       event->touch.x_root, event->touch.y_root);
     default:
       /* Nothing */
       break;
@@ -1915,6 +2040,114 @@ generate_button_event (GdkEventType type,
   _gdk_win32_append_event (event);
 }
 
+static gboolean
+handle_wm_pointer (GdkEventType type, GdkWindow* window, MSG* msg)
+{
+  POINTER_INPUT_TYPE pointer_type;
+
+  if (!getPointerType || !getPointerTouchInfo)
+    {
+      return FALSE;
+    }
+  if (!getPointerType (GET_POINTERID_WPARAM (msg->wParam), &pointer_type))
+    {
+#ifdef G_ENABLE_DEBUG
+      if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+	g_message ("getPointerType failed to translate event\n");
+#endif
+      return FALSE;
+    }
+  if (pointer_type != 2 /* touch */)
+    {
+#ifdef G_ENABLE_DEBUG
+      if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+	g_message ("Not A Touch event\n");
+#endif
+      return FALSE;
+    }
+
+  POINTER_TOUCH_INFO touch_info;
+  if (!getPointerTouchInfo (GET_POINTERID_WPARAM (msg->wParam), &touch_info))
+    {
+#ifdef G_ENABLE_DEBUG
+      if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+	g_message ("getPointerTouchInfo failed to translate event\n");
+#endif
+      return FALSE;
+    }
+
+  /* Touch positions are in screen coordinates, convert
+   * them to Window coordidates
+   */
+  POINT point;
+  point.x = GET_X_LPARAM (msg->lParam);
+  point.y = GET_Y_LPARAM (msg->lParam);
+
+  int touch_sequence = 0;
+  switch (type)
+    {
+      case GDK_TOUCH_BEGIN:
+	touch_sequence = touch_idx_map (GET_POINTERID_WPARAM (msg->wParam));
+	break;
+      case GDK_TOUCH_END:
+	touch_sequence = touch_idx_unmap (GET_POINTERID_WPARAM (msg->wParam));
+	break;
+      case GDK_TOUCH_UPDATE:
+	touch_sequence = touch_idx_lookup (GET_POINTERID_WPARAM (msg->wParam));
+	break;
+      default:
+	return FALSE;
+    }
+
+  // printf ("TOUCH %d SEQ %d %x | %d = %d | %d = %d\n", type, touch_sequence, GET_POINTERID_WPARAM (msg->wParam), (int)point.x, last_touch_x[touch_sequence], (int)point.y, last_touch_y[touch_sequence]);
+
+  /* Dear Aliens, we're sorry to limit multitouch to 30 fingers */
+  if (touch_sequence < 0 || touch_sequence > 31)
+    {
+      return FALSE;
+    }
+
+
+  /* Windows periodically sends WM_POINTERUPDATE updates.
+   * If a finger has not moved, do not create a GDK event.
+   */
+  if (type == GDK_TOUCH_UPDATE
+      && (int)point.x == last_touch_x[touch_sequence]
+      && (int)point.y == last_touch_y[touch_sequence])
+    {
+      return FALSE;
+    }
+
+  last_touch_x[touch_sequence] = (int)point.x;
+  last_touch_y[touch_sequence] = (int)point.y;
+
+  /* first single touch is already handled by Windows as mouse event */
+  if (touch_sequence == 0) {
+    return TRUE;
+  }
+
+  ScreenToClient (msg->hwnd, &point);
+  GdkEvent *event = gdk_event_new (type);
+
+  event->touch.window   = window;
+  event->touch.time     = _gdk_win32_get_next_tick (msg->time);
+  event->touch.x        = (gint16) point.x;
+  event->touch.y        = (gint16) point.y;
+  event->touch.x_root   = msg->pt.x + _gdk_offset_x;
+  event->touch.y_root   = msg->pt.y + _gdk_offset_y;
+  event->touch.state    = 0;
+  event->touch.sequence = GET_POINTERID_WPARAM (msg->wParam); // or touch_sequence + 1
+  event->touch.flags    = 0; // touch_sequence == 0 ? 0x20000 : 0;
+  event->touch.deviceid = 0;
+
+#ifdef G_ENABLE_DEBUG
+  if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+    g_message ("getPointerTouchInfo type = %d at: %.1fx%.1f root: %1.fx%1.f seq=%d\n", type, event->touch.x, event->touch.y, event->touch.x_root, event->touch.y_root, touch_sequence);
+#endif
+  _gdk_win32_append_event (event);
+}
+
+
 static void
 ensure_stacking_on_unminimize (MSG *msg)
 {
@@ -2681,6 +2914,16 @@ gdk_event_translate (MSG  *msg,
       return_val = TRUE;
       break;
 
+    case 0x0246 /* WM_POINTERDOWN */:
+      handle_wm_pointer (GDK_TOUCH_BEGIN, window, msg);
+      break;
+    case 0x0247 /* WM_POINTERUP */:
+      handle_wm_pointer (GDK_TOUCH_END, window, msg);
+      break;
+    case 0x0245 /* WM_POINTERUPDATE */:
+      handle_wm_pointer (GDK_TOUCH_UPDATE, window, msg);
+      break;
+
     case WM_NCMOUSEMOVE:
       GDK_NOTE (EVENTS,
 		g_print (" (%d,%d)",
diff --git a/libs/tk/ydk/win32/gdkwindow-win32.c b/libs/tk/ydk/win32/gdkwindow-win32.c
index d91868638b..3b920915d1 100644
--- a/libs/tk/ydk/win32/gdkwindow-win32.c
+++ b/libs/tk/ydk/win32/gdkwindow-win32.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #include <stdlib.h>
 
+#include <windows.h>
+
 #include "gdk.h"
 #include "gdkwindowimpl.h"
 #include "gdkprivate-win32.h"
@@ -52,6 +54,17 @@ static GSList *modal_window_stack = NULL;
 
 typedef struct _FullscreenInfo FullscreenInfo;
 
+#ifndef GC_ALLGESTURES
+typedef struct tagGESTURECONFIG {
+  DWORD dwID;
+  DWORD dwWant;
+  DWORD dwBlock;
+} GESTURECONFIG,*PGESTURECONFIG;
+#endif
+
+typedef BOOL (WINAPI *PFN_SetGestureConfig) (HWND, DWORD, UINT, PGESTURECONFIG, UINT);
+static PFN_SetGestureConfig setGestureConfig = 0;
+
 struct _FullscreenInfo
 {
   RECT  r;
@@ -168,6 +181,8 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
   drawable_class->set_colormap = gdk_window_impl_win32_set_colormap;
   drawable_class->get_colormap = gdk_window_impl_win32_get_colormap;
   drawable_class->get_size = gdk_window_impl_win32_get_size;
+
+  setGestureConfig = (PFN_SetGestureConfig) GetProcAddress (GetModuleHandle ("user32.dll"), "SetGestureConfig");
 }
 
 static void
@@ -315,6 +330,12 @@ _gdk_windowing_window_init (GdkScreen *screen)
 
   gdk_win32_handle_table_insert ((HANDLE *) &draw_impl->handle, _gdk_root);
 
+  if (setGestureConfig)
+    {
+      GESTURECONFIG gc[1] = {{0, 0, 1 /*GC_ALLGESTURES*/}};
+      setGestureConfig (GDK_WINDOW_HWND (_gdk_root), 0, 1, gc, sizeof (gc));
+    }
+
   GDK_NOTE (MISC, g_print ("_gdk_root=%p\n", GDK_WINDOW_HWND (_gdk_root)));
 }
 
diff --git a/libs/tk/ydk/wscript b/libs/tk/ydk/wscript
index 45e04326b3..f01fcb0860 100644
--- a/libs/tk/ydk/wscript
+++ b/libs/tk/ydk/wscript
@@ -164,6 +164,7 @@ def configure(conf):
             conf.check_cc(header_name='X11/extensions/Xinerama.h',
                           lib='Xinerama', uselib_store="XINERAMA", define_name='HAVE_XFREE_XINERAMA',
                           execute = False, mandatory=False)
+            autowaf.check_pkg(conf, 'xi', uselib_store='XINPUT2', mandatory=False, atleast_version='1.7.10')
 
 def build(bld):
     if not bld.is_defined('YTK'):
@@ -202,7 +203,7 @@ def build(bld):
         obj.ldflags          = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid'
     else:
         obj.source    = libydk_sources + libydk_x11_sources
-        obj.uselib   += ' GIO-UNIX X11 XEXT XINERAMA RANDR'
+        obj.uselib   += ' GIO-UNIX X11 XEXT XINERAMA RANDR DL'
         obj.includes        += ['ydk/x11/gdk', 'ydk/gdk/x11']
         obj.export_includes += ['ydk/gdk']
         obj.export_includes += ['ydk/x11']
diff --git a/libs/tk/ydk/x11/gdkdisplay-x11.c b/libs/tk/ydk/x11/gdkdisplay-x11.c
index 0c63c55d16..ad7683187f 100644
--- a/libs/tk/ydk/x11/gdkdisplay-x11.c
+++ b/libs/tk/ydk/x11/gdkdisplay-x11.c
@@ -65,6 +65,9 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 
+#ifdef HAVE_XINPUT2
+#include <dlfcn.h>
+#endif
 
 static void   gdk_display_x11_dispose            (GObject            *object);
 static void   gdk_display_x11_finalize           (GObject            *object);
@@ -864,6 +867,13 @@ gdk_display_x11_finalize (GObject *object)
   g_hash_table_destroy (display_x11->atom_from_virtual);
   g_hash_table_destroy (display_x11->atom_to_virtual);
 
+  /* Multitouch */
+#ifdef HAVE_XINPUT2
+  if (display_x11->xi.libxi)
+    dlclose (display_x11->xi.libxi);
+  g_hash_table_destroy (display_x11->touch_devices);
+#endif
+
   /* Leader Window */
   XDestroyWindow (display_x11->xdisplay, display_x11->leader_window);
 
diff --git a/libs/tk/ydk/x11/gdkevents-x11.c b/libs/tk/ydk/x11/gdkevents-x11.c
index 186a8f5cb2..6b2c1d1523 100644
--- a/libs/tk/ydk/x11/gdkevents-x11.c
+++ b/libs/tk/ydk/x11/gdkevents-x11.c
@@ -62,6 +62,11 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 
+#ifdef HAVE_XINPUT2
+#include <dlfcn.h>
+#include <X11/extensions/XInput2.h>
+#endif
+
 #include <X11/Xatom.h>
 
 typedef struct _GdkIOClosure GdkIOClosure;
@@ -237,6 +242,70 @@ _gdk_events_init (GdkDisplay *display)
 					 gdk_atom_intern_static_string ("WM_PROTOCOLS"), 
 					 gdk_wm_protocols_filter,   
 					 NULL);
+
+#ifdef HAVE_XINPUT2
+  void* lxi = dlopen ("libXi.so", RTLD_NOW | RTLD_GLOBAL);
+  if (lxi)
+    {
+      display_x11->xi.XISelectEvents   = dlsym (lxi, "XISelectEvents");
+      display_x11->xi.XIQueryDevice    = dlsym (lxi, "XIQueryDevice");
+      display_x11->xi.XIFreeDeviceInfo = dlsym (lxi, "XIFreeDeviceInfo");
+      if (display_x11->xi.XISelectEvents && display_x11->xi.XIQueryDevice && display_x11->xi.XIFreeDeviceInfo)
+	{
+	  display_x11->xi.libxi = lxi;
+	}
+      else
+	{
+	  dlclose (lxi);
+	}
+    }
+
+  int firstevent, firsterror;
+  if (display_x11->xi.libxi && XQueryExtension (display_x11->xdisplay, "XInputExtension", &display_x11->xid_opcode, &firstevent, &firsterror))
+  {
+#ifdef G_ENABLE_DEBUG
+    if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+      g_message ("CHECK FOR TOUCHSCREENs\n");
+#endif
+
+    int n_devices;
+    XIDeviceInfo* info;
+
+    info = display_x11->xi.XIQueryDevice (display_x11->xdisplay, XIAllDevices, &n_devices);
+
+    for (int i = 0; i < n_devices; ++i) {
+      XIDeviceInfo* dev = &info[i];
+      if (!dev->enabled) {
+	continue;
+      }
+      if (!(dev->use == XISlavePointer || dev->use == XIFloatingSlave)) {
+	continue;
+      }
+
+      gboolean direct_touch = FALSE;
+      XITouchClassInfo* classInfo;
+
+      for (int j = 0; j < dev->num_classes; ++j) {
+	classInfo = (XITouchClassInfo*)(dev->classes[j]);
+
+	if (classInfo->type == XITouchClass && ((XITouchClassInfo *)dev->classes[j])->mode == XIDirectTouch) {
+	  direct_touch = TRUE;
+	}
+      }
+      if (direct_touch) {
+#ifdef G_ENABLE_DEBUG
+	if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+	  g_message ("XI: touch-device id=%d name='%s' ntouch: %d\n", dev->deviceid, dev->name, classInfo->num_touches);
+#endif
+	if (!display_x11->touch_devices) {
+	  display_x11->touch_devices = g_hash_table_new (g_direct_hash, NULL);
+	}
+	g_hash_table_insert (display_x11->touch_devices, GUINT_TO_POINTER (dev->deviceid), GUINT_TO_POINTER(1));
+      }
+    }
+    display_x11->xi.XIFreeDeviceInfo (info);
+  }
+#endif
 }
 
 void
@@ -1233,7 +1302,7 @@ gdk_event_translate (GdkDisplay *display,
 	  event->button.state = (GdkModifierType) xevent->xbutton.state;
 	  event->button.button = xevent->xbutton.button;
 	  event->button.device = display->core_pointer;
-	  
+
 	  if (!set_screen_from_root (display, event, xevent->xbutton.root))
 	    {
 	      return_val = FALSE;
@@ -2124,6 +2193,9 @@ gdk_event_translate (GdkDisplay *display,
       break;
 
     default:
+      if (xevent->xcookie.type == GenericEvent) {
+	XGetEventData (display_x11->xdisplay, &xevent->xcookie);
+      }
 #ifdef HAVE_XKB
       if (xevent->type == display_x11->xkb_event_type)
 	{
@@ -2175,6 +2247,50 @@ gdk_event_translate (GdkDisplay *display,
 	}
       else
 #endif
+#ifdef HAVE_XINPUT2
+      if (xevent->xcookie.type == GenericEvent && xevent->xcookie.extension == display_x11->xid_opcode
+          && display_x11->touch_devices && g_hash_table_lookup (display_x11->touch_devices, GUINT_TO_POINTER (((XIDeviceEvent *)xevent->xcookie.data)->deviceid)))
+	{
+	  XIDeviceEvent *xev = (XIDeviceEvent *) xevent->xcookie.data;
+#ifdef G_ENABLE_DEBUG
+	  if (_gdk_debug_flags & GDK_DEBUG_TOUCH)
+	    g_message ("TOUCH dev=%d src=%d | dt: %u flags: %x\n", xev->deviceid, xev->sourceid, xev->detail, xev->flags);
+#endif
+	  window = gdk_window_lookup_for_display (display, xev->event);
+	  g_object_ref (window);
+
+	  event->touch.window   = window;
+	  event->touch.time     = xev->time;
+	  event->touch.x        = xev->event_x;
+	  event->touch.y        = xev->event_y;
+	  event->touch.x_root   = xev->root_x;
+	  event->touch.y_root   = xev->root_y;
+	  event->touch.state    = 0 ; (GdkModifierType) xevent->xbutton.state;
+	  event->touch.sequence = xev->detail;
+	  event->touch.flags    = xev->flags;
+	  event->touch.deviceid = xev->deviceid;
+
+	  switch (xevent->xcookie.evtype) {
+	    case XI_TouchBegin:
+	      event->touch.type = GDK_TOUCH_BEGIN;
+	      break;
+	    case XI_TouchUpdate:
+	      event->touch.type = GDK_TOUCH_UPDATE;
+	      break;
+	    case XI_TouchEnd:
+	      event->touch.type = GDK_TOUCH_END;
+	      break;
+	    default:
+	      return FALSE;
+	      break;
+	  }
+
+	  if (!set_screen_from_root (display, event, xev->root)) {
+	    return_val = FALSE;
+	  }
+	}
+      else
+#endif
 #if defined(HAVE_XCOMPOSITE) && defined (HAVE_XDAMAGE) && defined (HAVE_XFIXES)
       if (display_x11->have_xdamage && window_private && window_private->composited &&
 	  xevent->type == display_x11->xdamage_event_base + XDamageNotify &&
diff --git a/libs/tk/ydk/x11/gdkwindow-x11.c b/libs/tk/ydk/x11/gdkwindow-x11.c
index 887a5ef5f4..7ba1dd5a6f 100644
--- a/libs/tk/ydk/x11/gdkwindow-x11.c
+++ b/libs/tk/ydk/x11/gdkwindow-x11.c
@@ -71,6 +71,10 @@
 #include <X11/extensions/Xdamage.h>
 #endif
 
+#ifdef HAVE_XINPUT2
+#include <X11/extensions/XInput2.h>
+#endif
+
 const int _gdk_event_mask_table[21] =
 {
   ExposureMask,
@@ -797,6 +801,24 @@ _gdk_window_impl_new (GdkWindow     *window,
   g_object_ref (window);
   _gdk_xid_table_insert (screen_x11->display, &draw_impl->xid, window);
 
+#ifdef HAVE_XINPUT2
+  GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (gdk_drawable_get_display (window));
+  if (display_x11->touch_devices)
+    {
+      XIEventMask evmask;
+      unsigned char mask[XIMaskLen(XI_LASTEVENT)] = { 0 };
+      evmask.deviceid = XIAllDevices;
+      evmask.mask_len = sizeof(mask);
+      evmask.mask = mask;
+
+      XISetMask(evmask.mask, XI_TouchBegin);
+      XISetMask(evmask.mask, XI_TouchUpdate);
+      XISetMask(evmask.mask, XI_TouchEnd);
+
+      display_x11->xi.XISelectEvents (xdisplay, xid, &evmask, 1);
+    }
+#endif
+
   switch (GDK_WINDOW_TYPE (private))
     {
     case GDK_WINDOW_DIALOG:
diff --git a/libs/tk/ydk/ydk/gdk/gdkdisplay.h b/libs/tk/ydk/ydk/gdk/gdkdisplay.h
index 7cc8665144..96bb0572c1 100644
--- a/libs/tk/ydk/ydk/gdk/gdkdisplay.h
+++ b/libs/tk/ydk/ydk/gdk/gdkdisplay.h
@@ -101,6 +101,8 @@ struct _GdkDisplay
   GdkKeyboardGrabInfo GSEAL (keyboard_grab);
   GdkPointerWindowInfo GSEAL (pointer_info);
 
+  GHashTable *GSEAL (touch_grabs);
+
   /* Last reported event time from server */
   guint32 GSEAL (last_event_time);
 };
diff --git a/libs/tk/ydk/ydk/gdk/gdkevents.h b/libs/tk/ydk/ydk/gdk/gdkevents.h
index f6b4e04d3a..5dc8e6657d 100644
--- a/libs/tk/ydk/ydk/gdk/gdkevents.h
+++ b/libs/tk/ydk/ydk/gdk/gdkevents.h
@@ -50,6 +50,7 @@ typedef struct _GdkEventNoExpose    GdkEventNoExpose;
 typedef struct _GdkEventVisibility  GdkEventVisibility;
 typedef struct _GdkEventMotion	    GdkEventMotion;
 typedef struct _GdkEventButton	    GdkEventButton;
+typedef struct _GdkEventTouch	    GdkEventTouch;
 typedef struct _GdkEventScroll      GdkEventScroll;  
 typedef struct _GdkEventKey	    GdkEventKey;
 typedef struct _GdkEventFocus	    GdkEventFocus;
@@ -152,6 +153,9 @@ typedef enum
   GDK_OWNER_CHANGE      = 34,
   GDK_GRAB_BROKEN       = 35,
   GDK_DAMAGE            = 36,
+  GDK_TOUCH_BEGIN       = 37,
+  GDK_TOUCH_UPDATE      = 38,
+  GDK_TOUCH_END         = 39,
   GDK_EVENT_LAST        /* helper variable for decls */
 } GdkEventType;
 
@@ -181,6 +185,9 @@ typedef enum
   GDK_PROXIMITY_OUT_MASK	= 1 << 19,
   GDK_SUBSTRUCTURE_MASK		= 1 << 20,
   GDK_SCROLL_MASK               = 1 << 21,
+  GDK_TOUCH_BEGIN_MASK		= 1 << 22,
+  GDK_TOUCH_UPDATE_MASK		= 1 << 23,
+  GDK_TOUCH_END_MASK		= 1 << 24,
   GDK_ALL_EVENTS_MASK		= 0x3FFFFE
 } GdkEventMask;
 
@@ -325,6 +332,21 @@ struct _GdkEventButton
   gdouble x_root, y_root;
 };
 
+struct _GdkEventTouch
+{
+  GdkEventType type;
+  GdkWindow *window;
+  gint8 send_event;
+  guint32 time;
+  gdouble x;
+  gdouble y;
+  guint state;
+  guint sequence;
+  guint flags;
+  guint deviceid;
+  gdouble x_root, y_root;
+};
+
 struct _GdkEventScroll
 {
   GdkEventType type;
@@ -500,6 +522,7 @@ union _GdkEvent
   GdkEventVisibility	    visibility;
   GdkEventMotion	    motion;
   GdkEventButton	    button;
+  GdkEventTouch 	    touch;
   GdkEventScroll            scroll;
   GdkEventKey		    key;
   GdkEventCrossing	    crossing;
diff --git a/libs/tk/ydk/ydk/gdk/gdkinternals.h b/libs/tk/ydk/ydk/gdk/gdkinternals.h
index 895b2587ce..14548a6bf0 100644
--- a/libs/tk/ydk/ydk/gdk/gdkinternals.h
+++ b/libs/tk/ydk/ydk/gdk/gdkinternals.h
@@ -92,7 +92,8 @@ typedef enum {
   GDK_DEBUG_MULTIHEAD	  = 1 <<12,
   GDK_DEBUG_XINERAMA	  = 1 <<13,
   GDK_DEBUG_DRAW	  = 1 <<14,
-  GDK_DEBUG_EVENTLOOP     = 1 <<15
+  GDK_DEBUG_EVENTLOOP     = 1 <<15,
+  GDK_DEBUG_TOUCH         = 1 <<16
 } GdkDebugFlag;
 
 #ifndef GDK_DISABLE_DEPRECATED
diff --git a/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h b/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h
index de85623662..0f6953f76b 100644
--- a/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h
+++ b/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h
@@ -36,6 +36,7 @@
 G_BEGIN_DECLS
 
 typedef struct _GdkDisplayX11 GdkDisplayX11;
+typedef struct _GdkXInput2Fn GdkXInput2Fn;
 typedef struct _GdkDisplayX11Class GdkDisplayX11Class;
 
 #define GDK_TYPE_DISPLAY_X11              (_gdk_display_x11_get_type())
@@ -52,6 +53,19 @@ typedef enum
   GDK_YES
 } GdkTristate;
 
+#ifdef HAVE_XINPUT2
+#include <X11/extensions/XInput2.h>
+
+struct _GdkXInput2Fn
+{
+	int           (*XISelectEvents)(Display*, Window, XIEventMask*, int);
+	XIDeviceInfo* (*XIQueryDevice)(Display*, int, int*);
+	void          (*XIFreeDeviceInfo)(XIDeviceInfo*);
+	void* libxi;
+};
+
+#endif
+
 struct _GdkDisplayX11
 {
   GdkDisplay parent_instance;
@@ -155,6 +169,12 @@ struct _GdkDisplayX11
 
   /* The offscreen window that has the pointer in it (if any) */
   GdkWindow *active_offscreen_window;
+
+#ifdef HAVE_XINPUT2
+	int xid_opcode;
+	GHashTable* touch_devices;
+	GdkXInput2Fn xi;
+#endif
 };
 
 struct _GdkDisplayX11Class
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/event.h b/libs/tk/ydkmm/ydkmm/gdkmm/event.h
index c4d091da36..7c3710d102 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/event.h
+++ b/libs/tk/ydkmm/ydkmm/gdkmm/event.h
@@ -92,6 +92,9 @@ enum EventType
   OWNER_CHANGE,
   GRAB_BROKEN,
   DAMAGE,
+  TOUCH_BEGIN,
+  TOUCH_UPDATE,
+  TOUCH_END,
   EVENT_LAST
 };
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/window.h b/libs/tk/ydkmm/ydkmm/gdkmm/window.h
index d951bb5bef..f9d2e8a6d7 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/window.h
+++ b/libs/tk/ydkmm/ydkmm/gdkmm/window.h
@@ -91,6 +91,9 @@ enum EventMask
   PROXIMITY_OUT_MASK = 1 << 19,
   SUBSTRUCTURE_MASK = 1 << 20,
   SCROLL_MASK = 1 << 21,
+  TOUCH_BEGIN_MASK = 1 << 22,
+  TOUCH_UPDATE_MASK = 1 << 23,
+  TOUCH_END_MASK = 1 << 24,
   ALL_EVENTS_MASK = 0x3FFFFE
 };
 
diff --git a/libs/tk/ytk/gtkmain.c b/libs/tk/ytk/gtkmain.c
index df84f4efeb..c152ad3755 100644
--- a/libs/tk/ytk/gtkmain.c
+++ b/libs/tk/ytk/gtkmain.c
@@ -1427,6 +1427,11 @@ rewrite_event_for_grabs (GdkEvent *event)
 	return NULL;
       break;
 
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_END:
+    case GDK_TOUCH_UPDATE:
+      return NULL;
+
     default:
       return NULL;
     }
@@ -1640,6 +1645,12 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_PROXIMITY_OUT:
       gtk_propagate_event (grab_widget, event);
       break;
+
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_UPDATE:
+    case GDK_TOUCH_END:
+      gtk_propagate_event (event_widget, event);
+      break;
       
     case GDK_ENTER_NOTIFY:
       GTK_PRIVATE_SET_FLAG (event_widget, GTK_HAS_POINTER);
diff --git a/libs/tk/ytk/gtkwidget.c b/libs/tk/ytk/gtkwidget.c
index b8f8d78636..8b58c36d2e 100644
--- a/libs/tk/ytk/gtkwidget.c
+++ b/libs/tk/ytk/gtkwidget.c
@@ -197,6 +197,9 @@ enum {
   KEYNAV_FAILED,
   DRAG_FAILED,
   DAMAGE_EVENT,
+  TOUCH_BEGIN,
+  TOUCH_UPDATE,
+  TOUCH_END,
   LAST_SIGNAL
 };
 
@@ -537,6 +540,9 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->drag_drop = NULL;
   klass->drag_data_received = NULL;
   klass->screen_changed = NULL;
+  klass->touch_begin_event = NULL;
+  klass->touch_update_event = NULL;
+  klass->touch_end_event = NULL;
   klass->can_activate_accel = gtk_widget_real_can_activate_accel;
   klass->grab_broken_event = NULL;
   klass->query_tooltip = gtk_widget_real_query_tooltip;
@@ -2377,6 +2383,39 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		  G_TYPE_NONE, 1,
 		  GDK_TYPE_SCREEN);
 
+
+  /* YTK Touch */
+  widget_signals[TOUCH_BEGIN] =
+    g_signal_new (I_("touch-start"),
+		  G_TYPE_FROM_CLASS (gobject_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GtkWidgetClass, touch_begin_event),
+		  _gtk_boolean_handled_accumulator, NULL,
+		  _gtk_marshal_BOOLEAN__BOXED,
+		  G_TYPE_BOOLEAN, 1,
+		  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  widget_signals[TOUCH_UPDATE] =
+    g_signal_new (I_("touch-update"),
+		  G_TYPE_FROM_CLASS (gobject_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GtkWidgetClass, touch_update_event),
+		  _gtk_boolean_handled_accumulator, NULL,
+		  _gtk_marshal_BOOLEAN__BOXED,
+		  G_TYPE_BOOLEAN, 1,
+		  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  widget_signals[TOUCH_END] =
+    g_signal_new (I_("touch-end"),
+		  G_TYPE_FROM_CLASS (gobject_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (GtkWidgetClass, touch_end_event),
+		  _gtk_boolean_handled_accumulator, NULL,
+		  _gtk_marshal_BOOLEAN__BOXED,
+		  G_TYPE_BOOLEAN, 1,
+		  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+
   /**
    * GtkWidget::can-activate-accel:
    * @widget: the object which received the signal
@@ -5001,6 +5040,15 @@ gtk_widget_event_internal (GtkWidget *widget,
 	case GDK_DAMAGE:
 	  signal_num = DAMAGE_EVENT;
 	  break;
+	case GDK_TOUCH_BEGIN:
+	  signal_num = TOUCH_BEGIN;
+	  break;
+	case GDK_TOUCH_END:
+	  signal_num = TOUCH_END;
+	  break;
+	case GDK_TOUCH_UPDATE:
+	  signal_num = TOUCH_UPDATE;
+	  break;
 	default:
 	  g_warning ("gtk_widget_event(): unhandled event type: %d", event->type);
 	  signal_num = -1;
diff --git a/libs/tk/ytk/wscript b/libs/tk/ytk/wscript
index 63e1c2afc5..365e4eaec4 100644
--- a/libs/tk/ytk/wscript
+++ b/libs/tk/ytk/wscript
@@ -286,9 +286,9 @@ def build(bld):
                             'GTK_VERSION="2.24.23"', 'GTK_BINARY_VERSION="2.10.0"', 'GTK_HOST="ardour"',
                             'PACKAGE="' + I18N_PACKAGE + '"',
                             'GETTEXT_PACKAGE="' + I18N_PACKAGE + '"',
-                            'GTK_DATA_PREFIX="' + bld.env['PREFIX'] + '"', 
-                            'GTK_SYSCONFDIR="' + bld.env['SYSCONFDIR'] + '"', 
-                            'GTK_DATA_DIR="' + bld.env['DATADIR'] + '"', 
+                            'GTK_DATA_PREFIX="' + bld.env['PREFIX'] + '"',
+                            'GTK_SYSCONFDIR="' + bld.env['SYSCONFDIR'] + '"',
+                            'GTK_DATA_DIR="' + bld.env['DATADIR'] + '"',
                             'GTK_LIBDIR="' + bld.env['LIBDIR'] + '"',
                           ]
     obj.vnum            = LIBYDK_VERSION
@@ -314,14 +314,14 @@ def build(bld):
             lang = os.path.basename(mo.srcpath()).replace('.mo', '')
             bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + bld.env['MAJOR'] + '.mo'),
                            mo)
-def i18n(bld):
+def i18n_func(bld):
     autowaf.build_i18n(bld, '.', 'libs/tk/ytk', I18N_PACKAGE + bld.env['MAJOR'], libytk_sources)
 
-def i18n_pot(bld):
-    autowaf.build_i18n(bld, '.', 'libs/tk/ytk', I18N_PACKAGE + bld.env['MAJOR'], libytk_sources)
+def i18n_pot_func(bld):
+    autowaf.build_i18n_pot(bld, '.', 'libs/tk/ytk', I18N_PACKAGE + bld.env['MAJOR'], libytk_sources)
 
-def i18n_po(bld):
+def i18n_po_func(bld):
     autowaf.build_i18n_po(bld, '.', 'libs/tk/ytk', I18N_PACKAGE + bld.env['MAJOR'], libytk_sources)
 
-def i18n_mo(bld):
+def i18n_mo_func(bld):
     autowaf.build_i18n_mo(bld, '.', 'libs/tk/ytk', I18N_PACKAGE + bld.env['MAJOR'], libytk_sources)
diff --git a/libs/tk/ytk/ytk/gtk/gtkwidget.h b/libs/tk/ytk/ytk/gtk/gtkwidget.h
index d26cd4d077..fc9546b226 100644
--- a/libs/tk/ytk/ytk/gtk/gtkwidget.h
+++ b/libs/tk/ytk/ytk/gtk/gtkwidget.h
@@ -726,6 +726,12 @@ struct _GtkWidgetClass
 					 GdkEventAny	     *event);
   gboolean (* window_state_event)	(GtkWidget	     *widget,
 					 GdkEventWindowState *event);
+  gboolean (* touch_begin_event)	(GtkWidget	     *widget,
+					 GdkEventTouch       *event);
+  gboolean (* touch_update_event)	(GtkWidget	     *widget,
+					 GdkEventTouch       *event);
+  gboolean (* touch_end_event)		(GtkWidget	     *widget,
+					 GdkEventTouch       *event);
   
   /* selection */
   void (* selection_get)           (GtkWidget          *widget,
diff --git a/libs/tk/ytkmm/widget.cc b/libs/tk/ytkmm/widget.cc
index 831041fc41..02850fded1 100644
--- a/libs/tk/ytkmm/widget.cc
+++ b/libs/tk/ytkmm/widget.cc
@@ -3395,6 +3395,9 @@ void Widget_Class::class_init_function(void* g_class, void* class_data)
   klass->drag_motion = &drag_motion_callback;
   klass->drag_drop = &drag_drop_callback;
   klass->drag_data_received = &drag_data_received_callback;
+  klass->touch_begin_event = &touch_begin_callback;
+  klass->touch_update_event = &touch_update_callback;
+  klass->touch_end_event = &touch_end_callback;
 #ifdef GTKMM_ATKMM_ENABLED
 #ifndef GTKMM_DISABLE_DEPRECATED
 
@@ -4344,6 +4347,120 @@ gboolean Widget_Class::button_release_event_callback(GtkWidget* self, GdkEventBu
   typedef gboolean RType;
   return RType();
 }
+gboolean Widget_Class::touch_begin_callback(GtkWidget* self, GdkEventTouch* p0)
+{
+  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
+      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+
+  // Non-gtkmmproc-generated custom classes implicitly call the default
+  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
+  // generated classes can use this optimisation, which avoids the unnecessary
+  // parameter conversions if there is no possibility of the virtual function
+  // being overridden:
+  if(obj_base && obj_base->is_derived_())
+  {
+    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+    if(obj) // This can be NULL during destruction.
+    {
+      try // Trap C++ exceptions which would normally be lost because this is a C callback.
+      {
+        // Call the virtual member method, which derived classes might override.
+        return static_cast<int>(obj->on_touch_begin_event(p0));
+      }
+      catch(...)
+      {
+        Glib::exception_handlers_invoke();
+      }
+    }
+  }
+
+  BaseClassType *const base = static_cast<BaseClassType*>(
+        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
+    );
+
+  // Call the original underlying C function:
+  if(base && base->touch_begin_event)
+    return (*base->touch_begin_event)(self, p0);
+
+  typedef gboolean RType;
+  return RType();
+}
+gboolean Widget_Class::touch_update_callback(GtkWidget* self, GdkEventTouch* p0)
+{
+  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
+      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+
+  // Non-gtkmmproc-generated custom classes implicitly call the default
+  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
+  // generated classes can use this optimisation, which avoids the unnecessary
+  // parameter conversions if there is no possibility of the virtual function
+  // being overridden:
+  if(obj_base && obj_base->is_derived_())
+  {
+    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+    if(obj) // This can be NULL during destruction.
+    {
+      try // Trap C++ exceptions which would normally be lost because this is a C callback.
+      {
+        // Call the virtual member method, which derived classes might override.
+        return static_cast<int>(obj->on_touch_update_event(p0));
+      }
+      catch(...)
+      {
+        Glib::exception_handlers_invoke();
+      }
+    }
+  }
+
+  BaseClassType *const base = static_cast<BaseClassType*>(
+        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
+    );
+
+  // Call the original underlying C function:
+  if(base && base->touch_update_event)
+    return (*base->touch_update_event)(self, p0);
+
+  typedef gboolean RType;
+  return RType();
+}
+gboolean Widget_Class::touch_end_callback(GtkWidget* self, GdkEventTouch* p0)
+{
+  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
+      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+
+  // Non-gtkmmproc-generated custom classes implicitly call the default
+  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
+  // generated classes can use this optimisation, which avoids the unnecessary
+  // parameter conversions if there is no possibility of the virtual function
+  // being overridden:
+  if(obj_base && obj_base->is_derived_())
+  {
+    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+    if(obj) // This can be NULL during destruction.
+    {
+      try // Trap C++ exceptions which would normally be lost because this is a C callback.
+      {
+        // Call the virtual member method, which derived classes might override.
+        return static_cast<int>(obj->on_touch_end_event(p0));
+      }
+      catch(...)
+      {
+        Glib::exception_handlers_invoke();
+      }
+    }
+  }
+
+  BaseClassType *const base = static_cast<BaseClassType*>(
+        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
+    );
+
+  // Call the original underlying C function:
+  if(base && base->touch_end_event)
+    return (*base->touch_end_event)(self, p0);
+
+  typedef gboolean RType;
+  return RType();
+}
 gboolean Widget_Class::scroll_event_callback(GtkWidget* self, GdkEventScroll* p0)
 {
   Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
@@ -7516,6 +7633,42 @@ bool Gtk::Widget::on_button_release_event(GdkEventButton* event)
   typedef bool RType;
   return RType();
 }
+bool Gtk::Widget::on_touch_begin_event(GdkEventTouch* event)
+{
+  BaseClassType *const base = static_cast<BaseClassType*>(
+      g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
+  );
+
+  if(base && base->touch_begin_event)
+    return (*base->touch_begin_event)(gobj(),event);
+
+  typedef bool RType;
+  return RType();
+}
+bool Gtk::Widget::on_touch_update_event(GdkEventTouch* event)
+{
+  BaseClassType *const base = static_cast<BaseClassType*>(
+      g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
+  );
+
+  if(base && base->touch_update_event)
+    return (*base->touch_update_event)(gobj(),event);
+
+  typedef bool RType;
+  return RType();
+}
+bool Gtk::Widget::on_touch_end_event(GdkEventTouch* event)
+{
+  BaseClassType *const base = static_cast<BaseClassType*>(
+      g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
+  );
+
+  if(base && base->touch_end_event)
+    return (*base->touch_end_event)(gobj(),event);
+
+  typedef bool RType;
+  return RType();
+}
 bool Gtk::Widget::on_scroll_event(GdkEventScroll* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm.h b/libs/tk/ytkmm/ytkmm/gtkmm.h
index d8448043d0..c489154775 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm.h
@@ -84,10 +84,14 @@ extern const int gtkmm_major_version;
 extern const int gtkmm_minor_version;
 extern const int gtkmm_micro_version;
 
+#ifndef COMPILER_MSVC
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #include <glibmm.h>
 #pragma GCC diagnostic pop
+#else
+#include <glibmm.h>
+#endif
 #include <giomm.h>
 #include <gdkmm.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/widget_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/widget_p.h
index eaba9a3f12..10a2e5dbb7 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/widget_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/widget_p.h
@@ -90,6 +90,9 @@ protected:
   static gboolean drag_motion_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3);
   static gboolean drag_drop_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3);
   static void drag_data_received_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, GtkSelectionData* p3, guint p4, guint p5);
+  static gboolean touch_begin_callback(GtkWidget*, GdkEventTouch*);
+  static gboolean touch_update_callback(GtkWidget*, GdkEventTouch*);
+  static gboolean touch_end_callback(GtkWidget*, GdkEventTouch*);
 #ifdef GTKMM_ATKMM_ENABLED
 #ifndef GTKMM_DISABLE_DEPRECATED
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/stockid.h b/libs/tk/ytkmm/ytkmm/gtkmm/stockid.h
index 682a082992..5deee3f0e3 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/stockid.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/stockid.h
@@ -23,10 +23,14 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifndef COMPILER_MSVC
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #include <glibmm.h>
 #pragma GCC diagnostic pop
+#else
+#include <glibmm.h>
+#endif
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
index 058d030cc9..d07dc13974 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
@@ -490,6 +490,9 @@ protected:
   virtual bool on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
   /// This is a default handler for the signal signal_drag_data_received().
   virtual void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time);
+  virtual bool on_touch_begin_event(GdkEventTouch* event);
+  virtual bool on_touch_update_event(GdkEventTouch* event);
+  virtual bool on_touch_end_event(GdkEventTouch* event);
 #ifdef GTKMM_ATKMM_ENABLED
   /// This is a default handler for the signal signal_get_accessible().
   virtual Glib::RefPtr<Atk::Object> on_get_accessible();
diff --git a/libs/widgets/ardour_button.cc b/libs/widgets/ardour_button.cc
index d4157b37e9..6d0a551ef4 100644
--- a/libs/widgets/ardour_button.cc
+++ b/libs/widgets/ardour_button.cc
@@ -103,6 +103,7 @@ ArdourButton::ArdourButton (Element e, bool toggle)
 	UIConfigurationBase::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
 	/* This is not provided by gtkmm */
 	signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
+	add_events (Gdk::TOUCH_BEGIN_MASK | Gdk::TOUCH_END_MASK);
 }
 
 ArdourButton::ArdourButton (const std::string& str, Element e, bool toggle)
@@ -154,6 +155,7 @@ ArdourButton::ArdourButton (const std::string& str, Element e, bool toggle)
 	UIConfigurationBase::instance().DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
 	/* This is not provided by gtkmm */
 	signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
+	add_events (Gdk::TOUCH_BEGIN_MASK | Gdk::TOUCH_END_MASK);
 }
 
 ArdourButton::~ArdourButton()
@@ -944,6 +946,42 @@ ArdourButton::set_led_left (bool yn)
 	_led_left = yn;
 }
 
+bool
+ArdourButton::on_touch_begin_event (GdkEventTouch *ev)
+{
+	printf ("ArdourButton::on_touch_begin_event finger %d\n", ev->sequence);
+	focus_handler (this);
+
+	CairoWidget::set_dirty ();
+
+	if (!_act_on_release) {
+		if (_action) {
+			_action->activate ();
+		} else if (_auto_toggle) {
+			set_active (!get_active ());
+			signal_clicked ();
+		}
+	}
+	return true;
+}
+
+bool
+ArdourButton::on_touch_end_event (GdkEventTouch *ev)
+{
+	printf ("ArdourButton::on_touch_end_event finger: %d\n", ev->sequence);
+	CairoWidget::set_dirty ();
+
+	if (_act_on_release && _auto_toggle && !_action) {
+		set_active (!get_active ());
+	}
+	signal_clicked ();
+	if (_act_on_release && _action) {
+		_action->activate ();
+	}
+
+	return true;
+}
+
 bool
 ArdourButton::on_button_press_event (GdkEventButton *ev)
 {
diff --git a/libs/widgets/ardour_fader.cc b/libs/widgets/ardour_fader.cc
index b086de64b6..e833640fcf 100644
--- a/libs/widgets/ardour_fader.cc
+++ b/libs/widgets/ardour_fader.cc
@@ -61,6 +61,8 @@ ArdourFader::ArdourFader (Gtk::Adjustment& adj, int orientation, int fader_lengt
 {
 	update_unity_position ();
 
+	add_events (Gdk::TOUCH_UPDATE_MASK);
+
 	if (_orien == VERT) {
 		CairoWidget::set_size_request(_girth, _span);
 	} else {
@@ -464,6 +466,18 @@ ArdourFader::on_motion_notify_event (GdkEventMotion* ev)
 	return true;
 }
 
+bool
+ArdourFader::on_touch_update_event (GdkEventTouch* ev)
+{
+  GdkEventMotion mev;
+  mev.window = ev->window;
+  mev.time   = ev->time;
+  mev.x      = ev->x;
+  mev.y      = ev->y;
+  mev.state  = 0;
+  return ArdourFader::on_motion_notify_event (&mev);
+}
+
 /** @return pixel offset of the current value from the right or bottom of the fader */
 int
 ArdourFader::display_span ()
diff --git a/libs/widgets/fader_widget.cc b/libs/widgets/fader_widget.cc
index bcbe904234..a226bbda95 100644
--- a/libs/widgets/fader_widget.cc
+++ b/libs/widgets/fader_widget.cc
@@ -41,6 +41,8 @@ FaderWidget::FaderWidget (Gtk::Adjustment& adj, int orien)
 	            | Gdk::SCROLL_MASK
 	            | Gdk::ENTER_NOTIFY_MASK
 	            | Gdk::LEAVE_NOTIFY_MASK
+	            | Gdk::TOUCH_BEGIN_MASK
+	            | Gdk::TOUCH_END_MASK
 	           );
 
 	_adjustment.signal_value_changed().connect (mem_fun (*this, &FaderWidget::adjustment_changed));
@@ -100,6 +102,29 @@ FaderWidget::on_button_press_event (GdkEventButton* ev)
 	return (_tweaks & NoButtonForward) ? true : false;
 }
 
+bool
+FaderWidget::on_touch_begin_event (GdkEventTouch *ev)
+{
+  StartGesture (0);
+  _grab_loc = (_orien == VERT) ? ev->y : ev->x;
+  _grab_start = (_orien == VERT) ? ev->y : ev->x;
+  _grab_window = ev->window;
+  _dragging = true;
+  return true;
+}
+
+bool
+FaderWidget::on_touch_end_event (GdkEventTouch *ev)
+{
+  if (!_dragging) {
+    return true;
+  }
+  _dragging = false;
+  StopGesture (0);
+
+  return true;
+}
+
 bool
 FaderWidget::on_enter_notify_event (GdkEventCrossing*)
 {
diff --git a/libs/widgets/widgets/ardour_button.h b/libs/widgets/widgets/ardour_button.h
index ad998ebe6c..3681acaa9b 100644
--- a/libs/widgets/widgets/ardour_button.h
+++ b/libs/widgets/widgets/ardour_button.h
@@ -124,6 +124,8 @@ class LIBWIDGETS_API ArdourButton : public CairoWidget , public Gtkmm2ext::Activ
 
 	bool on_button_press_event (GdkEventButton*);
 	bool on_button_release_event (GdkEventButton*);
+	bool on_touch_begin_event (GdkEventTouch*);
+	bool on_touch_end_event (GdkEventTouch*);
 
 	void set_image (const Glib::RefPtr<Gdk::Pixbuf>&);
 
diff --git a/libs/widgets/widgets/ardour_fader.h b/libs/widgets/widgets/ardour_fader.h
index cfcb15570f..bcbd59af9a 100644
--- a/libs/widgets/widgets/ardour_fader.h
+++ b/libs/widgets/widgets/ardour_fader.h
@@ -55,6 +55,7 @@ protected:
 
 	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	bool on_motion_notify_event (GdkEventMotion*);
+	bool on_touch_update_event (GdkEventTouch*);
 
 	void on_state_changed (Gtk::StateType);
 	void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
diff --git a/libs/widgets/widgets/binding_proxy.h b/libs/widgets/widgets/binding_proxy.h
index 438b893447..8f15abe324 100644
--- a/libs/widgets/widgets/binding_proxy.h
+++ b/libs/widgets/widgets/binding_proxy.h
@@ -25,6 +25,8 @@
 
 #include "pbd/signals.h"
 
+#include "gdk/gdkevents.h"
+
 #include "widgets/visibility.h"
 
 namespace PBD {
diff --git a/libs/widgets/widgets/fader_widget.h b/libs/widgets/widgets/fader_widget.h
index baff3d9cbb..cd21dd0f83 100644
--- a/libs/widgets/widgets/fader_widget.h
+++ b/libs/widgets/widgets/fader_widget.h
@@ -62,6 +62,8 @@ public:
 protected:
 	bool on_button_press_event (GdkEventButton*);
 	bool on_button_release_event (GdkEventButton*);
+	bool on_touch_begin_event (GdkEventTouch*);
+	bool on_touch_end_event (GdkEventTouch*);
 	bool on_enter_notify_event (GdkEventCrossing* ev);
 	bool on_leave_notify_event (GdkEventCrossing* ev);
 	bool on_scroll_event (GdkEventScroll* ev);
diff --git a/libs/zita-convolver/zita-convolver/zita-convolver.h b/libs/zita-convolver/zita-convolver/zita-convolver.h
index 74f8e41c5b..1b0e6ca3f9 100644
--- a/libs/zita-convolver/zita-convolver/zita-convolver.h
+++ b/libs/zita-convolver/zita-convolver/zita-convolver.h
@@ -27,6 +27,10 @@
 
 #include "zita-convolver/zconvolver_visibility.h"
 
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined(__WINPTHREADS_VERSION)
+#include <semaphore.h>
+#endif
+
 namespace ArdourZita {
 
 #ifdef ZCSEMA_IS_IMPLEMENTED
@@ -36,8 +40,6 @@ namespace ArdourZita {
 /* note: mingw and msvc actually use PTW32's implementation of semaphores */
 #if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined (__WINPTHREADS_VERSION)
 
-#include <semaphore.h>
-
 class LIBZCONVOLVER_API ZCsema
 {
 public:
diff --git a/share/scripts/add_cdmarker.lua b/share/scripts/add_cdmarker.lua
index 6636b8d198..393e3db1c0 100644
--- a/share/scripts/add_cdmarker.lua
+++ b/share/scripts/add_cdmarker.lua
@@ -2,6 +2,6 @@ ardour { ["type"] = "EditorAction", name = "Add CD marker" }
 function 
 factory () 
 	return function () 
-		Editor:mouse_add_new_marker (Temporal.timepos_t (Session:transport_sample()), ARDOUR.LocationFlags.IsCDMarker, 0)
+		Editor:add_location_mark (Temporal.timepos_t (Session:transport_sample()), ARDOUR.LocationFlags.IsCDMarker, 0)
 	end 
 end
diff --git a/share/scripts/track_organizer.lua b/share/scripts/track_organizer.lua
index 0ad516ed1f..5c0cf4d82e 100644
--- a/share/scripts/track_organizer.lua
+++ b/share/scripts/track_organizer.lua
@@ -56,7 +56,7 @@ function factory () return function ()
            type = "dropdown", key = t:name() .. ' g',  col = 1, colspan = 1, title = "", values = pl, default = interrogate(t)
        }) --group
        table.insert(dialog_options, {
-           type = "entry",    key = t:name() .. ' cm', col = 2, colspan = 1, default = t:comment(), title = ""
+           type = "textarea",    key = t:name() .. ' cm', col = 2, colspan = 1, default = t:comment(), title = ""
        }) --comment
        table.insert(dialog_options, {
            type = "dropdown", key = t:name() .. ' c',  col = 3, colspan = 1, title = "", values = rbow, default = find_color(t)
diff --git a/tools/signal-test/signal-test.cc b/tools/signal-test/signal-test.cc
index c328e142cd..77a3acafd2 100644
--- a/tools/signal-test/signal-test.cc
+++ b/tools/signal-test/signal-test.cc
@@ -46,7 +46,7 @@ public:
 		run_loop_thread = Glib::Threads::Thread::self ();
 	}
 
-	void call_slot (InvalidationRecord* ir, const boost::function<void ()>& f)
+	void call_slot (InvalidationRecord* ir, const std::function<void ()>& f)
 	{
 		if (Glib::Threads::Thread::self () == run_loop_thread) {
 			f ();
diff --git a/wscript b/wscript
index 8f5cb996b7..8ef65243d0 100644
--- a/wscript
+++ b/wscript
@@ -16,22 +16,6 @@ from waflib.Tools.compiler_cxx import cxx_compiler
 c_compiler['darwin'] = ['gcc', 'clang' ]
 cxx_compiler['darwin'] = ['g++', 'clang++' ]
 
-class i18n(BuildContext):
-    cmd = 'i18n'
-    fun = 'i18n'
-
-class i18n_pot(BuildContext):
-    cmd = 'i18n_pot'
-    fun = 'i18n_pot'
-
-class i18n_po(BuildContext):
-    cmd = 'i18n_po'
-    fun = 'i18n_po'
-
-class i18n_mo(BuildContext):
-    cmd = 'i18n_mo'
-    fun = 'i18n_mo'
-
 compiler_flags_dictionaries= {
     'gcc' : {
         # Flags required when building a debug build
@@ -776,8 +760,6 @@ int main() { return 0; }''',
     compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
     compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"')
 
-    conf.env['PROGRAM_NAME'] = Options.options.program_name
-
     if opt.debug:
         conf.env.append_value('CFLAGS', debug_flags)
         conf.env.append_value('CXXFLAGS', debug_flags)
@@ -798,9 +780,9 @@ int main() { return 0; }''',
     conf.env.append_value('CXXFLAGS', cxx_flags)
     conf.env.append_value('LINKFLAGS', linker_flags)
 
-def create_resource_file(icon):
+def create_resource_file(name):
     try:
-        text = 'IDI_ICON1 ICON DISCARDABLE "icons/' + icon + '.ico"\n'
+        text = 'IDI_ICON1 ICON DISCARDABLE "icons/' + name + '.ico"\n'
         o = open('gtk2_ardour/windows_icon.rc', 'w')
         o.write(text)
         o.close()
@@ -892,8 +874,6 @@ def options(opt):
                     help="Run tests after build")
     opt.add_option('--single-tests', action='store_true', default=False, dest='single_tests',
                     help="Build a single executable for each unit test")
-    #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
-    # help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
     opt.add_option('--maschine', action='store_true', default=False, dest='maschine',
                     help='Compile with support for NI-Maschine')
     opt.add_option('--generic', action='store_true', default=False, dest='generic',
@@ -977,6 +957,8 @@ def configure(conf):
         if itstool != "itstool" or version[0] < "2":
             conf.fatal("--freedesktop requires itstool > 2.0.0 to translate files.")
 
+    conf.env['PROGRAM_NAME'] = Options.options.program_name or 'Ardour'
+
     conf.env['VERSION'] = VERSION
     conf.env['MAJOR'] = MAJOR
     conf.env['MINOR'] = MINOR
@@ -1340,8 +1322,6 @@ int main () { __int128 x = 0; return 0; }
         conf.env['RUN_TESTS'] = opts.run_tests
     if opts.single_tests:
         conf.env['SINGLE_TESTS'] = opts.single_tests
-    #if opts.tranzport:
-    #    conf.env['TRANZPORT'] = 1
     if not opts.no_windows_vst:
         if Options.options.dist_target == 'mingw':
             conf.define('WINDOWS_VST_SUPPORT', 1)
@@ -1570,7 +1550,6 @@ const char* const ardour_config_info = "\\n\\
 #    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
     write_config_text('Threaded WaveViews',    not opts.no_threaded_waveviews)
     write_config_text('Translation',           not opts.no_nls)
-#    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
     write_config_text('Use LLD linker',        opts.use_lld)
     write_config_text('VST3 support',          conf.is_defined('VST3_SUPPORT'))
@@ -1665,17 +1644,36 @@ def build(bld):
     if bld.env['RUN_TESTS']:
         bld.add_post_fun(test)
 
-def i18n(bld):
-    print(bld.env)
+# The following i18n command implementations need a BuildContext (with .env),
+# and we thus create BuildContext subclasses that define the `cmd` command to
+# execute the `fun` function (which often will recurse).
+
+class _i18n_build_context(BuildContext):
+    cmd = 'i18n'
+    fun = 'i18n_func'
+
+def i18n_func(bld):
     bld.recurse (i18n_children)
 
-def i18n_pot(bld):
+class _i18n_pot_build_context(BuildContext):
+    cmd = 'i18n_pot'
+    fun = 'i18n_pot_func'
+
+def i18n_pot_func(bld):
     bld.recurse (i18n_children)
 
-def i18n_po(bld):
+class _i18n_po_build_context(BuildContext):
+    cmd = 'i18n_po'
+    fun = 'i18n_po_func'
+
+def i18n_po_func(bld):
     bld.recurse (i18n_children)
 
-def i18n_mo(bld):
+class _i18n_mo_build_context(BuildContext):
+    cmd = 'i18n_mo'
+    fun = 'i18n_mo_func'
+
+def i18n_mo_func(bld):
     bld.recurse (i18n_children)
 
 def tarball(bld):