use system/gtk default font on OS X, rather than specifying Lucida Grande; make large...

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 3af5f3444511d277810f62c9d74c3d84d4b8b512..9a06b91da595786a8c563512f17cfb1228acf41d 100644 (file)
--- 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,6 +19,7 @@
 */
 
 #include <iomanip>
+#include <cmath>
 
 #include "pbd/error.h"
 
@@ -27,6 +28,7 @@
 #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"
@@ -39,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);
@@ -68,57 +72,43 @@ 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(),
+                                                                  (param.max() - param.min())/100.0,
+                                                                  (param.max() - param.min())/10.0));
+
+        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;
+       double const ui_value = _controllable->user_to_ui (_controllable->get_value());
 
-       float value = _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()));
        }
 }
 
@@ -135,7 +125,7 @@ AutomationController::end_touch ()
 
                bool mark = false;
                double when = 0;
-                
+
                if (_controllable->session().transport_rolling()) {
                        mark = true;
                        when = _controllable->session().transport_frame();