goodbye Profile->...trx

9 files changed, 57 insertions, 139 deletions

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 1793e5b024..5bc1813645 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -567,7 +567,7 @@ About::About ()
 	const std::string cpu_arch = _("32-bit"); // ARM, ALPHA,..
 #endif
 	std::string codename = CODENAME;
-	if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) {
+	if (ARDOUR::Profile->get_mixbus()) {
 		codename = "";
 	}
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index a5e68c99b7..3c51c3912f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1748,9 +1748,6 @@ ARDOUR_UI::transport_record (bool roll)
 				msg.run ();
 				return;
 			}
-			if (Profile->get_trx()) {
-				roll = trx_record_enable_all_tracks ();
-			}
 			_session->maybe_enable_record ();
 			if (roll) {
 				transport_roll ();
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index f5cf855843..cee609349c 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -234,20 +234,18 @@ ARDOUR_UI::set_session (Session *s)
 	    _session->master_out() &&
 	    _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
 
-		if (!ARDOUR::Profile->get_trx()) {
-			editor_meter = new LevelMeterHBox(_session);
-			editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
-			editor_meter->clear_meters();
-			editor_meter->setup_meters (30, 10, 6);
-			editor_meter->show();
-
-			editor_meter_table.set_spacings(3);
-			editor_meter_table.attach(*editor_meter,             0,1, 0,1, FILL, FILL);
-			editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
-
-			editor_meter->show();
-			editor_meter_peak_display.show();
-		}
+		editor_meter = new LevelMeterHBox(_session);
+		editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
+		editor_meter->clear_meters();
+		editor_meter->setup_meters (30, 10, 6);
+		editor_meter->show();
+
+		editor_meter_table.set_spacings(3);
+		editor_meter_table.attach(*editor_meter,             0,1, 0,1, FILL, FILL);
+		editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
+
+		editor_meter->show();
+		editor_meter_peak_display.show();
 
 		ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
 		ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display));
diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index a6e4bc6dc9..9ce89841fa 100644
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -112,7 +112,6 @@ ARDOUR_UI::first_idle ()
 	return false;
 }
 
-
 void
 ARDOUR_UI::setup_profile ()
 {
@@ -120,10 +119,6 @@ ARDOUR_UI::setup_profile ()
 		Profile->set_small_screen ();
 	}
 
-	if (g_getenv ("TRX")) {
-		Profile->set_trx ();
-	}
-
 	if (g_getenv ("MIXBUS")) {
 		Profile->set_mixbus ();
 	}
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 912eb1552e..b1c279985b 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -533,9 +533,6 @@ Editor::Editor ()
 	meter_label.hide();
 	meter_label.set_no_show_all();
 
-	if (Profile->get_trx()) {
-		mark_label.set_text (_("Markers"));
-	}
 	mark_label.set_name ("EditorRulerLabel");
 	mark_label.set_size_request (-1, (int)timebar_height);
 	mark_label.set_alignment (1.0, 0.5);
@@ -592,9 +589,7 @@ Editor::Editor ()
 
 	HBox* h = manage (new HBox);
 	_group_tabs = new EditorGroupTabs (this);
-	if (!ARDOUR::Profile->get_trx()) {
-		h->pack_start (*_group_tabs, PACK_SHRINK);
-	}
+	h->pack_start (*_group_tabs, PACK_SHRINK);
 	h->pack_start (edit_controls_vbox);
 	controls_layout.add (*h);
 
@@ -716,18 +711,13 @@ Editor::Editor ()
 	_summary_hbox.pack_start (*summary_frame, true, true);
 	_summary_hbox.pack_start (*summary_arrows_right, false, false);
 
-	if (!ARDOUR::Profile->get_trx()) {
-		editor_summary_pane.add (_summary_hbox);
-	}
-
+	editor_summary_pane.add (_summary_hbox);
 	edit_pane.set_check_divider_position (true);
 	edit_pane.add (editor_summary_pane);
-	if (!ARDOUR::Profile->get_trx()) {
-		_editor_list_vbox.pack_start (*_time_info_box, false, false, 0);
-		_editor_list_vbox.pack_start (_the_notebook);
-		edit_pane.add (_editor_list_vbox);
-		edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */
-	}
+	_editor_list_vbox.pack_start (*_time_info_box, false, false, 0);
+	_editor_list_vbox.pack_start (_the_notebook);
+	edit_pane.add (_editor_list_vbox);
+	edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */
 
 	edit_pane.set_drag_cursor (*_cursors->expand_left_right);
 	editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
