LT: record in non-layered mode. (still nondestructive tho)

gtk2_ardour/ardour_ui.cc

@@ -326,6 +326,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	, save_as_dialog (0)
 	, meterbridge (0)
 	, rc_option_editor (0)
+	, _livetrax_sections (0)
 	, speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
 	, add_route_dialog (X_("add-routes"), _("Add Tracks/Busses"))
 	, about (X_("about"), _("About"))
@@ -341,6 +342,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	, dsp_statistics_window (X_("dsp-statistics"), _("Performance Meters"))
 	, transport_masters_window (X_("transport-masters"), _("Transport Masters"))
 	, livetrax_track_dialog (nullptr)
+	, _livetrax_btn_rec_all (_("Rec All"))
+	, _livetrax_btn_rec_none (_("Rec None"))
+	, _livetrax_btn_peak_reset (_("Reset Peak Hold"))
+	, _livetrax_btn_marker_new (_("New"))
+	, _livetrax_btn_prev_marker (_("Prev"))
+	, _livetrax_btn_next_marker (_("Next"))
 	, session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
 	, add_video_dialog (X_("add-video"), _("Add Video"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
 	, bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
@@ -890,6 +897,9 @@ ARDOUR_UI::~ARDOUR_UI ()
 		delete duplicate_routes_dialog; duplicate_routes_dialog = 0;
 		delete trigger_page; trigger_page = 0;
 		delete recorder; recorder = 0;
+#ifdef LIVETRAX
+		delete _livetrax_sections; _livetrax_sections = 0;
+#endif
 		delete editor; editor = 0;
 		delete mixer; mixer = 0;
 		delete rc_option_editor; rc_option_editor = 0; // failed to wrap object warning

gtk2_ardour/ardour_ui.h

@@ -85,11 +85,13 @@
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
 #include "widgets/ardour_spacer.h"
+#include "widgets/pane.h"
 
 #include "add_route_dialog.h"
 #include "ardour_dialog.h"
 #include "ardour_window.h"
 #include "editing.h"
+#include "editor_sections.h"
 #include "enums.h"
 #include "mini_timeline.h"
 #include "shuttle_control.h"
@@ -369,6 +371,8 @@ public:
 	void setup_profile ();
 	void setup_tooltips ();
 
+	void update_section_visibility (bool);
+
 	void set_shuttle_fract (double);
 
 	void get_process_buffers ();
@@ -410,6 +414,7 @@ public:
 		LiveTraxEditorVisible = 0x1,
 		LiveTraxMixerVisible = 0x2,
 		LiveTraxMeterVisible = 0x4,
+		LiveTraxPrefsVisible = 0x8,
 	};
 
 	void livetrax_toggle_visibility (LiveTraxVisibility);
@@ -455,6 +460,9 @@ private:
 	bool          _was_dirty;
 	bool          _mixer_on_top;
 
+	EditorSections* _livetrax_sections;
+	ArdourWidgets::HPane livetrax_section_pane;
+
 	Gtk::Menu*    _shared_popup_menu;
 
 	BasicUI*      _basic_ui;
@@ -635,16 +643,27 @@ private:
 
 	/* LiveTrax */
 
-	Gtk::HBox livetrax_top_bar;
-	Gtk::HBox livetrax_transport_bar;
+	Gtk::Table livetrax_top_table;
+	Gtk::Table livetrax_edit_table;
 	Gtk::HBox livetrax_meter_bar;
 	Gtk::HBox livetrax_editor_bar;
+	Gtk::HBox livetrax_prefs_bar;
 	Gtk::HBox livetrax_mixer_bar;
+
+	ArdourWidgets::ArdourButton  _livetrax_btn_rec_all;
+	ArdourWidgets::ArdourButton  _livetrax_btn_rec_none;
+	ArdourWidgets::ArdourButton  _livetrax_btn_peak_reset;
+
+	ArdourWidgets::ArdourButton  _livetrax_btn_marker_new;
+	ArdourWidgets::ArdourButton  _livetrax_btn_prev_marker;
+	ArdourWidgets::ArdourButton  _livetrax_btn_next_marker;
+
 	TimeInfoBox* livetrax_time_info_box;
 	ArdourWidgets::ArdourButton* livetrax_multi_out_button;
 	ArdourWidgets::ArdourButton* livetrax_stereo_out_button;
 	ArdourWidgets::ArdourButton* livetrax_meter_view_button;
 	ArdourWidgets::ArdourButton* livetrax_editor_view_button;
+	ArdourWidgets::ArdourButton* livetrax_prefs_view_button;
 	ArdourWidgets::ArdourButton* livetrax_mixer_view_button;
 	ArdourWidgets::ArdourButton* livetrax_lock_button;
 	ArdourWidgets::ArdourButton* livetrax_view_in_folder_button;

gtk2_ardour/ardour_ui2.cc

@@ -986,9 +986,7 @@ void
 ARDOUR_UI::show_ui_prefs ()
 {
 	if (rc_option_editor) {
-#ifdef LIVETRAX
-		rc_option_editor->present();
-#else
+#ifndef LIVETRAX
 		show_tabbable (rc_option_editor);
 #endif
 		rc_option_editor->set_current_page (_("Appearance"));
@@ -999,9 +997,7 @@ void
 ARDOUR_UI::show_mixer_prefs ()
 {
 	if (rc_option_editor) {
-#ifdef LIVETRAX
-		rc_option_editor->present();
-#else
+#ifndef LIVETRAX
 		show_tabbable (rc_option_editor);
 #endif
 		rc_option_editor->set_current_page (_("Signal Flow"));
@@ -1012,9 +1008,7 @@ void
 ARDOUR_UI::show_plugin_prefs ()
 {
 	if (rc_option_editor) {
-#ifdef LIVETRAX
-		rc_option_editor->present ();
-#else
+#ifndef LIVETRAX
 		show_tabbable (rc_option_editor);
 #endif
 		rc_option_editor->set_current_page (_("Plugins"));
@@ -1029,9 +1023,7 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
 		return false;
 	}
 
-#ifdef LIVETRAX
-	rc_option_editor->present();
-#else
+#ifndef LIVETRAX
 	show_tabbable (rc_option_editor);
 #endif
 	rc_option_editor->set_current_page (_("Metronome"));

gtk2_ardour/ardour_ui_dependents.cc

@@ -137,6 +137,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 	DisplaySuspender ds;
 	BootMessage (_("Setup Editor"));
 	editor->set_session (s);
+	_livetrax_sections->set_session (s);
 	BootMessage (_("Setup Mixer"));
 	mixer->set_session (s);
 
@@ -391,8 +392,9 @@ ARDOUR_UI::livetrax_setup_windows ()
 	using namespace Gtk;
 
 	rc_option_editor = new RCOptionEditor;
+	rc_option_editor->hide();
 
-	ArdourButton::set_default_tweaks (ArdourButton::Tweaks (ArdourButton::ForceBoxy|ArdourButton::ForceFlat));
+	ArdourButton::set_default_tweaks (ArdourButton::Tweaks (ArdourButton::ForceFlat));
 
 	if (create_editor()) {
 		error << _("UI: cannot setup editor") << endmsg;
@@ -404,8 +406,11 @@ ARDOUR_UI::livetrax_setup_windows ()
 		return -1;
 	}
 
-	livetrax_time_info_box = new TimeInfoBox ("LiveTraxTimeInfo", false);
-	Image* icon = manage (new Image (ARDOUR_UI_UTILS::get_icon ("allenheath")));
+	_livetrax_sections = new EditorSections();
+
+	Image* icon = manage (new Image (ARDOUR_UI_UTILS::get_icon ("harrison")));
+	VBox* icon_vb = manage(new VBox());
+	icon_vb->pack_start(*icon);
 
 	VBox* vb;
 	HBox* hb;
@@ -413,11 +418,7 @@ ARDOUR_UI::livetrax_setup_windows ()
 	Gtkmm2ext::Bindings* bindings;
 	Glib::RefPtr<Action> act;
 
-	livetrax_top_bar.set_spacing (12);
-	livetrax_top_bar.set_border_width (12);
-	livetrax_top_bar.pack_start (*icon, false, false);
-	livetrax_top_bar.pack_start (*livetrax_time_info_box, false, false);
-	livetrax_top_bar.pack_start (*primary_clock, false, false);
+	livetrax_top_table.set_border_width (4);
 
 	EventBox* ev_dsp = manage (new EventBox);
 	EventBox* ev_timecode = manage (new EventBox);
@@ -432,21 +433,9 @@ ARDOUR_UI::livetrax_setup_windows ()
 	items.push_back (MenuElem (_("24 bit FLAC"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::livetrax_set_file_format), LiveTraxFileFormat (ARDOUR::FormatInt24, ARDOUR::FLAC))));
 
 	livetrax_sr_button = manage (new ArdourButton (""));
-	vb = manage (new VBox);
-	vb->pack_start (*livetrax_ff_dropdown, false, false);
-	vb->pack_start (*livetrax_sr_button, false, false);
-	livetrax_top_bar.pack_start (*vb, false, false);
 
 	CairoWidget* cw = new LiveTraxTCWidget;
 	cw->show ();
-	livetrax_top_bar.pack_start (*cw, false, false);
-
-	vb = manage (new VBox);
-	vb->pack_start (*ev_dsp, true, true);
-	vb->pack_start (disk_space_label, true, true);
-	vb->show_all ();
-
-	livetrax_top_bar.pack_end (*vb, false, false);
 
 	livetrax_multi_out_button = manage (new ArdourButton (_("Multi Out")));
 	livetrax_stereo_out_button = manage (new ArdourButton (_("Stereo Out")));
@@ -455,14 +444,16 @@ ARDOUR_UI::livetrax_setup_windows ()
 	act = ActionManager::get_action (X_("Common"), X_("enable-virtual-soundcheck"));
 	livetrax_multi_out_button->set_related_action (act);
 
-	vb = manage (new VBox);
-	vb->pack_start (*livetrax_stereo_out_button, true, true);
-	vb->pack_start (*livetrax_multi_out_button, true, true);
-	vb->show_all ();
+	livetrax_view_in_folder_button = manage (new ArdourButton (elements));
+	livetrax_view_in_folder_button->set_icon (ArdourWidgets::ArdourIcon::Folder);
 
-	livetrax_top_bar.pack_end (*vb, false, false);
+	livetrax_editor_view_button = manage (new ArdourButton (_("TRACKS"), ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
+	act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-editor"));
+	livetrax_editor_view_button->set_related_action (act);
 
-	/* transport bar */
+	livetrax_prefs_view_button = manage (new ArdourButton (_("PREFS"), ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
+	act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-prefs"));
+	livetrax_prefs_view_button->set_related_action (act);
 
 	livetrax_meter_view_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));;
 	livetrax_meter_view_button->set_icon (ArdourWidgets::ArdourIcon::Meters);
@@ -474,53 +465,104 @@ ARDOUR_UI::livetrax_setup_windows ()
 	act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-mixer"));
 	livetrax_mixer_view_button->set_related_action (act);
 
-	livetrax_editor_view_button = manage (new ArdourButton (_("TRACKS"), ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
-	act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-editor"));
-	livetrax_editor_view_button->set_related_action (act);
+	HBox *view_box = manage (new HBox);
+	view_box->set_spacing(4);
+	view_box->pack_start (*livetrax_meter_view_button, false, false);
+	view_box->pack_start (*livetrax_editor_view_button, false, false);
+	view_box->pack_start (*livetrax_mixer_view_button, false, false);
 
-	livetrax_transport_bar.pack_start (*livetrax_editor_view_button, false, false);
-	livetrax_transport_bar.pack_start (*livetrax_mixer_view_button, false, false);
-	livetrax_transport_bar.pack_start (*livetrax_meter_view_button, false, false);
-
-	hb = manage (new HBox);
-	hb->pack_start (transport_ctrl, false, false);
-
-	livetrax_lock_button = manage (new ArdourButton (ArdourButton::default_elements, true));
+	livetrax_lock_button = manage (new ArdourButton (elements, true));
 	livetrax_lock_button->set_icon (ArdourWidgets::ArdourIcon::Lock);
 	act = ActionManager::get_action (X_("Editor"), X_("lock"));
 	livetrax_lock_button->set_related_action (act);
-	editor->mouse_mode_hbox->pack_start (*livetrax_lock_button, false, false, 12);
 
-	livetrax_transport_bar.pack_start (*hb, true, false);
-	livetrax_transport_bar.pack_start (*editor->mouse_mode_hbox, true, false);
+	int TCOL = 0;
 
-	livetrax_view_in_folder_button = manage (new ArdourButton (_("MEDIA"), elements));
-	editor->_zoom_box.pack_start (*livetrax_view_in_folder_button, false, false, 12);
+	livetrax_top_table.attach (*livetrax_lock_button,           TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*livetrax_view_in_folder_button, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*livetrax_prefs_view_button,     TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*view_box,                       TCOL, TCOL+3, 1, 2, FILL, FILL, 4, 4);   TCOL+=3;
 
-	livetrax_transport_bar.pack_end (editor->_zoom_box, false, false);
-	livetrax_transport_bar.pack_end (editor->_track_box, false, false);
-	livetrax_transport_bar.show_all ();
+	livetrax_top_table.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table.attach (transport_ctrl,                 TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);  TCOL++;
+
+	livetrax_top_table.attach (_livetrax_btn_prev_marker,      TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (_livetrax_btn_marker_new,       TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
+     livetrax_top_table.attach (_livetrax_btn_next_marker,     TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*primary_clock,                  TCOL, TCOL+3, 1, 2, FILL, FILL, 4, 4);   TCOL+=3;
+
+//	livetrax_top_table.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
+
+
+	livetrax_top_table.attach (*icon_vb,                        TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table.attach (_livetrax_btn_rec_all,         TCOL, TCOL+1,   0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (_livetrax_btn_rec_none,        TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (_livetrax_btn_peak_reset,      TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
+
+	livetrax_top_table.attach (editor->_track_box,      TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
+
+	livetrax_top_table.attach (*editor->mouse_mode_hbox,      TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
+
+	livetrax_top_table.attach (editor->_zoom_box,      TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);  TCOL++;
+
+	livetrax_top_table.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table.attach (sync_button,                   TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
+
+	livetrax_top_table.attach (*livetrax_ff_dropdown,           TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*livetrax_sr_button,             TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
+
+//	livetrax_top_table.attach (*cw,                             TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table.attach (*livetrax_stereo_out_button,      TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (*livetrax_multi_out_button,       TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table.attach (*ev_dsp,                            TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table.attach (disk_space_label,                   TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
+
+	/* editor bar */
+
+	TCOL = 0;
+
+	livetrax_time_info_box = new TimeInfoBox ("LiveTraxTimeInfo", false);
+//	livetrax_edit_table.attach (*livetrax_time_info_box,      TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4);  TCOL++;
+
+	livetrax_edit_table.show_all ();
 
 	/* meter display */
 
 	livetrax_meters = manage (new LiveTraxMeters (48));
 	livetrax_meters->show_all ();
-	livetrax_meter_bar.set_border_width (12);
-	livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 12);
+//	livetrax_meter_bar.set_border_width (4);
+	livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 0);
+
+	hb = manage (new HBox);
+	hb->pack_start (rc_option_editor->contents(), true, true);
+	livetrax_prefs_bar.pack_start (*hb, true, true);
 
 	hb = manage (new HBox);
 	livetrax_edit_vscrollbar = manage (new VScrollbar (editor->vertical_adjustment));
 	livetrax_edit_vscrollbar->show ();
 	hb->pack_start (editor->contents(), true, true);
 	hb->pack_start (*livetrax_edit_vscrollbar, false, false);
+//	hb->pack_start (livetrax_edit_table, false, false);
+
+	livetrax_section_pane.set_child_minsize(_livetrax_sections->widget(), 30);
+	livetrax_section_pane.set_divider(0, 0.99);
+	livetrax_section_pane.add(*hb);
+	livetrax_section_pane.add (_livetrax_sections->widget());
 
 	vb = manage (new VBox);
 	livetrax_edit_hscrollbar = manage (new HScrollbar (editor->horizontal_adjustment));
 	livetrax_edit_hscrollbar->show ();
-	vb->pack_start (*hb, true, true);
+	vb->pack_start (livetrax_section_pane, true, true);
 	vb->pack_start (*livetrax_edit_hscrollbar, false, false);
 	livetrax_editor_bar.pack_start (*vb, true, true);
 
+	livetrax_section_pane.set_divider(0, 0.99);
+
 	livetrax_mixer_bar.pack_start (mixer->contents(), true, true);
 
 	we_have_dependents ();
@@ -528,10 +570,10 @@ ARDOUR_UI::livetrax_setup_windows ()
 	/* order of addition affects order seen in initial window display */
 
 	main_vpacker.pack_start (menu_bar_base, false, false);
-	main_vpacker.pack_start (livetrax_top_bar, false, false);
-	main_vpacker.pack_start (livetrax_transport_bar, false, false);
+	main_vpacker.pack_start (livetrax_top_table, false, false);
 	main_vpacker.pack_start (livetrax_meter_bar, false, false);
 	main_vpacker.pack_start (livetrax_editor_bar, true, true);
+	main_vpacker.pack_start (livetrax_prefs_bar, true, false);
 	main_vpacker.pack_start (livetrax_mixer_bar, true, true);
 
 	connect_transport_elements ();
@@ -543,9 +585,6 @@ ARDOUR_UI::livetrax_setup_windows ()
 	bindings = Bindings::get_bindings (X_("Mixer"));
 	livetrax_mixer_bar.set_data ("ardour-bindings", bindings);
 
-	_livetrax_visibility = LiveTraxVisibility (LiveTraxMeterVisible|LiveTraxMixerVisible|LiveTraxEditorVisible);
-	livetrax_visibility_change ();
-
 	// setup_tooltips ();
 
 	_main_window.signal_delete_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::main_window_delete_event));
@@ -560,6 +599,9 @@ ARDOUR_UI::livetrax_setup_windows ()
 	setup_toplevel_window (_main_window, "", this);
 	_main_window.show_all ();
 
+	_livetrax_visibility = LiveTraxVisibility (LiveTraxMeterVisible|LiveTraxMixerVisible|LiveTraxEditorVisible);
+	livetrax_visibility_change ();
+
 #ifdef GDK_WINDOWING_X11
 	/* allow externalUIs to be transient, on top of the main window */
 	LV2Plugin::set_main_window_id (GDK_DRAWABLE_XID(_main_window.get_window()->gobj()));
@@ -693,6 +735,21 @@ ARDOUR_UI::action_script_changed (int i, const std::string& n)
 	KeyEditor::UpdateBindings ();
 }
 
+void
+ARDOUR_UI:: update_section_visibility(bool show)
+{
+#ifdef LIVETRAX
+	if (!_livetrax_sections) {
+		return;
+	}
+	if (show) {
+		_livetrax_sections->widget().show();
+	} else {
+		_livetrax_sections->widget().hide();
+	}
+#endif
+}
+
 void
 ARDOUR_UI::livetrax_visibility_change ()
 {
@@ -705,13 +762,23 @@ ARDOUR_UI::livetrax_visibility_change ()
 	}
 
 	if (_livetrax_visibility & LiveTraxEditorVisible) {
+		livetrax_edit_table.show ();
 		livetrax_editor_bar.show ();
 		livetrax_editor_view_button->set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
+		livetrax_edit_table.hide ();
 		livetrax_editor_bar.hide ();
 		livetrax_editor_view_button->set_active_state (Gtkmm2ext::Off);
 	}
 
+	if (_livetrax_visibility & LiveTraxPrefsVisible) {
+		livetrax_prefs_bar.show ();
+		livetrax_prefs_view_button->set_active_state (Gtkmm2ext::ExplicitActive);
+	} else {
+		livetrax_prefs_bar.hide ();
+		livetrax_prefs_view_button->set_active_state (Gtkmm2ext::Off);
+	}
+
 	if (_livetrax_visibility & LiveTraxMixerVisible) {
 		livetrax_mixer_bar.show ();
 		livetrax_mixer_view_button->set_active_state (Gtkmm2ext::ExplicitActive);
@@ -727,7 +794,19 @@ ARDOUR_UI::livetrax_toggle_visibility (LiveTraxVisibility v)
 	if (_livetrax_visibility & v) {
 		_livetrax_visibility = LiveTraxVisibility (_livetrax_visibility & ~v);
 	} else {
-	_livetrax_visibility = LiveTraxVisibility (_livetrax_visibility | v);
+		_livetrax_visibility = LiveTraxVisibility (_livetrax_visibility | v);
+	}
+
+	if (_livetrax_visibility==0) { //at minimum always show tracks
+		_livetrax_visibility = LiveTraxVisibility (LiveTraxEditorVisible);
+	}
+
+	//enforce exclusivity between tracks and prefs
+	if (v==LiveTraxEditorVisible) {
+		_livetrax_visibility = LiveTraxVisibility (_livetrax_visibility & ~LiveTraxPrefsVisible);
+	}
+	if (v==LiveTraxPrefsVisible) {
+		_livetrax_visibility = LiveTraxVisibility (LiveTraxPrefsVisible);  //ONLY show prefs
 	}
 
 	livetrax_visibility_change ();

gtk2_ardour/ardour_ui_ed.cc

@@ -291,6 +291,7 @@ ARDOUR_UI::install_actions ()
 		ActionManager::register_action (common_actions, X_("livetrax-toggle-meter"), _("Hide/Show Meters"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::livetrax_toggle_visibility), LiveTraxMeterVisible));
 		ActionManager::register_action (common_actions, X_("livetrax-toggle-mixer"), _("Hide/Show Mixer"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::livetrax_toggle_visibility), LiveTraxMixerVisible));
 		ActionManager::register_action (common_actions, X_("livetrax-toggle-editor"), _("Hide/Show Editor"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::livetrax_toggle_visibility), LiveTraxEditorVisible));
+		ActionManager::register_action (common_actions, X_("livetrax-toggle-prefs"), _("Hide/Show Prefs"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::livetrax_toggle_visibility), LiveTraxPrefsVisible));
 	}
 
 	ActionManager::register_action (common_actions, X_("toggle-meterbridge"), S_("Window|Meterbridge"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_meterbridge));

gtk2_ardour/audio_region_view.cc

@@ -1706,7 +1706,9 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& wa
 
 	/* use track/region color to fill wform */
 	fill = fill_color;
+#ifndef LIVETRAX
 	fill = UINT_INTERPOLATE (fill, UIConfiguration::instance().color ("waveform fill"), 0.5);
+#endif
 
 	/* set outline */
 	outline = UIConfiguration::instance().color ("waveform outline");

gtk2_ardour/editor.cc

@@ -451,6 +451,11 @@ Editor::Editor ()
 	, entered_regionview (0)
 	, clear_entered_track (false)
 	, _edit_point (EditAtMouse)
+#ifdef LIVETRAX
+	, mouse_cut_button(ArdourButton::Element (ArdourButton::Text|ArdourButton::Body|ArdourButton::VectorIcon))
+	, mouse_move_button(ArdourButton::Element (ArdourButton::Text|ArdourButton::Body|ArdourButton::VectorIcon))
+	, mouse_select_button(ArdourButton::Element (ArdourButton::Text|ArdourButton::Body|ArdourButton::VectorIcon))
+#endif
 	, meters_running (false)
 	, rhythm_ferret (0)
 	, _have_idled (false)
@@ -1389,6 +1394,8 @@ Editor::set_session (Session *t)
 	}
 
 	_group_tabs->set_session (_session);
+
+#ifndef LIVETRAX //effectively disable all this unused stuff
 	_route_groups->set_session (_session);
 	_regions->set_session (_session);
 	_sources->set_session (_session);
@@ -1397,6 +1404,7 @@ Editor::set_session (Session *t)
 	_locations->set_session (_session);
 	_sections->set_session (_session);
 	_properties_box->set_session (_session);
+#endif
 
 	if (rhythm_ferret) {
 		rhythm_ferret->set_session (_session);
@@ -3444,7 +3452,9 @@ Editor::setup_toolbar ()
 		_zoom_box.pack_start (zoom_out_button, false, false);
 		_zoom_box.pack_start (zoom_in_button, false, false);
 		_zoom_box.pack_start (zoom_out_full_button, false, false);
+#ifndef LIVETRAX
 		_zoom_box.pack_start (zoom_focus_selector, false, false);
+#endif
 	}
 
 	/* Track zoom buttons */
@@ -3470,6 +3480,8 @@ Editor::setup_toolbar ()
 
 	if (ARDOUR::Profile->get_mixbus()) {
 		_track_box.pack_start (visible_tracks_selector);
+	} else if (ARDOUR::Profile->get_livetrax()) {
+		_track_box.pack_start (visible_tracks_selector);
 	} else {
 		_track_box.pack_start (visible_tracks_selector);
 		_track_box.pack_start (tav_shrink_button);
@@ -4209,7 +4221,7 @@ Editor::build_track_count_menu ()
 {
 	using namespace Menu_Helpers;
 
-	if (!Profile->get_mixbus()) {
+	if (!Profile->get_mixbus() && !Profile->get_livetrax()) {
 		visible_tracks_selector.AddMenuElem (MenuElem (X_("1"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1)));
 		visible_tracks_selector.AddMenuElem (MenuElem (X_("2"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 2)));
 		visible_tracks_selector.AddMenuElem (MenuElem (X_("3"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 3)));
@@ -6013,6 +6025,12 @@ Editor::add_stripables (StripableList& sl)
 			continue;
 		}
 
+#ifdef LIVETRAX
+		if ((*s)->is_master()) {
+			continue;
+		}
+#endif
+
 		if ((v = std::dynamic_pointer_cast<VCA> (*s)) != 0) {
 
 			VCATimeAxisView* vtv = new VCATimeAxisView (*this, _session, *_track_canvas);

gtk2_ardour/editor_markers.cc

@@ -802,7 +802,7 @@ Editor::mouse_add_new_marker (timepos_t where, Location::Flags extra_flags, int3
 		markername = string_compose (_("cue %1"), cue_marker_name (cue_id));
 	} else {
 		if (flags & Location::IsSection) {
-			namebase = _("verse");
+			namebase = ARDOUR::Profile->get_livetrax() ? _("mark") : _("verse");
 		} else {
 			namebase = _("mark");
 		}

gtk2_ardour/editor_mouse.cc

@@ -247,9 +247,7 @@ Editor::snap_mode_button_clicked (GdkEventButton* ev)
 
 	RCOptionEditor* rc_option_editor = ARDOUR_UI::instance()->get_rc_option_editor();
 	if (rc_option_editor) {
-#ifdef LIVETRAX
-		rc_option_editor->present ();
-#else
+#ifndef LIVETRAX
 		ARDOUR_UI::instance()->show_tabbable (rc_option_editor);
 #endif
 		rc_option_editor->set_current_page (_("Editor/Snap"));

gtk2_ardour/editor_rulers.cc

@@ -642,7 +642,7 @@ Editor::update_ruler_visibility ()
 		update_marker_display();
 	}
 
-	if (Profile->get_livetrax() || ruler_marker_action->get_active()) {
+	if (!Profile->get_livetrax() && ruler_marker_action->get_active()) {
 		old_unit_pos = marker_group->position().y;
 		if (tbpos != old_unit_pos) {
 			marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@@ -697,7 +697,7 @@ Editor::update_ruler_visibility ()
 		scene_mark_label.hide ();
 	}
 
-	if (!Profile->get_livetrax() && ruler_section_action->get_active()) {
+	if (ruler_section_action->get_active()) {
 		old_unit_pos = section_marker_group->position().y;
 		if (tbpos != old_unit_pos) {
 			section_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@@ -756,6 +756,8 @@ Editor::update_ruler_visibility ()
 	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
 		i->second->setup_lines ();
 	}
+
+	ARDOUR_UI::instance()->update_section_visibility(ruler_section_action->get_active());
 }
 
 void

gtk2_ardour/livetrax.menus.in

@@ -8,13 +8,8 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
-#ifndef WINDOWS /* can't move open files. */
-      <menuitem action='Rename'/>
-      <menuitem action='SnapshotStay'/>
-      <menuitem action='SnapshotSwitch'/>
-#endif
+      <separator/>
       <menuitem action='SaveTemplate'/>
-      <menuitem action='Archive'/>
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
       <menu name='Export' action='Export'>
@@ -22,21 +17,11 @@
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
       </menu>
-      <separator/>
-
-      <menu name='Cleanup' action='Cleanup'>
-        <menuitem action='CleanupPeakFiles'/>
-        <menuitem action='CleanupUnusedSources'/>
-        <menuitem action='CleanupUnusedRegions'/>
-        <menuitem action='FlushWastebasket'/>
-      </menu>
 #ifdef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
-#ifndef MIXBUS
       <separator/>
       <menuitem action='lock'/>
-#endif
 #ifndef __APPLE__
       <separator/>
       <menuitem action='Quit'/>
@@ -48,6 +33,7 @@
       <menuitem action='Record'/>
       <separator/>
       <menu action="MovePlayHeadMenu">
+        <menuitem action='add-location-from-playhead'/>
         <menuitem action='jump-forward-to-mark'/>
         <menuitem action='jump-backward-to-mark'/>
         <menuitem action='GotoStart'/>
@@ -55,7 +41,6 @@
       </menu>
       <separator/>
       <menuitem action='ToggleFollowEdits'/>
-      <menuitem action='ToggleAutoPlay'/>
       <menuitem action='ToggleAutoReturn'/>
       <separator/>
     </menu>
@@ -68,13 +53,26 @@
       <menuitem action='editor-cut'/>
       <menuitem action='editor-delete'/>
       <separator/>
+      <menuitem action='select-loop-range'/>
+      <separator/>
       <menuitem action='split-region'/>
       <menu action="SelectMenu">
         <menuitem action='select-all-objects'/>
         <menuitem action='invert-selection'/>
       </menu>
-      <separator/>
-      <menuitem action='lock'/>
+      <menu action='RegionMenuEdit'>
+        <menuitem action='toggle-region-mute'/>
+        <menuitem action='normalize-region'/>
+        <menuitem action='boost-region-gain'/>
+        <menuitem action='cut-region-gain'/>
+        <menuitem action='reset-region-gain'/>
+        <menuitem action='toggle-region-lock'/>
+      </menu>
+        <separator/>
+        <menuitem action='start-range'/>
+        <menuitem action='finish-range'/>
+        <separator/>
+     <menuitem action='remove-last-capture'/>
     </menu>
 
 
@@ -86,32 +84,25 @@
     </menu>
 
     <menu name='View' action = 'View'>
-      <menuitem action='toggle-big-clock'/>
       <menu action="PrimaryClockMenu">
         <menuitem action="primary-clock-timecode"/>
         <menuitem action="primary-clock-minsec"/>
         <menuitem action="primary-clock-samples"/>
      </menu>
-        <menuitem action="toggle-marker-ruler"/>
-        <menuitem action="toggle-scene-marker-ruler"/>
-      <menu action="ZoomMenu">
+     <menuitem action='ToggleGroupTabs'/>
+     <menuitem action="toggle-arrangement-ruler"/>
+     <menuitem action="toggle-scene-marker-ruler"/>
+     <menu action="ZoomMenu">
         <menuitem action='temporal-zoom-in'/>
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
       </menu>
-      <menu name='ZoomFocus' action='ZoomFocus'>
-        <menuitem action='zoom-focus-left'/>
-        <menuitem action='zoom-focus-right'/>
-        <menuitem action='zoom-focus-center'/>
-        <menuitem action='zoom-focus-playhead'/>
-        <menuitem action='zoom-focus-mouse'/>
-        <menuitem action='zoom-focus-edit'/>
-        <menuitem action='cycle-zoom-focus'/>
-      </menu>
-      <menuitem action='ToggleGroupTabs'/>
     </menu>
 
     <menu action = 'WindowMenu'>
+     <menuitem action='toggle-transport-masters'/>
+     <menuitem action='toggle-midi-connection-manager'/>
+     <menuitem action='NewMIDITracer'/>
     </menu>
 </menubar>
 
@@ -119,18 +110,9 @@
     <menuitem action="toggle-minsec-ruler"/>
     <menuitem action="toggle-timecode-ruler"/>
     <menuitem action="toggle-samples-ruler"/>
-    <menuitem action="toggle-bbt-ruler"/>
     <separator/>
-    <menuitem action="toggle-meter-ruler"/>
-    <menuitem action="toggle-tempo-ruler"/>
-    <menuitem action="toggle-range-ruler"/>
-    <menuitem action="toggle-loop-punch-ruler"/>
-    <menuitem action="toggle-cd-marker-ruler"/>
-    <menuitem action="toggle-marker-ruler"/>
-    <menuitem action="toggle-cue-marker-ruler"/>
+    <menuitem action="toggle-arrangement-ruler"/>
     <menuitem action="toggle-scene-marker-ruler"/>
-    <separator/>
-    <menuitem action="toggle-video-ruler"/>
   </popup>
 
   <popup name='ProcessorMenu' accelerators='true'>
@@ -200,101 +182,17 @@
     <menuitem action='group-selected-regions'/>
     <menuitem action='ungroup-selected-regions'/>
     <separator/>
-    <menuitem action='loop-region'/>
-    <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menu action='RegionMenuEdit'>
-      <menuitem action='combine-regions'/>
-      <menuitem action='uncombine-regions'/>
-      <menuitem action='pitch-shift-region'/>
-      <menuitem action='split-region'/>
-      <menuitem action='split-region-at-transients'/>
-      <menuitem action='split-multichannel-region'/>
-      <menuitem action='close-region-gaps'/>
-      <menuitem action='place-transient' />
-      <menuitem action='show-rhythm-ferret'/>
-      <menuitem action='strip-region-silence'/>
-      <menuitem action='reverse-region'/>
-    </menu>
-    <menu action='RegionMenuMIDI'>
-      <menuitem action='transpose-region'/>
-      <menuitem action='insert-patch-change-context'/>
-      <menuitem action='quantize-region'/>
-      <menuitem action='legatize-region'/>
-      <menuitem action='remove-overlap'/>
-      <menuitem action='transform-region'/>
-      <menuitem action='fork-region'/>
-      <menuitem action='fork-regions-from-unselected'/>
-      <menuitem action='deinterlace-midi'/>
-      <menuitem action='show-region-list-editor'/>
-    </menu>
-    <menu action='RegionMenuPosition'>
-      <menuitem action='naturalize-region'/>
-      <menuitem action='toggle-region-lock'/>
-      <menuitem action='toggle-region-video-lock'/>
-      <menuitem action='snap-regions-to-grid'/>
-      <menuitem action='set-region-sync-position'/>
-      <menuitem action='remove-region-sync'/>
-      <menuitem action='nudge-forward'/>
-      <menuitem action='nudge-backward'/>
-      <menuitem action='nudge-forward-by-capture-offset'/>
-      <menuitem action='nudge-backward-by-capture-offset'/>
-      <menuitem action='sequence-regions'/>
-    </menu>
-    <menu action='RegionMenuMarkers'>
-      <menuitem action='add-region-cue-marker'/>
-      <menuitem action='clear-region-cue-markers'/>
-      <separator/>
-      <menuitem action='make-region-markers-cd'/>
-      <menuitem action='make-region-markers-global'/>
-    </menu>
-    <menu action='RegionMenuTrim'>
-      <menuitem action='trim-front'/>
-      <menuitem action='trim-back'/>
-      <menuitem action='trim-region-to-loop'/>
-      <menuitem action='trim-region-to-punch'/>
-      <menuitem action='trim-to-previous-region'/>
-      <menuitem action='trim-to-next-region'/>
-    </menu>
-    <menu action='RegionMenuLayering'>
-      <menuitem action='raise-region-to-top'/>
-      <menuitem action='raise-region'/>
-      <menuitem action='lower-region'/>
-      <menuitem action='lower-region-to-bottom'/>
-    </menu>
-    <menu action='RegionMenuRanges'>
-      <menuitem action='set-loop-from-region'/>
-      <menuitem action='set-punch-from-region'/>
-      <menuitem action='add-range-marker-from-region'/>
-      <menuitem action='add-range-markers-from-region'/>
-      <menuitem action='set-selection-from-region'/>
-    </menu>
+    <menuitem action='toggle-region-lock'/>
+    <separator/>
     <menu action='RegionMenuGain'>
-      <menuitem action='toggle-opaque-region'/>
       <menuitem action='toggle-region-mute'/>
       <menuitem action='normalize-region'/>
       <menuitem action='boost-region-gain'/>
       <menuitem action='cut-region-gain'/>
       <menuitem action='reset-region-gain'/>
-      <menuitem action='reset-region-gain-envelopes'/>
       <menuitem action='toggle-region-polarity'/>
-      <menuitem action='toggle-region-gain-envelope-active'/>
-    </menu>
-    <menu action='RegionMenuFades'>
-      <menuitem action='toggle-region-fade-in'/>
-      <menuitem action='toggle-region-fade-out'/>
-      <menuitem action='toggle-region-fades'/>
-    </menu>
-    <menu action='RegionMenuDuplicate'>
-      <menuitem action='duplicate-region'/>
-      <menuitem action='multi-duplicate-region'/>
-      <menuitem action='region-fill-track'/>
     </menu>
     <menuitem action='export-region'/>
-    <menuitem action='bounce-regions-unprocessed'/>
-#ifndef MIXBUS
-    <menuitem action='bounce-regions-processed'/>
-#endif
     <menuitem action='loudness-analyze-region'/>
     <menuitem action='spectral-analyze-region'/>
     <separator/>

gtk2_ardour/livetrax_meters.cc

@@ -13,10 +13,11 @@ using namespace ArdourWidgets;
 
 LiveTraxMeters::LiveTraxMeters (size_t initial_cnt)
 {
-	set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_NEVER);
+	set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
 
 	resize (initial_cnt);
 
+	meter_box.set_border_width (PX_SCALE (10));
 	meter_box.set_spacing (PX_SCALE (10));
 	add (meter_box);
 
@@ -86,8 +87,8 @@ LiveTraxMeters::resize (size_t sz)
 		char buf[16];
 		snprintf (buf, sizeof (buf), "%zu", i+1);
 		Gtk::Label* l = manage (new Gtk::Label (buf));
-		vb->pack_start (*l, false, false);
 		vb->pack_start (*meters.back(), true, true);
+		vb->pack_start (*l, false, false, PX_SCALE(3));
 
 		widgets.push_back (vb);
 

gtk2_ardour/livetrax_rc_option_editor.h

@@ -47,6 +47,8 @@ public:
 
 	bool on_key_release_event (GdkEventKey*);
 
+	Gtk::Widget& contents() { return hpacker; }
+
 private:
 	void parameter_changed (std::string const &);
 	void ltc_generator_volume_changed ();

gtk2_ardour/mixer_strip.cc

@@ -338,22 +338,21 @@ MixerStrip::init ()
 		global_vpacker.pack_start (trigger_display, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (_tmaster_widget, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (processor_box, true, true);
-	}
-	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (rec_mon_table, Gtk::PACK_SHRINK);
-	if (!Profile->get_livetrax()) {
+		global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (rec_mon_table, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (master_volume_table, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
-	}
-	global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
-	if (!Profile->get_livetrax()) {
+		global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (control_slave_ui, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK);
 	} else {
-		global_vpacker.pack_start (name_button, true, true);
+		global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
 	}
 
 #ifndef MIXBUS

gtk2_ardour/mixer_ui.cc

@@ -387,7 +387,10 @@ Mixer_UI::Mixer_UI ()
 
 		_content.pack_start (list_hpane, true, true);
 	} else {
-		_content.pack_start (scroller, true, true);
+		HBox *box = manage (new HBox());
+		box->pack_start (out_packer, false, false);
+		box->pack_start (scroller, true, true);
+		_content.pack_start(*box);
 	}
 
 	update_title ();

gtk2_ardour/option_editor.cc

@@ -1217,7 +1217,7 @@ OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str
 	hpacker.set_border_width (4);
 	Frame* f = manage (new Frame ());
 
-	if (Profile->get_livetrax()) {
+	if (false /*Profile->get_livetrax()*/) {  //TODO Ben
 		f->add (button_box());
 	} else {
 		f->add (treeview());
@@ -1233,5 +1233,7 @@ OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str
 	hpacker.show_all ();
 	vpacker.show ();
 
+#ifndef LIVETRAX
 	add (hpacker);
+#endif
 }

gtk2_ardour/route_ui.cc

@@ -1029,7 +1029,7 @@ RouteUI::step_edit_changed (bool yn)
 bool
 RouteUI::rec_enable_release (GdkEventButton* ev)
 {
-	if (!Profile->get_livetrax() && Keyboard::is_context_menu_event (ev)) {
+	if (Keyboard::is_context_menu_event (ev)) {
 		build_record_menu ();
 		if (_record_menu) {
 			_record_menu->popup (ev->button, ev->time);

gtk2_ardour/session_dialog.cc

@@ -492,6 +492,7 @@ SessionDialog::setup_initial_choice_box ()
 
 	/* --disable plugins UI */
 
+#ifndef LIVETRAX
 	_disable_plugins.set_label (_("Safe Mode: Disable all Plugins"));
 	_disable_plugins.set_can_focus ();
 	_disable_plugins.set_relief (Gtk::RELIEF_NORMAL);
@@ -500,6 +501,7 @@ SessionDialog::setup_initial_choice_box ()
 	_disable_plugins.set_border_width(0);
 	_disable_plugins.signal_clicked().connect (sigc::mem_fun (*this, &SessionDialog::disable_plugins_clicked));
 	centering_vbox->pack_start (_disable_plugins, false, false);
+#endif
 
 	/* pack it all up */
 
@@ -742,7 +744,9 @@ SessionDialog::setup_new_session_page ()
 	}
 
 	session_new_vbox.pack_start (*template_hbox, true, true);
+#ifndef LIVETRAX
 	session_new_vbox.pack_start (*timebase_box, false, true);
+#endif
 	session_new_vbox.pack_start (*folder_box, false, true);
 	session_new_vbox.pack_start (*name_hbox, false, true);
 	session_new_vbox.show_all ();

gtk2_ardour/themes/dark-livetrax.colors

@@ -3,20 +3,19 @@
   <Colors>
     <Color name="alert:blue" value="2E41E6ff"/>
     <Color name="alert:cyan" value="20b2b2ff"/>
-    <Color name="alert:green" value="3dcc4cff"/>
-    <Color name="alert:greenish" value="459952ff"/>
-    <Color name="alert:orange" value="e58b05ff"/>
+    <Color name="alert:green" value="42A64Dff"/>
+    <Color name="alert:orange" value="df7b15ff"/>
     <Color name="alert:red" value="f10000ff"/>
     <Color name="alert:ruddy" value="bb2828ff"/>
-    <Color name="alert:yellow" value="e0e000ff"/>
-    <Color name="theme:bg" value="3d3d3dff"/>  <!--gtk_background-->
-    <Color name="theme:bg1" value="373737ff"/>  <!--gtk_audio_track-->
-    <Color name="theme:bg2" value="101010ff"/>  <!--ruler base-->
-    <Color name="theme:contrasting" value="0xf10000ff"/>  <!--play head-->
-    <Color name="theme:contrasting clock" value="78cd2fff"/>  <!--clock: text-->
-    <Color name="theme:contrasting less" value="46B357FF"/>
-    <Color name="theme:contrasting selection" value="5da3c1ff"/>  <!--gtk_bg_selected-->
-    <Color name="theme:contrasting alt" value="CCA336ff"/>  <!--delta clock , clock edit-->
+    <Color name="alert:yellow" value="bba900ff"/>
+    <Color name="theme:bg" value="4a4a4cff"/>
+    <Color name="theme:bg1" value="383737ff"/>
+    <Color name="theme:bg2" value="000000ff"/>
+    <Color name="theme:contrasting clock" value="df7b15ff"/>
+    <Color name="theme:contrasting less" value="D68839"/>
+    <Color name="theme:contrasting selection" value="D68839"/>  <!--same as contrasting less-->
+    <Color name="theme:contrast" value="CCA336ff"/>
+    <Color name="theme:contrast2" value="65ACCCff"/>
     <Color name="neutral:backgroundest" value="000000ff"/>  <!--border color-->
     <Color name="neutral:background" value="202020ff"/>  <!--audio track base-->
     <Color name="neutral:background2" value="555555ff"/>  <!--range marker bar-->
@@ -24,15 +23,22 @@
     <Color name="neutral:foreground2" value="ccccccff"/>  <!--marker track-->
     <Color name="neutral:foreground" value="e5e5e5ff"/>  <!--gtk_foreground-->
     <Color name="neutral:foregroundest" value="ffffffff"/>  <!--grid line major-->
-    <Color name="widget:bg" value="4F4D4Dff"/>    <!--generic button-->
-    <Color name="widget:blue" value="526d94ff"/>  <!--processor fader: fill-->
-    <Color name="widget:blue lighter" value="628db4ff"/>  <!--processor fader: fill-->
-    <Color name="widget:blue darker" value="20242aff"/>  <!--gtk_audio_bus-->
-    <Color name="widget:gray" value="595755ff"/>  <!--gtk_processor fader-->
-    <Color name="widget:green" value="617552ff"/>  <!--gtk processor postfader,  gtk_midi_track-->
-    <Color name="widget:green darker" value="3C403AFF"/>  <!--midi track base-->
-    <Color name="widget:orange" value="904010ff"/>  <!--tempo marker-->
-    <Color name="widget:ruddy" value="7c3a3aff"/>  <!--processor prefader-->
+    <Color name="widget:bg" value="4a4a4cff"/>  <!--generic button; slightly different than bg color-->
+    <Color name="widget:blue" value="26629Cff"/>
+    <Color name="widget:blue darker" value="20242aff"/>
+    <Color name="widget:brown" value="211d18ff"/>
+    <Color name="widget:brown2" value="383125ff"/>
+    <Color name="widget:cream darker" value="AD7C2Fff"/>
+    <Color name="widget:cream" value="BFBAABff"/>
+    <Color name="widget:gray" value="595755ff"/>
+    <Color name="widget:green" value="617552ff"/>
+    <Color name="widget:green darker" value="3C403AFF"/>
+    <Color name="widget:orange" value="B2320Bff"/>
+    <Color name="widget:vu bg" value="ADA87Aff"/>
+    <Color name="widget:glow" value="FFB66Aff"/>
+    <Color name="widget:playhead" value="e58b05ff"/>
+    <Color name="widget:ruddy" value="7c3a3aff"/>
+    <Color name="widget:red" value="BA452Bff"/>
     <Color name="widget:yellow" value="eddc3dff"/> <!-- VU meter outline -->
     <Color name="meter color0" value="008800ff"/>
     <Color name="meter color1" value="00aa00ff"/>
@@ -55,7 +61,7 @@
     <ColorAlias name="arrange base" alias="theme:bg"/>
     <ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
     <ColorAlias name="arrangement rect" alias="widget:blue"/>
-    <ColorAlias name="arrangement rect alt" alias="widget:blue lighter"/>
+    <ColorAlias name="arrangement rect alt" alias="theme:contrast2"/>
     <ColorAlias name="audio automation track fill" alias="theme:bg"/>
     <ColorAlias name="audio bus base" alias="widget:blue darker"/>
     <ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@@ -63,19 +69,19 @@
     <ColorAlias name="automation line" alias="alert:green"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
-    <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="big clock active: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="big clock active: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="big clock active: text" alias="alert:red"/>
     <ColorAlias name="big clock: background" alias="theme:bg2"/>
-    <ColorAlias name="big clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="big clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="big clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="big clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="big clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="border color" alias="neutral:backgroundest"/>
     <ColorAlias name="cd marker bar" alias="neutral:background2"/>
     <ColorAlias name="clipped waveform" alias="alert:red"/>
     <ColorAlias name="clock: background" alias="theme:bg2"/>
-    <ColorAlias name="clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="comment button: fill" alias="widget:bg"/>
     <ColorAlias name="control point fill" alias="alert:green"/>
@@ -91,17 +97,17 @@
     <ColorAlias name="crossfade editor wave" alias="neutral:foregroundest"/>
     <ColorAlias name="crossfade line" alias="neutral:backgroundest"/>
     <ColorAlias name="edit point" alias="alert:blue"/>
-    <ColorAlias name="entered automation line" alias="widget:orange"/>
-    <ColorAlias name="entered gain line" alias="widget:orange"/>
-    <ColorAlias name="entered marker" alias="widget:orange"/>
+    <ColorAlias name="entered automation line" alias="alert:orange"/>
+    <ColorAlias name="entered gain line" alias="alert:orange"/>
+    <ColorAlias name="entered marker" alias="alert:orange"/>
     <ColorAlias name="fader outline" alias="neutral:backgroundest"/>
     <ColorAlias name="feedback alert: alt active" alias="alert:ruddy"/>
     <ColorAlias name="feedback alert: fill" alias="widget:bg"/>
     <ColorAlias name="feedback alert: fill active" alias="alert:red"/>
     <ColorAlias name="feedback alert: led active" alias="alert:red"/>
     <ColorAlias name="foldback knob" alias="widget:bg"/>
-    <ColorAlias name="foldback knob: arc end" alias="widget:blue"/>
-    <ColorAlias name="foldback knob: arc start" alias="widget:blue"/>
+    <ColorAlias name="foldback knob: arc end" alias="widget:orange"/>
+    <ColorAlias name="foldback knob: arc start" alias="widget:orange"/>
     <ColorAlias name="foldback knob: fill" alias="widget:bg"/>
     <ColorAlias name="foldback postfader: fill" alias="widget:blue darker"/>
     <ColorAlias name="foldback postfader: fill active" alias="widget:blue darker"/>
@@ -113,8 +119,8 @@
     <ColorAlias name="gain line" alias="alert:green"/>
     <ColorAlias name="gain line inactive" alias="theme:bg1"/>
     <ColorAlias name="generic button: fill" alias="widget:bg"/>
-    <ColorAlias name="generic button: fill active" alias="alert:red"/>
-    <ColorAlias name="generic button: led active" alias="alert:green"/>
+    <ColorAlias name="generic button: fill active" alias="alert:orange"/>
+    <ColorAlias name="generic button: led active" alias="alert:orange"/>
     <ColorAlias name="generic button: outline" alias="neutral:backgroundest"/>
     <ColorAlias name="ghost track base" alias="neutral:background2"/>
     <ColorAlias name="ghost track midi outline" alias="neutral:backgroundest"/>
@@ -153,10 +159,10 @@
     <ColorAlias name="gtk_monitor" alias="alert:orange"/>
     <ColorAlias name="gtk_mono" alias="neutral:foreground"/>
     <ColorAlias name="gtk_mute" alias="alert:yellow"/>
-    <ColorAlias name="gtk_not_so_bright_indicator" alias="theme:contrasting"/>
+    <ColorAlias name="gtk_not_so_bright_indicator" alias="theme:contrast"/>
     <ColorAlias name="gtk_processor_fader" alias="widget:gray"/>
     <ColorAlias name="gtk_processor_fader_frame" alias="neutral:midground"/>
-    <ColorAlias name="gtk_processor_frame_selected" alias="theme:contrasting"/>
+    <ColorAlias name="gtk_processor_frame_selected" alias="theme:contrast"/>
     <ColorAlias name="gtk_processor_postfader" alias="widget:green"/>
     <ColorAlias name="gtk_processor_postfader_frame" alias="widget:green"/>
     <ColorAlias name="gtk_processor_prefader" alias="widget:ruddy"/>
@@ -164,12 +170,12 @@
     <ColorAlias name="gtk_send_bg" alias="theme:bg1"/>
     <ColorAlias name="gtk_send_fg" alias="widget:blue"/>
     <ColorAlias name="gtk_solo" alias="alert:green"/>
-    <ColorAlias name="gtk_somewhat_bright_indicator" alias="theme:contrasting alt"/>
+    <ColorAlias name="gtk_somewhat_bright_indicator" alias="theme:contrasting less"/>
     <ColorAlias name="gtk_texts" alias="neutral:foreground"/>
     <ColorAlias name="gtk_track_header_inactive" alias="theme:bg"/>
     <ColorAlias name="gtk_track_header_selected" alias="widget:ruddy"/>
     <ColorAlias name="image track" alias="neutral:foreground2"/>
-    <ColorAlias name="inactive crossfade" alias="theme:contrasting"/>
+    <ColorAlias name="inactive crossfade" alias="theme:contrast"/>
     <ColorAlias name="inactive fade handle" alias="neutral:foreground2"/>
     <ColorAlias name="inactive group tab" alias="theme:bg"/>
     <ColorAlias name="invert button: fill" alias="widget:bg"/>
@@ -183,12 +189,12 @@
     <ColorAlias name="location marker" alias="theme:contrasting less"/>
     <ColorAlias name="location punch" alias="widget:ruddy"/>
     <ColorAlias name="location range" alias="theme:contrasting less"/>
-    <ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
+    <ColorAlias name="location arrangement marker" alias="theme:contrasting less"/>
     <ColorAlias name="lock button: fill active" alias="widget:bg"/>
     <ColorAlias name="lock button: led active" alias="alert:red"/>
     <ColorAlias name="lua action button: fill" alias="widget:bg"/>
     <ColorAlias name="mapping bar" alias="neutral:background2"/>
-    <ColorAlias name="marker bar" alias="neutral:background2"/>
+    <ColorAlias name="marker bar" alias="neutral:backgroundest"/>
     <ColorAlias name="marker bar separator" alias="theme:bg2"/>
     <ColorAlias name="marker drag line" alias="theme:contrasting clock"/>
     <ColorAlias name="marker label" alias="neutral:backgroundest"/>
@@ -202,8 +208,8 @@
     <ColorAlias name="meter background top" alias="theme:bg"/>
     <ColorAlias name="meter bar" alias="theme:bg1"/>
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
-    <ColorAlias name="meter marker" alias="widget:orange"/>
-    <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter marker" alias="alert:orange"/>
+    <ColorAlias name="meter marker music" alias="alert:orange"/>
     <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
@@ -243,12 +249,12 @@
     <ColorAlias name="midi note min" alias="alert:orange"/>
     <ColorAlias name="midi note selected" alias="widget:ruddy"/>
     <ColorAlias name="midi note selected outline" alias="alert:red"/>
-    <ColorAlias name="midi note velocity text" alias="theme:contrasting"/>
+    <ColorAlias name="midi note velocity text" alias="theme:contrast"/>
     <ColorAlias name="midi patch change fill" alias="theme:contrasting selection"/>
     <ColorAlias name="midi patch change outline" alias="neutral:foreground"/>
     <ColorAlias name="midi select rect outline" alias="alert:red"/>
-    <ColorAlias name="midi sysex fill" alias="theme:contrasting"/>
-    <ColorAlias name="midi sysex outline" alias="theme:contrasting alt"/>
+    <ColorAlias name="midi sysex fill" alias="theme:contrast"/>
+    <ColorAlias name="midi sysex outline" alias="theme:contrasting less"/>
     <ColorAlias name="midi track base" alias="widget:green darker"/>
     <ColorAlias name="mixer strip button: fill" alias="widget:bg"/>
     <ColorAlias name="mixer strip button: fill active" alias="alert:orange"/>
@@ -263,8 +269,8 @@
     <ColorAlias name="monitor section dim: fill active" alias="alert:orange"/>
     <ColorAlias name="monitor section dim: led active" alias="alert:green"/>
     <ColorAlias name="monitor section knob" alias="widget:bg"/>
-    <ColorAlias name="monitor section knob: arc end" alias="widget:blue"/>
-    <ColorAlias name="monitor section knob: arc start" alias="widget:blue"/>
+    <ColorAlias name="monitor section knob: arc end" alias="widget:cream"/>
+    <ColorAlias name="monitor section knob: arc start" alias="widget:cream"/>
     <ColorAlias name="monitor section mono: fill" alias="widget:bg"/>
     <ColorAlias name="monitor section mono: fill active" alias="alert:blue"/>
     <ColorAlias name="monitor section mono: led active" alias="alert:green"/>
@@ -284,8 +290,8 @@
     <ColorAlias name="mono panner position outline" alias="theme:bg"/>
     <ColorAlias name="mono panner text" alias="neutral:backgroundest"/>
     <ColorAlias name="mouse mode button: fill" alias="widget:bg"/>
-    <ColorAlias name="mouse mode button: fill active" alias="alert:greenish"/>
-    <ColorAlias name="mouse mode button: led active" alias="alert:green"/>
+    <ColorAlias name="mouse mode button: fill active" alias="alert:orange"/>
+    <ColorAlias name="mouse mode button: led active" alias="alert:orange"/>
     <ColorAlias name="mute button: fill" alias="widget:bg"/>
     <ColorAlias name="mute button: fill active" alias="alert:yellow"/>
     <ColorAlias name="mute button: led active" alias="alert:yellow"/>
@@ -295,8 +301,8 @@
     <ColorAlias name="nudge button: fill active" alias="widget:bg"/>
     <ColorAlias name="nudge button: led active" alias="alert:green"/>
     <ColorAlias name="nudge clock: background" alias="theme:bg2"/>
-    <ColorAlias name="nudge clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="nudge clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="nudge clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="nudge clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="nudge clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="page switch button: fill" alias="widget:bg"/>
     <ColorAlias name="page switch button: fill active" alias="alert:green"/>
@@ -312,7 +318,7 @@
     <ColorAlias name="piano key highlight" alias="alert:ruddy"/>
     <ColorAlias name="pinrouting custom: led active" alias="alert:ruddy"/>
     <ColorAlias name="pinrouting sidechain: led active" alias="alert:green"/>
-    <ColorAlias name="play head" alias="theme:contrasting"/>
+    <ColorAlias name="play head" alias="alert:orange"/>
     <ColorAlias name="plugin automation state button: fill active" alias="alert:orange"/>
     <ColorAlias name="plugin bypass button: led active" alias="alert:red"/>
     <ColorAlias name="pluginlist filter button: fill active" alias="widget:bg"/>
@@ -321,14 +327,14 @@
     <ColorAlias name="pluginui toggle: fill active" alias="widget:blue"/>
     <ColorAlias name="preference highlight" alias="alert:yellow"/>
     <ColorAlias name="processor automation line" alias="alert:green"/>
-    <ColorAlias name="processor auxfeedback: fill" alias="theme:contrasting alt"/>
+    <ColorAlias name="processor auxfeedback: fill" alias="theme:contrasting less"/>
     <ColorAlias name="processor auxfeedback: led active" alias="alert:green"/>
     <ColorAlias name="processor control button: fill" alias="neutral:background"/>
     <ColorAlias name="processor control button: fill active" alias="neutral:background2"/>
     <ColorAlias name="processor control button: led active" alias="widget:blue"/>
     <ColorAlias name="processor control knob" alias="theme:bg"/>
-    <ColorAlias name="processor control knob: arc end" alias="widget:blue"/>
-    <ColorAlias name="processor control knob: arc start" alias="widget:blue"/>
+    <ColorAlias name="processor control knob: arc end" alias="widget:orange"/>
+    <ColorAlias name="processor control knob: arc start" alias="widget:orange"/>
     <ColorAlias name="processor fader: fill" alias="widget:blue"/>
     <ColorAlias name="processor fader: fill active" alias="widget:blue"/>
     <ColorAlias name="processor fader: led active" alias="alert:green"/>
@@ -372,22 +378,23 @@
     <ColorAlias name="rude audition: fill active" alias="alert:ruddy"/>
     <ColorAlias name="rude audition: led active" alias="alert:red"/>
     <ColorAlias name="rude isolate: fill" alias="widget:bg"/>
-    <ColorAlias name="rude isolate: fill active" alias="theme:contrasting alt"/>
+    <ColorAlias name="rude isolate: fill active" alias="theme:contrasting less"/>
     <ColorAlias name="rude isolate: led active" alias="alert:red"/>
     <ColorAlias name="rude solo: fill" alias="widget:bg"/>
     <ColorAlias name="rude solo: fill active" alias="alert:ruddy"/>
     <ColorAlias name="rude solo: led active" alias="alert:red"/>
-    <ColorAlias name="ruler base" alias="theme:bg2"/>
+    <ColorAlias name="ruler base" alias="neutral:backgroundest"/>
     <ColorAlias name="ruler text" alias="neutral:midground"/>
+    <ColorAlias name="scene marker bar" alias="neutral:background2"/>
     <ColorAlias name="scroomer" alias="alert:red"/>
     <ColorAlias name="secondary clock: background" alias="theme:bg2"/>
-    <ColorAlias name="secondary clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="secondary clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="secondary clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="secondary clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="secondary clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="secondary delta clock: background" alias="theme:bg2"/>
-    <ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
-    <ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
+    <ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting less"/>
+    <ColorAlias name="secondary delta clock: text" alias="theme:contrasting less"/>
     <ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
     <ColorAlias name="selected region base" alias="alert:ruddy"/>
     <ColorAlias name="selected time axis frame" alias="alert:ruddy"/>
@@ -403,12 +410,12 @@
     <ColorAlias name="send alert button: fill active" alias="alert:cyan"/>
     <ColorAlias name="send alert button: led active" alias="alert:red"/>
     <ColorAlias name="send bg" alias="neutral:backgroundest"/>
-    <ColorAlias name="send pan" alias="theme:contrasting alt"/>
+    <ColorAlias name="send pan" alias="theme:contrasting less"/>
     <ColorAlias name="shuttle" alias="widget:bg"/>
     <ColorAlias name="shuttle bg" alias="neutral:backgroundest"/>
     <ColorAlias name="vari button: fill" alias="widget:bg"/>
     <ColorAlias name="vari button: fill active" alias="alert:ruddy"/>
-    <ColorAlias name="silence" alias="theme:contrasting alt"/>
+    <ColorAlias name="silence" alias="theme:contrasting less"/>
     <ColorAlias name="silence text" alias="neutral:foreground"/>
     <ColorAlias name="solo button: fill" alias="widget:bg"/>
     <ColorAlias name="solo button: fill active" alias="alert:green"/>
@@ -433,11 +440,11 @@
     <ColorAlias name="stereo panner rule" alias="theme:bg"/>
     <ColorAlias name="stereo panner text" alias="neutral:backgroundest"/>
     <ColorAlias name="stretch clock: background" alias="theme:bg2"/>
-    <ColorAlias name="stretch clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="stretch clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="stretch clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="stretch clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="stretch clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="sync mark" alias="theme:contrasting clock"/>
-    <ColorAlias name="region mark" alias="theme:contrasting alt"/>
+    <ColorAlias name="region mark" alias="theme:contrasting less"/>
     <ColorAlias name="tempo bar" alias="neutral:background2"/>
     <ColorAlias name="tempo curve" alias="widget:blue"/>
     <ColorAlias name="tempo marker" alias="widget:orange"/>
@@ -450,25 +457,25 @@
     <ColorAlias name="tracknumber label: fill active" alias="neutral:background2"/>
     <ColorAlias name="tracknumber label: led active" alias="alert:red"/>
     <ColorAlias name="transport active option button: fill" alias="widget:bg"/>
-    <ColorAlias name="transport active option button: fill active" alias="alert:green"/>
-    <ColorAlias name="transport active option button: led active" alias="alert:green"/>
+    <ColorAlias name="transport active option button: fill active" alias="alert:orange"/>
+    <ColorAlias name="transport active option button: led active" alias="alert:orange"/>
     <ColorAlias name="transport button: fill" alias="widget:bg"/>
-    <ColorAlias name="transport button: fill active" alias="alert:green"/>
-    <ColorAlias name="transport button: led active" alias="alert:green"/>
+    <ColorAlias name="transport button: fill active" alias="alert:orange"/>
+    <ColorAlias name="transport button: led active" alias="alert:orange"/>
     <ColorAlias name="transport clock: background" alias="theme:bg2"/>
-    <ColorAlias name="transport clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="transport clock: edited text" alias="theme:contrasting alt"/>
+    <ColorAlias name="transport clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="transport clock: edited text" alias="theme:contrasting less"/>
     <ColorAlias name="transport clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="transport delta clock: background" alias="theme:bg2"/>
-    <ColorAlias name="transport delta clock: cursor" alias="theme:contrasting alt"/>
-    <ColorAlias name="transport delta clock: edited text" alias="theme:contrasting alt"/>
-    <ColorAlias name="transport delta clock: text" alias="theme:contrasting alt"/>
+    <ColorAlias name="transport delta clock: cursor" alias="theme:contrasting less"/>
+    <ColorAlias name="transport delta clock: edited text" alias="theme:contrasting less"/>
+    <ColorAlias name="transport delta clock: text" alias="theme:contrasting less"/>
     <ColorAlias name="transport drag rect" alias="neutral:midground"/>
     <ColorAlias name="transport loop rect" alias="widget:blue"/>
-    <ColorAlias name="transport marker bar" alias="neutral:background2"/>
+    <ColorAlias name="transport marker bar" alias="neutral:backgroundest"/>
     <ColorAlias name="transport option button: fill" alias="widget:bg"/>
     <ColorAlias name="transport option button: fill active" alias="widget:bg"/>
-    <ColorAlias name="transport option button: led active" alias="alert:green"/>
+    <ColorAlias name="transport option button: led active" alias="alert:orange"/>
     <ColorAlias name="transport punch rect" alias="widget:ruddy"/>
     <ColorAlias name="transport recenable button: fill" alias="widget:bg"/>
     <ColorAlias name="transport recenable button: fill active" alias="alert:ruddy"/>
@@ -488,8 +495,8 @@
     <ColorAlias name="waveform outline" alias="neutral:backgroundest"/>
     <ColorAlias name="zero line" alias="neutral:midground"/>
     <ColorAlias name="zoom button: fill" alias="widget:bg"/>
-    <ColorAlias name="zoom button: fill active" alias="alert:green"/>
-    <ColorAlias name="zoom button: led active" alias="alert:green"/>
+    <ColorAlias name="zoom button: fill active" alias="alert:orange"/>
+    <ColorAlias name="zoom button: led active" alias="alert:orange"/>
   </ColorAliases>
   <Modifiers>
     <Modifier name="audio bus base" modifier="= alpha:0.3"/>
@@ -505,7 +512,7 @@
     <Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
-    <Modifier name="marker bar" modifier="= alpha:0.5"/>
+    <Modifier name="marker bar" modifier="= alpha:0.9"/>
     <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

gtk2_ardour/ui_config_vars.h

@@ -126,10 +126,17 @@ UI_CONFIG_VARIABLE (uint32_t, action_table_columns, "action-table-columns", 3)
 UI_CONFIG_VARIABLE (bool, hide_splash_screen, "hide-splash-screen", true)
 UI_CONFIG_VARIABLE (bool, check_announcements, "check-announcements,", true)
 UI_CONFIG_VARIABLE (bool, use_wm_visibility, "use-wm-visibility", true)
+#ifndef LIVETRAX
 UI_CONFIG_VARIABLE (bool, use_palette_for_new_track, "use-palette-for-new-track", true)
 UI_CONFIG_VARIABLE (bool, use_palette_for_new_bus, "use-palette-for-new-bus", true)
 UI_CONFIG_VARIABLE (bool, use_palette_for_new_vca, "use-palette-for-new-vca", true)
+UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#4752E3:#41E9FA:#5AAA52:#DBC439:#FF8842:#FF4FFE:#435AFA:#38FFD0:#FF8842:#FFC52B:#B4A1FF:#93F0FA:#93FF8A:#FFEA78:#FFAC7D:#FEA6FF:#98A6FA:#8FFFE3:#C1FF7D:#FFDC82")  /* Gtk::ColorSelection::palette_to_string */
+#else
+UI_CONFIG_VARIABLE (bool, use_palette_for_new_track, "use-palette-for-new-track", false)
+UI_CONFIG_VARIABLE (bool, use_palette_for_new_bus, "use-palette-for-new-bus", false)
+UI_CONFIG_VARIABLE (bool, use_palette_for_new_vca, "use-palette-for-new-vca", false)
 UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#AA3939:#FFAAAA:#D46A6A:#801515:#550000:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400")  /* Gtk::ColorSelection::palette_to_string */
+#endif
 UI_CONFIG_VARIABLE (bool, use_note_bars_for_velocity, "use-note-bars-for-velocity", true)
 UI_CONFIG_VARIABLE (bool, use_note_color_for_velocity, "use-note-color-for-velocity", true)
 UI_CONFIG_VARIABLE (bool, show_snapped_cursor, "show-snapped-cursor", true)

libs/ardour/ardour/session_configuration_vars.h

@@ -42,7 +42,7 @@ CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
 CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
 CONFIG_VARIABLE (bool, count_in, "count-in", false)
 CONFIG_VARIABLE (MonitorChoice, session_monitoring, "session-monitoring", MonitorAuto)
-CONFIG_VARIABLE (RecordMode, record_mode, "record-mode", RecLayered)
+CONFIG_VARIABLE (RecordMode, record_mode, "record-mode", RecNonLayered)
 CONFIG_VARIABLE (bool, draw_opaque_midi_regions, "draw-opaque-midi_regions", false)
 CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
 CONFIG_VARIABLE (Timecode::TimecodeFormat, timecode_format, "timecode-format", Timecode::timecode_30)

libs/ardour/location.cc

@@ -1144,6 +1144,12 @@ Locations::add (Location *loc, bool make_current)
 			}
 		}
 
+#ifdef LIVETRAX
+		if ( loc->flags() == Location::IsMark ) {  //generic Location marker; upgrade to section marker
+			loc->set_section(true);
+		}
+#endif
+
 		locations.push_back (loc);
 
 		if (make_current) {