smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

there is no explicit "Remote Control ID" control anymore - all done by ordering in the GUI

Browse source
This commit is contained in:
Paul Davis 2016-06-02 19:18:54 -04:00
parent 54e8a21a09
commit 8818e1887a
4 changed files with 0 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/mixer_strip.cc
View file

@ -1646,9 +1646,6 @@ MixerStrip::build_route_ops_menu ()
denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
denormal_menu_item->set_active (_route->denormal_protection());
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
if (_route) {
/* note that this relies on selection being shared across editor and
mixer (or global to the backend, in the future), which is the only

5
gtk2_ardour/route_time_axis.cc
View file

@ -590,11 +590,6 @@ RouteTimeAxisView::build_display_menu ()
}
build_size_menu ();
items.push_back (MenuElem (_("Height"), *_size_menu));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
items.push_back (SeparatorElem());
// Hook for derived classes to add type specific stuff

55
gtk2_ardour/route_ui.cc
View file

@ -2046,61 +2046,6 @@ RouteUI::page_gain_down ()
_route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
}
void
RouteUI::open_remote_control_id_dialog ()
{
ArdourDialog dialog (_("Remote Control ID"));
SpinButton* spin = 0;
dialog.get_vbox()->set_border_width (18);
if (Config->get_remote_model() == UserOrdered) {
uint32_t const limit = _session->ntracks() + _session->nbusses () + 4;
HBox* hbox = manage (new HBox);
hbox->set_spacing (6);
hbox->pack_start (*manage (new Label (_("Remote control ID:"))));
spin = manage (new SpinButton);
spin->set_digits (0);
spin->set_increments (1, 10);
spin->set_range (0, limit);
spin->set_value (_route->presentation_info().group_order());
hbox->pack_start (*spin);
dialog.get_vbox()->pack_start (*hbox);
dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT);
} else {
Label* l = manage (new Label());
if (_route->is_master() || _route->is_monitor()) {
l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n"
"The remote control ID of %3 cannot be changed."),
Gtkmm2ext::markup_escape_text (_route->name()),
_route->presentation_info().group_order(),
(_route->is_master() ? _("the master bus") : _("the monitor bus"))));
} else {
l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
"Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
"%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
(is_track() ? _("track") : _("bus")),
_route->presentation_info().group_order(),
"<span size=\"small\" style=\"italic\">",
"</span>",
Gtkmm2ext::markup_escape_text (_route->name()),
PROGRAM_NAME));
}
dialog.get_vbox()->pack_start (*l);
dialog.add_button (Stock::OK, RESPONSE_CANCEL);
}
dialog.show_all ();
int const r = dialog.run ();
if (r == RESPONSE_ACCEPT && spin) {
_route->set_presentation_group_order_explicit (spin->get_value_as_int ());
}
}
void
RouteUI::setup_invert_buttons ()
{

1
gtk2_ardour/route_ui.h
View file

@ -248,7 +248,6 @@ class RouteUI : public virtual AxisView
void adjust_latency ();
bool process_save_template_prompter (ArdourPrompter& prompter, const std::string& dir);
void save_as_template ();
void open_remote_control_id_dialog ();
static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr<ARDOUR::Stripable>);
static Gtkmm2ext::ActiveState solo_isolate_active_state (boost::shared_ptr<ARDOUR::Stripable>);