@@ -3098,10 +3088,7 @@ Editor::setup_toolbar ()
 	mouse_mode_size_group->add_widget (nudge_backward_button);
 
 	mouse_mode_hbox->set_spacing (2);
-
-	if (!ARDOUR::Profile->get_trx()) {
-		mouse_mode_hbox->pack_start (smart_mode_button, false, false);
-	}
+	mouse_mode_hbox->pack_start (smart_mode_button, false, false);
 
 	mouse_mode_hbox->pack_start (mouse_move_button, false, false);
 	mouse_mode_hbox->pack_start (mouse_select_button, false, false);
@@ -3111,11 +3098,9 @@ Editor::setup_toolbar ()
 		mouse_mode_hbox->pack_start (mouse_audition_button, false, false);
 	}
 
-	if (!ARDOUR::Profile->get_trx()) {
-		mouse_mode_hbox->pack_start (mouse_timefx_button, false, false);
-		mouse_mode_hbox->pack_start (mouse_draw_button, false, false);
-		mouse_mode_hbox->pack_start (mouse_content_button, false, false);
-	}
+	mouse_mode_hbox->pack_start (mouse_timefx_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_draw_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_content_button, false, false);
 
 	mouse_mode_vbox->pack_start (*mouse_mode_hbox);
 
@@ -3126,12 +3111,10 @@ Editor::setup_toolbar ()
 
 	edit_mode_selector.set_name ("mouse mode button");
 
-	if (!ARDOUR::Profile->get_trx()) {
-		mode_box->pack_start (edit_mode_selector, false, false);
-		mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-		mode_box->pack_start (edit_point_selector, false, false);
-		mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-	}
+	mode_box->pack_start (edit_mode_selector, false, false);
+	mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
+	mode_box->pack_start (edit_point_selector, false, false);
+	mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
 
 	mode_box->pack_start (*mouse_mode_box, false, false);
 
@@ -3164,9 +3147,6 @@ Editor::setup_toolbar ()
 
 	if (ARDOUR::Profile->get_mixbus()) {
 		_zoom_box.pack_start (zoom_preset_selector, false, false);
-	} else if (ARDOUR::Profile->get_trx()) {
-		mode_box->pack_start (zoom_out_button, false, false);
-		mode_box->pack_start (zoom_in_button, false, false);
 	} else {
 		_zoom_box.pack_start (zoom_out_button, false, false);
 		_zoom_box.pack_start (zoom_in_button, false, false);
@@ -3197,9 +3177,6 @@ Editor::setup_toolbar ()
 
 	if (ARDOUR::Profile->get_mixbus()) {
 		_track_box.pack_start (visible_tracks_selector);
-	} else if (ARDOUR::Profile->get_trx()) {
-		_track_box.pack_start (tav_shrink_button);
-		_track_box.pack_start (tav_expand_button);
 	} else {
 		_track_box.pack_start (visible_tracks_selector);
 		_track_box.pack_start (tav_shrink_button);
@@ -3254,24 +3231,13 @@ Editor::setup_toolbar ()
 	ebox_vpacker.show();
 
 	toolbar_hbox.pack_start (*mode_box, false, false);
-
-	if (!ARDOUR::Profile->get_trx()) {
-
-		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-
-		toolbar_hbox.pack_start (snap_box, false, false);
-
-		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-
-		toolbar_hbox.pack_start (*nudge_box, false, false);
-
-		toolbar_hbox.pack_end (_zoom_box, false, false, 2);
-
-		toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
-
-		toolbar_hbox.pack_end (_track_box, false, false);
-
-	}
+	toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
+	toolbar_hbox.pack_start (snap_box, false, false);
+	toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
+	toolbar_hbox.pack_start (*nudge_box, false, false);
+	toolbar_hbox.pack_end (_zoom_box, false, false, 2);
+	toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
+	toolbar_hbox.pack_end (_track_box, false, false);
 
 	toolbar_hbox.show_all ();
 }
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 1e9b4c46ef..86d2f1bf5a 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -630,29 +630,16 @@ Editor::register_actions ()
 
 	no_ruler_shown_update = true;
 
-	if (Profile->get_trx()) {
-		ruler_marker_action->set_active (true);
-		ruler_meter_action->set_active (false);
-		ruler_tempo_action->set_active (false);
-		ruler_range_action->set_active (false);
-		ruler_loop_punch_action->set_active (false);
-		ruler_loop_punch_action->set_active (false);
-		ruler_bbt_action->set_active (true);
-		ruler_cd_marker_action->set_active (false);
-		ruler_timecode_action->set_active (false);
-		ruler_minsec_action->set_active (true);
-	} else {
-		ruler_marker_action->set_active (true);
-		ruler_meter_action->set_active (true);
-		ruler_tempo_action->set_active (true);
-		ruler_range_action->set_active (true);
-		ruler_loop_punch_action->set_active (true);
-		ruler_loop_punch_action->set_active (true);
-		ruler_bbt_action->set_active (true);
-		ruler_cd_marker_action->set_active (true);
-		ruler_timecode_action->set_active (true);
-		ruler_minsec_action->set_active (false);
-	}
+	ruler_marker_action->set_active (true);
+	ruler_meter_action->set_active (true);
+	ruler_tempo_action->set_active (true);
+	ruler_range_action->set_active (true);
+	ruler_loop_punch_action->set_active (true);
+	ruler_loop_punch_action->set_active (true);
+	ruler_bbt_action->set_active (true);
+	ruler_cd_marker_action->set_active (true);
+	ruler_timecode_action->set_active (true);
+	ruler_minsec_action->set_active (false);
 
 	ruler_video_action->set_active (false);
 	xjadeo_proc_action->set_active (false);
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 436835f02e..ce89d5b18b 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -220,10 +220,8 @@ MixerStrip::init ()
 
 	solo_iso_table.set_homogeneous (true);
 	solo_iso_table.set_spacings (2);
-	if (!ARDOUR::Profile->get_trx()) {
-		solo_iso_table.attach (*solo_isolated_led, 0, 1, 0, 1);
-		solo_iso_table.attach (*solo_safe_led, 1, 2, 0, 1);
-	}
+	solo_iso_table.attach (*solo_isolated_led, 0, 1, 0, 1);
+	solo_iso_table.attach (*solo_safe_led, 1, 2, 0, 1);
 	solo_iso_table.show ();
 
 	rec_mon_table.set_homogeneous (true);
@@ -233,9 +231,6 @@ MixerStrip::init ()
 		rec_mon_table.resize (1, 3);
 		rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
 		rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
-	} else if (!ARDOUR::Profile->get_trx()) {
-		rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
-		rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
 	}
 	rec_mon_table.show ();
 
