X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=03054fa98b60ae073eb7b4e3a646c598d6aabbc3;hb=bd80b2f144c012669b56c83821e137be655acfe4;hp=a20ae54211146714fd10baa7cac74b99bb21ba5d;hpb=38bae2996a1a89622fb23817082d78ad213327fb;p=ardour.git

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index a20ae54211..03054fa98b 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -30,16 +30,19 @@
 #include "ardour/tempo.h"
 
 #include "ardour_button.h"
+#include "ardour_knob.h"
 #include "automation_controller.h"
 #include "gui_thread.h"
 #include "note_select_dialog.h"
 #include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;
 
+using PBD::Controllable;
+
 AutomationBarController::AutomationBarController (
 		boost::shared_ptr<Automatable>       printer,
 		boost::shared_ptr<AutomationControl> ac,
@@ -63,7 +66,8 @@ AutomationBarController::~AutomationBarController()
 
 AutomationController::AutomationController(boost::shared_ptr<Automatable>       printer,
                                            boost::shared_ptr<AutomationControl> ac,
-                                           Adjustment*                          adj)
+                                           Adjustment*                          adj,
+                                           bool                                 use_knob)
 	: _widget(NULL)
 	, _printer (printer)
 	, _controllable(ac)
@@ -86,8 +90,16 @@ AutomationController::AutomationController(boost::shared_ptr<Automatable>
 		but->set_controllable(ac);
 		but->signal_clicked.connect(
 			sigc::mem_fun(*this, &AutomationController::toggled));
-
+		const bool active = _adjustment->get_value() >= 0.5;
+		if (but->get_active() != active) {
+			but->set_active(active);
+		}
 		_widget = but;
+	} else if (use_knob) {
+		ArdourKnob* knob = manage (new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Detent));
+		knob->set_controllable (ac);
+		knob->set_name("processor control knob");
+		_widget = knob;
 	} else {
 		AutomationBarController* bar = manage(new AutomationBarController(_printer, ac, adj));
 
@@ -122,7 +134,8 @@ boost::shared_ptr<AutomationController>
 AutomationController::create(boost::shared_ptr<Automatable>       printer,
                              const Evoral::Parameter&             param,
                              const ParameterDescriptor&           desc,
-                             boost::shared_ptr<AutomationControl> ac)
+                             boost::shared_ptr<AutomationControl> ac,
+                             bool use_knob)
 {
 	const double lo        = ac->internal_to_interface(desc.lower);
 	const double up        = ac->internal_to_interface(desc.upper);
@@ -135,7 +148,7 @@ AutomationController::create(boost::shared_ptr<Automatable>       printer,
 
 	assert (ac);
 	assert(ac->parameter() == param);
-	return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
+	return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment, use_knob));
 }
 
 void
@@ -154,7 +167,7 @@ void
 AutomationController::value_adjusted ()
 {
 	if (!_ignore_change) {
-		_controllable->set_value (_controllable->interface_to_internal(_adjustment->get_value()));
+		_controllable->set_value (_controllable->interface_to_internal(_adjustment->get_value()), Controllable::NoGroup);
 	}
 
 	/* A bar controller will automatically follow the adjustment, but for a
@@ -172,7 +185,6 @@ void
 AutomationController::start_touch()
 {
 	_controllable->start_touch (_controllable->session().transport_frame());
-	StartGesture.emit();  /* EMIT SIGNAL */
 }
 
 void
@@ -189,30 +201,36 @@ AutomationController::end_touch ()
 		}
 
 		_controllable->stop_touch (mark, when);
+	} else {
+		_controllable->stop_touch (false, _controllable->session().transport_frame());
 	}
-	StopGesture.emit();  /* EMIT SIGNAL */
 }
 
 void
 AutomationController::toggled ()
 {
 	ArdourButton* but = dynamic_cast<ArdourButton*>(_widget);
+	const AutoState as = _controllable->automation_state ();
+	const double where = _controllable->session ().audible_frame ();
+	const bool to_list = _controllable->list () && _controllable->session().transport_rolling () && (as == Touch || as == Write);
+
 	if (but) {
-		if (_controllable->session().transport_rolling()) {
-			if (_controllable->automation_state() == Touch) {
-				_controllable->set_automation_state(Write);
-			}
-			if (_controllable->list()) {
-				_controllable->list()->set_in_write_pass(true, true, _controllable->session().audible_frame());
+		if (to_list) {
+			if (as == Touch && _controllable->list ()->in_new_write_pass ()) {
+				_controllable->alist ()->start_write_pass (where);
 			}
+			_controllable->list ()->set_in_write_pass (true, false, where);
 		}
-		const bool was_active = _controllable->get_value() >= 0.5;
-		if (was_active && but->get_active()) {
-			_adjustment->set_value(0.0);
-			but->set_active(false);
-		} else if (!was_active && !but->get_active()) {
-			_adjustment->set_value(1.0);
-			but->set_active(true);
+		/* set to opposite value.*/
+		_controllable->set_double (but->get_active () ? 0.0 : 1.0, where, to_list);
+
+		const bool active = _controllable->get_double (to_list, where) >= 0.5;
+		if (active && !but->get_active ()) {
+			_adjustment->set_value (1.0);
+			but->set_active (true);
+		} else if (!active && but->get_active ()) {
+			_adjustment->set_value (0.0);
+			but->set_active (false);
 		}
 	}
 }
@@ -244,7 +262,7 @@ AutomationController::run_note_select_dialog()
 		const double value = ((_controllable->desc().unit == ARDOUR::ParameterDescriptor::HZ)
 		                      ? midi_note_to_hz(dialog->note_number())
 		                      : dialog->note_number());
-		_controllable->set_value(clamp(value, desc.lower, desc.upper));
+		_controllable->set_value(clamp(value, desc.lower, desc.upper), Controllable::NoGroup);
 	}
 	delete dialog;
 }
@@ -255,11 +273,11 @@ AutomationController::set_freq_beats(double beats)
 	const ARDOUR::ParameterDescriptor& desc    = _controllable->desc();
 	const ARDOUR::Session&             session = _controllable->session();
 	const framepos_t                   pos     = session.transport_frame();
-	const ARDOUR::Tempo&               tempo   = session.tempo_map().tempo_at(pos);
+	const ARDOUR::Tempo&               tempo   = session.tempo_map().tempo_at_frame (pos);
 	const double                       bpm     = tempo.beats_per_minute();
 	const double                       bps     = bpm / 60.0;
 	const double                       freq    = bps / beats;
-	_controllable->set_value(clamp(freq, desc.lower, desc.upper));
+	_controllable->set_value(clamp(freq, desc.lower, desc.upper), Controllable::NoGroup);
 }
 
 void
@@ -267,7 +285,7 @@ AutomationController::set_ratio(double ratio)
 {
 	const ARDOUR::ParameterDescriptor& desc  = _controllable->desc();
 	const double                       value = _controllable->get_value() * ratio;
-	_controllable->set_value(clamp(value, desc.lower, desc.upper));
+	_controllable->set_value(clamp(value, desc.lower, desc.upper), Controllable::NoGroup);
 }
 
 bool