X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=5c00d5a779296f52362775104e60b7c17986fa27;hb=b12beab67c70045269d6ec5dc735c2f4af67c4f9;hp=f63f2ed70c4fb48bc92c3ab38ce5c9d5f12b90ea;hpb=606a65321d72fe354db49f0c74a5c6968eb87a53;p=ardour.git

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index f63f2ed70c..5c00d5a779 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -19,12 +19,18 @@
 */
 
 #include <iomanip>
+#include <cmath>
+
 #include "pbd/error.h"
+
 #include "ardour/automation_list.h"
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
 #include "ardour/automatable.h"
 #include "ardour/panner.h"
+#include "ardour/pan_controllable.h"
+#include "ardour/session.h"
+
 #include "ardour_ui.h"
 #include "utils.h"
 #include "automation_controller.h"
@@ -35,10 +41,10 @@
 using namespace ARDOUR;
 using namespace Gtk;
 
-
-AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
+AutomationController::AutomationController(boost::shared_ptr<Automatable> owner, boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
 	: BarController (*adj, ac)
 	, _ignore_change(false)
+        , _owner (owner)
 	, _controllable(ac)
 	, _adjustment(adj)
 {
@@ -75,32 +81,19 @@ AutomationController::create(
 	} else {
 		assert(ac->parameter() == param);
 	}
-	return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment));
+	return boost::shared_ptr<AutomationController>(new AutomationController(parent, ac, adjustment));
 }
 
 std::string
-AutomationController::get_label (int&)
+AutomationController::get_label (double& xpos)
 {
-	std::stringstream s;
-
-	// Hack to display CC rounded to int
-	if (_controllable->parameter().type() == MidiCCAutomation) {
-		s << (int)_controllable->get_value();
-	} else if (_controllable->parameter().type() == PanAutomation) {
-		s << Panner::value_as_string (_controllable->get_value ());
-	} else {
-		s << std::fixed << std::setprecision(3) << _controllable->get_value();
-	}
-
-	return s.str ();
+        xpos = 0.5;
+        return _owner->value_as_string (_controllable);
 }
 
 void
 AutomationController::display_effective_value()
 {
-	//if ( ! _controllable->list()->automation_playback())
-	//	return;
-
 	float value = _controllable->get_value();
 
 	if (_adjustment->get_value() != value) {
@@ -121,13 +114,24 @@ AutomationController::value_adjusted()
 void
 AutomationController::start_touch()
 {
-	_controllable->start_touch();
+	_controllable->start_touch (_controllable->session().transport_frame());
 }
 
 void
-AutomationController::end_touch()
+AutomationController::end_touch ()
 {
-	_controllable->stop_touch();
+	if (_controllable->automation_state() == Touch) {
+
+		bool mark = false;
+		double when = 0;
+                
+		if (_controllable->session().transport_rolling()) {
+			mark = true;
+			when = _controllable->session().transport_frame();
+		}
+
+		_controllable->stop_touch (mark, when);
+	}
 }
 
 void