ardour/livetrax
13
0
Fork 0
Code

backport/minimize difference to mixbus branch

Browse Source
This commit is contained in:
Robin Gareus 2016-12-21 12:14:44 +01:00
parent a18c13cf21
commit 0053abbaae
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/add_route_dialog.cc
View File

@ -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());

2
gtk2_ardour/control_slave_ui.cc
View File

@ -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);

2
gtk2_ardour/editor_routes.cc
View File

@ -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) {

5
gtk2_ardour/mixer_group_tabs.cc
View File

@ -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 ();

6
gtk2_ardour/mixer_ui.cc
View File

@ -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) {

5
gtk2_ardour/sfdb_ui.cc
View File

@ -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();