projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'ripple-mode-cc' into cairocanvas
[ardour.git] / gtk2_ardour / route_ui.cc
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index c9d168026da4dd68fa2d35a86a112cc45d9a1f71..01b2182e628efe033728899e7233c1642ba322c6 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -58,6 +58,7 @@
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 
 uint32_t RouteUI::_max_invert_buttons = 3;
@@ -125,7 +126,7 @@ RouteUI::init ()
 
        rec_enable_button = manage (new ArdourButton);
        rec_enable_button->set_name ("record enable button");
-       rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
+//     rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
        show_sends_button = manage (new ArdourButton);
@@ -348,6 +349,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                                _mute_release->routes = copy;
                                        }
 
+                                       DisplaySuspender ds;
                                        _session->set_mute (copy, !_route->muted());
 
                                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -372,6 +374,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                                        rl->push_back (_route);
                                                }
 
+                                               DisplaySuspender ds;
                                                _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
                                        }
 
@@ -402,6 +405,7 @@ RouteUI::mute_release (GdkEventButton*)
 {
        if (!_i_am_the_modifier) {
                if (_mute_release){
+                       DisplaySuspender ds;
                        _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true);
                        delete _mute_release;
                        _mute_release = 0;
@@ -460,6 +464,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                _solo_release->routes = _session->get_routes ();
                                        }
 
+                                       DisplaySuspender ds;
                                        if (Config->get_solo_control_is_listen_control()) {
                                                _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(),  Session::rt_cleanup, true);
                                        } else {
@@ -487,6 +492,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        if (Config->get_solo_control_is_listen_control()) {
                                                /* ??? we need a just_one_listen() method */
                                        } else {
+                                               DisplaySuspender ds;
                                                _session->set_just_one_solo (_route, true);
                                        }
 
@@ -524,6 +530,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                        rl->push_back (_route);
                                                }
 
+                                               DisplaySuspender ds;
                                                if (Config->get_solo_control_is_listen_control()) {
                                                        _session->set_listen (rl, !_route->listening_via_monitor(),  Session::rt_cleanup, true);
                                                } else {
@@ -542,6 +549,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                _solo_release->routes = rl;
                                        }
 
+                                       DisplaySuspender ds;
                                        if (Config->get_solo_control_is_listen_control()) {
                                                _session->set_listen (rl, !_route->listening_via_monitor());
                                        } else {
@@ -565,11 +573,12 @@ RouteUI::solo_release (GdkEventButton*)
                        if (_solo_release->exclusive) {
 
                        } else {
-                                if (Config->get_solo_control_is_listen_control()) {
-                                        _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
-                                } else {
-                                        _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
-                                }
+                               DisplaySuspender ds;
+                               if (Config->get_solo_control_is_listen_control()) {
+                                       _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
+                               } else {
+                                       _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
+                               }
                        }
 
                        delete _solo_release;
@@ -588,7 +597,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
        }
 
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - cannot engage record"));
+               MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
                msg.run ();
                return true;
        }
@@ -612,6 +621,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
+                       DisplaySuspender ds;
                        _session->set_record_enabled (_session->get_routes(), !rec_enable_button->active_state());
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -632,7 +642,8 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                                        rl.reset (new RouteList);
                                        rl->push_back (_route);
                                }
-                               
+
+                               DisplaySuspender ds;
                                _session->set_record_enabled (rl, !rec_enable_button->active_state(), Session::rt_cleanup, true);
                        }
 
@@ -644,6 +655,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                        boost::shared_ptr<RouteList> rl (new RouteList);
                        rl->push_back (route());
+                       DisplaySuspender ds;
                        _session->set_record_enabled (rl, !rec_enable_button->active_state());
                }
        }
@@ -761,6 +773,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
                rl->push_back (route());
        }
 
+       DisplaySuspender ds;
        _session->set_monitoring (rl, mc, Session::rt_cleanup, true);           
 
        return true;
@@ -1237,13 +1250,13 @@ RouteUI::build_mute_menu(void)
 
        MenuList& items = mute_menu->items();
 
-       pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader")));
+       pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader Sends")));
        init_mute_menu(MuteMaster::PreFader, pre_fader_mute_check);
        pre_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check));
        items.push_back (CheckMenuElem(*pre_fader_mute_check));
        pre_fader_mute_check->show_all();
 
-       post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader")));
+       post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader Sends")));
        init_mute_menu(MuteMaster::PostFader, post_fader_mute_check);
        post_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check));
        items.push_back (CheckMenuElem(*post_fader_mute_check));
@@ -1319,36 +1332,38 @@ RouteUI::muting_change ()
 bool
 RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 {
-        if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
-                return true;
-        }
+       if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
+               return true;
+       }
 
-        bool view = solo_isolated_led->active_state();
-        bool model = _route->solo_isolated();
+       bool view = solo_isolated_led->active_state();
+       bool model = _route->solo_isolated();
 
-        /* called BEFORE the view has changed */
+       /* called BEFORE the view has changed */
 
-        if (ev->button == 1) {
-                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+       if (ev->button == 1) {
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-                        if (model) {
-                                /* disable isolate for all routes */
-                                _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
-                        }
+                       if (model) {
+                               /* disable isolate for all routes */
+                               DisplaySuspender ds;
+                               _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
+                       }
 
-                } else {
-                        if (model == view) {
+               } else {
+                       if (model == view) {
 
-                                /* flip just this route */
+                               /* flip just this route */
 
-                                boost::shared_ptr<RouteList> rl (new RouteList);
-                                rl->push_back (_route);
-                                _session->set_solo_isolated (rl, !view, Session::rt_cleanup, true);
-                        }
-                }
-        }
+                               boost::shared_ptr<RouteList> rl (new RouteList);
+                               rl->push_back (_route);
+                               DisplaySuspender ds;
+                               _session->set_solo_isolated (rl, !view, Session::rt_cleanup, true);
+                       }
+               }
+       }
 
-        return true;
+       return true;
 }
 
 bool
@@ -2015,7 +2030,9 @@ RouteUI::color () const
        RouteGroup* g = _route->route_group ();
        
        if (g && g->is_color()) {
-               return GroupTabs::group_color (g);
+               Gdk::Color c;
+               set_color_from_rgba (c, GroupTabs::group_color (g));
+               return c;
        }
 
        return _color;
Unnamed repository; edit this file 'description' to name the repository.