X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=1e7c94f9069406d13406877f46340c9e0001265c;hb=e8903a7590caaa46498d3e53c9d7df63edb24090;hp=c3e9b6e1f230cfb9f45c8284445c0a7aaf5f306b;hpb=e6064b286e1bace410d4f60fe4f3fee1f36da264;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index c3e9b6e1f2..1e7c94f906 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -504,7 +504,7 @@ MixerStrip::trim_start_touch ()
 {
 	assert (_route && _session);
 	if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) {
-		route()->trim()->gain_control ()->start_touch (_session->transport_frame());
+		route()->trim()->gain_control ()->start_touch (_session->transport_sample());
 	}
 }
 
@@ -513,7 +513,7 @@ MixerStrip::trim_end_touch ()
 {
 	assert (_route && _session);
 	if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) {
-		route()->trim()->gain_control ()->stop_touch (_session->transport_frame());
+		route()->trim()->gain_control ()->stop_touch (_session->transport_sample());
 	}
 }
 
@@ -581,7 +581,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		solo_iso_table.set_sensitive(false);
 		control_slave_ui.set_sensitive(false);
 		if (monitor_section_button == 0) {
-			Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+			Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleMonitorSection");
 			_session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context());
 
 			monitor_section_button = manage (new ArdourButton);
@@ -873,9 +873,7 @@ gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
 	using namespace Menu_Helpers;
-	if (!_session->engine().connected()) {
-		MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible"));
-		msg.run ();
+	if (!ARDOUR_UI_UTILS::engine_is_running ()) {
 		return true;
 	}
 
@@ -910,8 +908,7 @@ MixerStrip::output_press (GdkEventButton *ev)
 		}
 
 		/* then other routes inputs */
-		boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-		RouteList copy = *routes;
+		RouteList copy = _session->get_routelist ();
 		copy.sort (RouteCompareByName ());
 		for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
 			maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type);
@@ -990,9 +987,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 	input_menu.set_name ("ArdourContextMenu");
 	citems.clear();
 
-	if (!_session->engine().connected()) {
-		MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible"));
-		msg.run ();
+	if (!ARDOUR_UI_UTILS::engine_is_running ()) {
 		return true;
 	}
 
@@ -1256,7 +1251,6 @@ MixerStrip::guess_main_type(bool for_input, bool favor_connected) const
 
 /*
  * Output port labelling
- * =====================
  *
  * Case 1: Each output has one connection, all connections are to system:playback_%i
  *   out 1 -> system:playback_1
@@ -1280,8 +1274,9 @@ MixerStrip::guess_main_type(bool for_input, bool favor_connected) const
  * Default case (unusual routing):
  *   Display as: *number of connections*
  *
+ *
  * Tooltips
- * ========
+ *
  * .-----------------------------------------------.
  * | Mixdown                                       |
  * | out 1 -> ardour:master/in 1, jamin:input/in 1 |
@@ -2173,6 +2168,11 @@ MixerStrip::drop_send ()
 	monitor_input_button->set_sensitive (true);
 	monitor_disk_button->set_sensitive (true);
 	_comment_button.set_sensitive (true);
+	trim_control.set_sensitive (true);
+	if (midi_input_enable_button) {
+		midi_input_enable_button->set_sensitive (true);
+	}
+	control_slave_ui.set_sensitive (true);
 	RouteUI::check_rec_enable_sensitivity ();
 	set_button_names (); // update solo button visual state
 }
@@ -2221,6 +2221,11 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 	monitor_input_button->set_sensitive (false);
 	monitor_disk_button->set_sensitive (false);
 	_comment_button.set_sensitive (false);
+	trim_control.set_sensitive (false);
+	if (midi_input_enable_button) {
+		midi_input_enable_button->set_sensitive (false);
+	}
+	control_slave_ui.set_sensitive (false);
 
 	if (boost::dynamic_pointer_cast<InternalSend>(send)) {
 		output_button.set_sensitive (false);
@@ -2388,6 +2393,7 @@ MixerStrip::parameter_changed (string p)
 		_visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
 	} else if (p == "track-name-number") {
 		name_changed ();
+		update_track_number_visibility();
 	} else if (p == "use-monitor-bus") {
 		if (monitor_section_button) {
 			if (mute_button->get_parent()) {
@@ -2406,8 +2412,6 @@ MixerStrip::parameter_changed (string p)
 				mute_button->show();
 			}
 		}
-	} else if (p == "track-name-number") {
-		update_track_number_visibility();
 	}
 }