@@ -313,13 +308,11 @@ MixerStrip::init ()
 	number_label.set_tweaks (ArdourButton::OccasionalText);
 
 	global_vpacker.set_spacing (2);
-	if (!ARDOUR::Profile->get_trx()) {
-		global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (processor_box, true, true);
-	}
+	global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (_invert_button_box, 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);
 	global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
@@ -327,12 +320,8 @@ MixerStrip::init ()
 	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);
-	if (!ARDOUR::Profile->get_trx()) {
-		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, Gtk::PACK_SHRINK);
-	}
+	global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK);
 
 #ifndef MIXBUS
 	//add a spacer underneath the master bus;
@@ -667,8 +656,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		if (ARDOUR::Profile->get_mixbus()) {
 			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
 			rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
-		} else if (ARDOUR::Profile->get_trx()) {
-			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 2);
 		} else {
 			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
 			rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index ab1bb1bb4e..7604a29eb8 100644
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -605,12 +605,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 
 						/* we own this port (named after the program) */
 
-						/* Hide scene ports from non-Tracks Live builds */
-						if (!ARDOUR::Profile->get_trx()) {
-							if (p.find (_("Scene ")) != string::npos) {
-								++s;
-								continue;
-							}
+						/* Hide scene ports for now */
+						if (p.find (_("Scene ")) != string::npos) {
+							++s;
+							continue;
 						}
 
 						extra_program[t].push_back (p);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index eace6de34a..0428f49f1f 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -266,10 +266,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 		controls_table.attach (route_group_button, 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 		controls_table.attach (gm.get_gain_slider(), 3, 5, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
 	}
-	else if (!ARDOUR::Profile->get_trx()) {
-		controls_table.attach (route_group_button, 4, 5, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
-		controls_table.attach (gm.get_gain_slider(), 0, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
-	}
 
 	set_tooltip(*solo_button,_("Solo"));
 	set_tooltip(*mute_button,_("Mute"));
@@ -294,17 +290,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 	if (ARDOUR::Profile->get_mixbus()) {
 		controls_table.attach (automation_button, 1, 2, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
 	}
-	else if (!ARDOUR::Profile->get_trx()) {
-		controls_table.attach (automation_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-	}
 
 	if (is_track() && track()->mode() == ARDOUR::Normal) {
 		if (ARDOUR::Profile->get_mixbus()) {
 			controls_table.attach (playlist_button, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
 		}
-		else if (!ARDOUR::Profile->get_trx()) {
-			controls_table.attach (playlist_button, 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-		}
 	}
 
 	_y_position = -1;