no solo button on master bus

git-svn-id: svn://localhost/ardour2/branches/3.0@5167 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 715a70b1d3e445086a644866f7385fcf1f7195f4..35c5ba69636d97c433177f080dc6bff47225bedb 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -822,7 +822,11 @@ RouteTimeAxisView::set_height (uint32_t h)
 
                gm.get_gain_slider().show();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
@@ -844,7 +848,11 @@ RouteTimeAxisView::set_height (uint32_t h)
 
                gm.get_gain_slider().hide();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index c5e11e5aab1fe0df48a186bf816e27a0a3caa519..7c0d908e6db620185aea09ca83437d9b31bb1ab6 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -115,6 +115,7 @@ RouteUI::init ()
        solo_button->set_self_managed (true);
        solo_button->set_name ("SoloButton");
        UI::instance()->set_tip (solo_button, _("Mute other (non-soloed) tracks"), "");
+       solo_button->set_no_show_all (true);
 
        rec_enable_button = manage (new BindableToggleButton (""));
        rec_enable_button->set_name ("RecordEnableButton");
@@ -210,7 +211,12 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        solo_button->unset_flags (Gtk::CAN_FOCUS);
        
        mute_button->show();
-       solo_button->show();
+
+       if (_route->is_master()) {
+               solo_button->hide ();
+       } else {
+               solo_button->show();
+       }
 
        connections.push_back (_route->RemoteControlIDChanged.connect (mem_fun(*this, &RouteUI::refresh_remote_control_menu)));