LT: remove more region operations

gtk2_ardour/editor.cc

@@ -1728,7 +1728,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
 		return;
 	}
 
-	if (item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) {
+	if (!ARDOUR::Profile->get_livetrax() && item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) {
 
 		/* Bounce to disk */
 
@@ -2005,6 +2005,26 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items, bool ti
 {
 	using namespace Menu_Helpers;
 
+	if (ARDOUR::Profile->get_livetrax()) {
+		edit_items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::play_selection)));
+		edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true)));
+
+		edit_items.push_back (SeparatorElem());
+		edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal)));
+
+		edit_items.push_back (SeparatorElem());
+		edit_items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::spectral_analyze_range_selection)));
+
+		edit_items.push_back (SeparatorElem());
+		edit_items.push_back (MenuElem (_("Separate"), mem_fun(*this, &Editor::separate_region_from_selection)));
+		edit_items.push_back (MenuElem (_("Crop Region to Range"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)));
+
+		edit_items.push_back (SeparatorElem());
+		edit_items.push_back (MenuElem (_("Set Session Start/End from Selection"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection)));
+
+		return;
+	}
+
 	edit_items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::play_selection)));
 	edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true)));
 
@@ -2089,6 +2109,10 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items, bool ti
 void
 Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 {
+	if (ARDOUR::Profile->get_livetrax()) {
+		return;
+	}
+
 	using namespace Menu_Helpers;
 
 	/* Playback */

gtk2_ardour/editor_markers.cc

@@ -1145,9 +1145,11 @@ Editor::build_marker_menu (Location* loc)
 	items.push_back (SeparatorElem());
 
 	if (!loc->is_cue_marker()) {
+#ifndef LIVETRAX
 		items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
 
 		items.push_back (MenuElem (_("Promote to Time Origin"), sigc::mem_fun(*this, &Editor::marker_menu_set_origin)));
+#endif
 		items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
 
 		items.push_back (CheckMenuElem (_("Lock")));

gtk2_ardour/livetrax.menus.in

@@ -176,9 +176,6 @@
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu' accelerators='true'>
-    <menuitem action='play-selected-regions'/>
-    <menuitem action='tag-selected-regions'/>
-    <separator/>
     <menuitem action='group-selected-regions'/>
     <menuitem action='ungroup-selected-regions'/>
     <separator/>
@@ -192,7 +189,9 @@
       <menuitem action='reset-region-gain'/>
       <menuitem action='toggle-region-polarity'/>
     </menu>
+    <separator/>
     <menuitem action='export-region'/>
+    <separator/>
     <menuitem action='loudness-analyze-region'/>
     <menuitem action='spectral-analyze-region'/>
     <separator/>

gtk2_ardour/mixer_strip.cc

@@ -1117,6 +1117,19 @@ MixerStrip::build_route_ops_menu ()
 
 	MenuList& items = route_ops_menu->items();
 
+	if (ARDOUR::Profile->get_livetrax()) {
+		if (!_route->is_singleton ()) {
+			items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
+			items.push_back (SeparatorElem());
+			/* do not allow rename if the track is record-enabled */
+			items.back().set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
+			items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+			items.push_back (SeparatorElem());
+			items.push_back (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+		}
+		return;
+	}
+
 	if (active) {
 
 		items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));

gtk2_ardour/route_group_dialog.cc

@@ -160,9 +160,13 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
 	table->attach (_mute,             1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
 	table->attach (_solo,             1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
 	table->attach (_rec_enable,       1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
+#ifndef LIVETRAX
 	table->attach (_sursend_enable,   1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
+#endif
 	table->attach (_select,           1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
+#ifndef LIVETRAX
 	table->attach (_route_active,     1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
+#endif
 	table->attach (_share_color,      1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
 	table->attach (_share_monitoring, 1, 3, r, r + 1, Gtk::FILL, Gtk::FILL, 0, 0); ++r;
 

gtk2_ardour/route_time_axis.cc

@@ -656,6 +656,32 @@ RouteTimeAxisView::build_display_menu ()
 
 	MenuList& items = display_menu->items();
 
+	if (ARDOUR::Profile->get_livetrax()) {
+		items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+
+		items.push_back (SeparatorElem());
+
+		WeakRouteList r;
+		for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
+			RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+			if (rtv) {
+				r.push_back (rtv->route ());
+			}
+		}
+
+		if (r.empty ()) {
+			r.push_back (route ());
+		}
+
+		route_group_menu->build (r);
+		items.push_back (MenuElem (_("Group"), *route_group_menu->menu ()));
+
+		items.push_back (SeparatorElem());
+		items.push_back (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
+
+		return;
+	}
+
 	items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
 
 	items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor)));

gtk2_ardour/ui_config_vars.h

@@ -23,7 +23,11 @@ UI_CONFIG_VARIABLE (std::string, icon_set, "icon-set", "default")
 UI_CONFIG_VARIABLE (std::string, ui_rc_file, "ui-rc-file", "clearlooks.rc")
 UI_CONFIG_VARIABLE (std::string, ui_font_family, "ui-font-family", "Sans")
 UI_CONFIG_VARIABLE (std::string, color_file, "color-file", "dark")
+#ifndef LIVETRAX
 UI_CONFIG_VARIABLE (bool, flat_buttons, "flat-buttons", false)
+#else
+UI_CONFIG_VARIABLE (bool, flat_buttons, "flat-buttons", true)
+#endif
 UI_CONFIG_VARIABLE (bool, boxy_buttons, "boxy-buttons", false)
 UI_CONFIG_VARIABLE (bool, blink_rec_arm, "blink-rec-arm", false)
 UI_CONFIG_VARIABLE (bool, blink_alert_indicators, "blink-alert-indicators", true)
@@ -148,7 +152,11 @@ UI_CONFIG_VARIABLE (bool, snap_to_playhead, "snap-to-playhead", true)
 UI_CONFIG_VARIABLE (bool, snap_to_region_sync, "snap-to-region-sync", true)
 UI_CONFIG_VARIABLE (bool, snap_to_region_start, "snap-to-region-start", true)
 UI_CONFIG_VARIABLE (bool, snap_to_region_end, "snap-to-region-end", true)
+#ifndef LIVETRAX
 UI_CONFIG_VARIABLE (bool, show_selection_marker, "show-selection-marker", true)
+#else
+UI_CONFIG_VARIABLE (bool, show_selection_marker, "show-selection-marker", false)
+#endif
 UI_CONFIG_VARIABLE (bool, show_grids_ruler, "show-grids-ruler", true)
 UI_CONFIG_VARIABLE (bool, rulers_follow_grid, "rulers-follow-grid", false)
 UI_CONFIG_VARIABLE (bool, grid_follows_internal, "grid-follows-internal", false)  //this feature is deprecated, default it FALSE for now; remove it in v6

libs/ardour/ardour/session_configuration_vars.h

@@ -31,11 +31,21 @@
 CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
 CONFIG_VARIABLE (bool, use_transport_fades, "use-transport-fades", true)
 CONFIG_VARIABLE (bool, use_monitor_fades, "use-monitor-fades", true)
+#ifndef LIVETRAX
 CONFIG_VARIABLE (SampleFormat, native_file_data_format,  "native-file-data-format", ARDOUR::FormatFloat)
 CONFIG_VARIABLE (HeaderFormat, native_file_header_format,  "native-file-header-format", ARDOUR::WAVE)
+#else
+CONFIG_VARIABLE (SampleFormat, native_file_data_format,  "native-file-data-format", ARDOUR::FormatInt24)
+CONFIG_VARIABLE (HeaderFormat, native_file_header_format,  "native-file-header-format", ARDOUR::FLAC)
+#endif
+
 CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
 CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
+#ifndef LIVETRAX
 CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
+#else
+CONFIG_VARIABLE (bool, auto_input, "auto-input", false)
+#endif
 CONFIG_VARIABLE (bool, triggerbox_overrides_disk_monitoring, "triggerbox-overrides-disk-monitoring", true)
 CONFIG_VARIABLE (CueBehavior, cue_behavior, "cue-behavior", FollowCues)
 CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
@@ -96,4 +106,8 @@ CONFIG_VARIABLE (uint32_t, meterbridge_label_height,  "meterbridge-label-height"
 /* If the user changes the session default_time_domain, we also stash that in rc_config as a global preference,
      where it is used to initialize the session timebase menu during new session creation
 */
+#ifndef LIVETRAX
 CONFIG_VARIABLE (Temporal::TimeDomain, default_time_domain, "default-time-domain", Temporal::BeatTime)
+#else
+CONFIG_VARIABLE (Temporal::TimeDomain, default_time_domain, "default-time-domain", Temporal::AudioTime)
+#endif