fix comment

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 8c9e2835231e7b91fa2b725ea23f721258cae99e..ad5e3bfd94be8ae67f8ad60c7f725201f8a17ff8 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -61,13 +61,18 @@ using namespace ARDOUR;
 using namespace PBD;
 
 uint32_t RouteUI::_max_invert_buttons = 3;
-sigc::signal<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;
+PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;
 boost::weak_ptr<Route> RouteUI::_showing_sends_to;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
        : AxisView(sess)
+       , mute_menu(0)
+       , solo_menu(0)
+       , sends_menu(0)
+       , record_menu(0)
+       , _invert_menu(0)
 {
-       init ();
+       if (sess) init ();
 }
 
 RouteUI::~RouteUI()
@@ -166,7 +171,7 @@ RouteUI::init ()
        monitor_disk_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_press));
        monitor_disk_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release));
 
-       BusSendDisplayChanged.connect (sigc::mem_fun (*this, &RouteUI::bus_send_display_changed));
+       BusSendDisplayChanged.connect_same_thread (*this, boost::bind(&RouteUI::bus_send_display_changed, this, _1));
 }
 
 void
@@ -254,7 +259,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
        mute_button->show();
 
-       if (_route->is_monitor()) {
+       if (_route->is_monitor() || _route->is_master()) {
                solo_button->hide ();
        } else {
                solo_button->show();
@@ -327,10 +332,9 @@ RouteUI::mute_press (GdkEventButton* ev)
                                         * on a copy.
                                         */
                                        
-                                       boost::shared_ptr<RouteList> rl = _session->get_routes ();
                                        boost::shared_ptr<RouteList> copy (new RouteList);
 
-                                       *copy = *rl;
+                                       *copy = *_session->get_routes ();
 
                                        for (RouteList::iterator i = copy->begin(); i != copy->end(); ) {
                                                if ((*i)->is_master() || (*i)->is_monitor()) {
@@ -352,13 +356,20 @@ RouteUI::mute_press (GdkEventButton* ev)
                                           NOTE: Primary-button2 is MIDI learn.
                                        */
 
+                                       boost::shared_ptr<RouteList> rl;
 
-                                       if (ev->button == 1 && _route->route_group()) {
+                                       if (ev->button == 1) { 
 
-                                               boost::shared_ptr<RouteList> rl = _route->route_group()->route_list();
-                                               
-                                               if (_mute_release) {
-                                                       _mute_release->routes = rl;
+                                               if (_route->route_group()) {
+                                                       
+                                                       rl = _route->route_group()->route_list();
+                                                       
+                                                       if (_mute_release) {
+                                                               _mute_release->routes = rl;
+                                                       }
+                                               } else {
+                                                       rl.reset (new RouteList);
+                                                       rl->push_back (_route);
                                                }
 
                                                _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
@@ -370,7 +381,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 
                                        boost::shared_ptr<RouteList> rl (new RouteList);
                                        rl->push_back (_route);
-
+                                       
                                        if (_mute_release) {
                                                _mute_release->routes = rl;
                                        }
@@ -493,16 +504,30 @@ RouteUI::solo_press(GdkEventButton* ev)
                                           NOTE: Primary-button2 is MIDI learn.
                                        */
 
-                                       if (ev->button == 1 && _route->route_group()) {
+                                       /* Primary-button1 applies change to the mix group even if it is not active
+                                          NOTE: Primary-button2 is MIDI learn.
+                                       */
+
+                                       boost::shared_ptr<RouteList> rl;
+
+                                       if (ev->button == 1) { 
 
-                                               if (_solo_release) {
-                                                       _solo_release->routes = _route->route_group()->route_list();
+                                               if (_route->route_group()) {
+                                                       
+                                                       rl = _route->route_group()->route_list();
+                                                       
+                                                       if (_solo_release) {
+                                                               _solo_release->routes = rl;
+                                                       }
+                                               } else {
+                                                       rl.reset (new RouteList);
+                                                       rl->push_back (_route);
                                                }
 
                                                if (Config->get_solo_control_is_listen_control()) {
-                                                       _session->set_listen (_route->route_group()->route_list(), !_route->listening_via_monitor(),  Session::rt_cleanup, true);
+                                                       _session->set_listen (rl, !_route->listening_via_monitor(),  Session::rt_cleanup, true);
                                                } else {
-                                                       _session->set_solo (_route->route_group()->route_list(), !_route->self_soloed(),  Session::rt_cleanup, true);
+                                                       _session->set_solo (rl, !_route->self_soloed(),  Session::rt_cleanup, true);
                                                }
                                        }
 
@@ -594,8 +619,21 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                        /* Primary-button1 applies change to the route group (even if it is not active)
                           NOTE: Primary-button2 is MIDI learn.
                        */
-                       if (ev->button == 1 && _route->route_group()) {
-                               _session->set_record_enabled (_route->route_group()->route_list(), !rec_enable_button->active_state(), Session::rt_cleanup, true);
+
+                       if (ev->button == 1) {
+
+                               boost::shared_ptr<RouteList> rl;
+                               
+                               if (_route->route_group()) {
+                                       
+                                       rl = _route->route_group()->route_list();
+                                       
+                               } else {
+                                       rl.reset (new RouteList);
+                                       rl->push_back (_route);
+                               }
+                               
+                               _session->set_record_enabled (rl, !rec_enable_button->active_state(), Session::rt_cleanup, true);
                        }
 
                } else if (Keyboard::is_context_menu_event (ev)) {
@@ -1654,7 +1692,7 @@ RouteUI::map_frozen ()
 void
 RouteUI::adjust_latency ()
 {
-       LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle());
+       LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 }
 
 void
@@ -1777,10 +1815,9 @@ RouteUI::open_remote_control_id_dialog ()
                                                       _route->remote_control_id(),
                                                       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
                } else {
-                       l->set_markup (string_compose (_("The remote control ID of %6 is: %3\n\n\n"
-                                                        "Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
-                                                        "%4Use the User Interaction tab of the Preferences window if you want to change this%5"),
-                                                      (Config->get_remote_model() == MixerOrdered ? _("the mixer") : _("the editor")),
+                       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 Ardour.\n\n"
+                                                        "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
                                                       (is_track() ? _("track") : _("bus")),
                                                       _route->remote_control_id(),
                                                       "<span size=\"small\" style=\"italic\">",