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

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index f0f0235361a80b62695c3ff84ff1bdde7bfb2357..7ef34807a65158105ed40bebada516b659dd0747 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -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

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 75ea85391c73e6919a83dc05e7934aae2a746125..1121dea38212ed95bf11334d9cec26ac725e019a 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -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

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 8b4056d4f841efa1f0d24ff4d00cb6ae6cf4e86b..074f35a08d4a14ab88201e11992660c448b86d37 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -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 ()
 {

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index af8db27349e0f85747c0f284d53b9fe40f0a7cca..ddb6b40b577528c67f3b29b7cae6cb96d4adf80d 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -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>);