Call PBD::init and PBD::cleanup in pbd test executable

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 715eec53b4bc219234958a4df6bef520b91b8dca..be761894fc22baeba2a4332f3a156a6d5c56705d 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -207,8 +207,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                 controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
         }
 
-       controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
+       if (!ARDOUR::Profile->get_trx()) {
+               controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+               controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
+       }
 
        ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
@@ -222,9 +224,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        label_view ();
 
-       controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       if (!ARDOUR::Profile->get_trx()) {
+               controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       }
 
-       if (is_track() && track()->mode() == ARDOUR::Normal) {
+       if (!ARDOUR::Profile->get_trx() && is_track() && track()->mode() == ARDOUR::Normal) {
                controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        }
 
@@ -706,6 +710,7 @@ RouteTimeAxisView::build_display_menu ()
        } else if (active > 0 && inactive > 0) {
                i->set_inconsistent (true);
        }
+       i->set_sensitive(! _session->transport_rolling());
        i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), click_sets_active, true));
 
        items.push_back (SeparatorElem());
@@ -725,7 +730,7 @@ RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection)
                _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false));
        } else {
 
-               bool needs_bounce;
+               bool needs_bounce = false;
 
                if (!track()->can_use_mode (mode, needs_bounce)) {