update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 0d16628ab056afdba1fee3b75c777b16fcaa9f99..212c8e9ade9ad42db5a861c81d5fc0f0430554d0 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -19,11 +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"
@@ -34,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);
@@ -54,7 +63,7 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl>
        _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect (
                        sigc::mem_fun (*this, &AutomationController::display_effective_value));
 
-       ac->Changed.connect (_changed_connection, boost::bind (&AutomationController::value_changed, this), gui_context());
+       ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::value_changed, this), gui_context());
 }
 
 AutomationController::~AutomationController()
@@ -63,68 +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 {
-               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
@@ -147,7 +152,7 @@ AutomationController::automation_state_changed ()
 void
 AutomationController::value_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AutomationController::display_effective_value, this));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationController::display_effective_value, this));
 }
 
 /** Stop updating our value from our controllable */