backport/minimize difference to mixbus branch

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 8d125dae6d8327cf0fa9e19e9629ce24b8dc3953..cad615c3fad1c7eeaf4637c57d02aca7106ad08c 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -374,6 +374,9 @@ AddRouteDialog::refill_track_modes ()
        s.push_back (_("Non Layered"));
 #endif
        s.push_back (_("Tape"));
+       if (!ARDOUR::Profile->get_mixbus ()) {
+               s.push_back (_("Tape"));
+       }
 
        set_popdown_strings (mode_combo, s);
        mode_combo.set_active_text (s.front());

diff --git a/gtk2_ardour/control_slave_ui.cc b/gtk2_ardour/control_slave_ui.cc
index 55705cf590cc6f47aa98091506b575525dae65b6..ef1b0a2f6e78ae9de7052b066702c238e150c8ee 100644 (file)
--- a/gtk2_ardour/control_slave_ui.cc
+++ b/gtk2_ardour/control_slave_ui.cc
@@ -51,7 +51,7 @@ ControlSlaveUI::ControlSlaveUI (Session* s)
 
        initial_button.set_no_show_all (true);
        initial_button.set_name (X_("vca assign"));
-       initial_button.set_text (_("-vca-"));
+       initial_button.set_text (_("-VCAs-"));
        initial_button.show ();
        initial_button.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
        initial_button.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &ControlSlaveUI::vca_button_release), 0), false);

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 075242459ede71396019b392a49fadb0c4df08f5..fd5e68f3ef6e365c8133de3c96ebd31e80c97d7e 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -1647,8 +1647,8 @@ EditorRoutes::move_selected_tracks (bool up)
                        DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("move %1 to %2\n", leading->old_order, neworder.size() - 1));
                }
 #endif
-
        }
+
 #ifndef NDEBUG
        DEBUG_TRACE (DEBUG::OrderKeys, "New order after moving tracks:\n");
        for (vector<int>::iterator i = neworder.begin(); i != neworder.end(); ++i) {

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 63bb1a091f5f6cda414a797d3056977a3438c38d..e235bf16cc1587cf8327b3c3da1c18777dd50508 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -71,6 +71,11 @@ MixerGroupTabs::compute_tabs () const
                if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
                }
+#ifdef MIXBUS
+               if (s->route()->mixbus()) {
+                       continue;
+               }
+#endif
 
                RouteGroup* g = s->route_group ();
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 9e5d6e23c63189acf6993047fbda83cdf6084e57..340a5a55ec96ea28f920afc3cfd1ff93a5e32456 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1519,7 +1519,11 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
        if (s->presentation_info().special () || s->presentation_info().flag_match (PresentationInfo::VCA)) {
                return;
        }
-
+#ifdef MIXBUS
+       if (s->mixbus ()) {
+               return;
+       }
+#endif
        bool found = false;
        int x0 = 0;
        for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 8359000ba0c849f3ab2d6dcf260d231913ed1ca9..d3979959fd715defc15da7169bf4e42f9c8154fd 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -57,6 +57,7 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/srcfilesource.h"
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "editing.h"
@@ -1446,7 +1447,9 @@ SoundFileOmega::reset_options ()
 
        action_strings.push_back (importmode2string (ImportAsTrack));
        action_strings.push_back (importmode2string (ImportAsRegion));
-       action_strings.push_back (importmode2string (ImportAsTapeTrack));
+       if (!Profile->get_mixbus()) {
+               action_strings.push_back (importmode2string (ImportAsTapeTrack));
+       }
 
        existing_choice = action_combo.get_active_text();