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

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index f63f2ed70c..79aec89f9c 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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,13 +41,15 @@
 using namespace ARDOUR;
 using namespace Gtk;
 
-
-AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
+AutomationController::AutomationController(boost::shared_ptr<Automatable> printer, boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
 	: BarController (*adj, ac)
 	, _ignore_change(false)
+        , _printer (printer)
 	, _controllable(ac)
 	, _adjustment(adj)
 {
+        assert (_printer);
+
 	set_name (X_("PluginSlider")); // FIXME: get yer own name!
 	set_style (BarController::LeftToRight);
 	set_use_parent (true);
@@ -64,70 +72,64 @@ AutomationController::~AutomationController()
 
 boost::shared_ptr<AutomationController>
 AutomationController::create(
-		boost::shared_ptr<Automatable> parent,
+		boost::shared_ptr<Automatable> printer,
 		const Evoral::Parameter& param,
 		boost::shared_ptr<AutomationControl> ac)
 {
-	Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(param.normal(), param.min(), param.max()));
-	if (!ac) {
-		PBD::warning << "Creating AutomationController for " << EventTypeMap::instance().to_symbol(param) << endmsg;
-		ac = boost::dynamic_pointer_cast<AutomationControl>(parent->control_factory(param));
-	} else {
-		assert(ac->parameter() == param);
-	}
-	return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment));
+	Gtk::Adjustment* adjustment = manage (new Gtk::Adjustment (param.normal(), param.min(), param.max()));
+        assert (ac);
+        assert(ac->parameter() == param);
+	return boost::shared_ptr<AutomationController>(new AutomationController(printer, 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 _printer->value_as_string (_controllable);
 }
 
 void
 AutomationController::display_effective_value()
 {
-	//if ( ! _controllable->list()->automation_playback())
-	//	return;
-
-	float value = _controllable->get_value();
+	double const ui_value = _controllable->user_to_ui (_controllable->get_value());
 
-	if (_adjustment->get_value() != value) {
+	if (_adjustment->get_value() != ui_value) {
 		_ignore_change = true;
-		_adjustment->set_value (value);
+		_adjustment->set_value (ui_value);
 		_ignore_change = false;
 	}
 }
 
 void
-AutomationController::value_adjusted()
+AutomationController::value_adjusted ()
 {
 	if (!_ignore_change) {
-		_controllable->set_value(_adjustment->get_value());
+		_controllable->set_value (_controllable->ui_to_user (_adjustment->get_value()));
 	}
 }
 
 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