do not sort MIDI regions by layer since they are all transparent

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 3cb4cc5a1e8fa86db2bc0b0f548b79208ae1d3a2..5d601cd829d60f52f470db2efd7db4dbd3747d36 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,12 @@
 
 */
 
-#include <pbd/error.h>
-#include "ardour/automation_event.h"
+#include <iomanip>
+#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_ui.h"
 #include "utils.h"
 #include "automation_controller.h"
@@ -33,7 +36,7 @@ using namespace Gtk;
 
 
 AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
-       : BarController(*adj, *ac)
+       : BarController (*adj, ac)
        , _ignore_change(false)
        , _controllable(ac)
        , _adjustment(adj)
@@ -41,18 +44,16 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl>
        set_name (X_("PluginSlider")); // FIXME: get yer own name!
        set_style (BarController::LeftToRight);
        set_use_parent (true);
-       
-       label_callback = sigc::mem_fun(this, &AutomationController::update_label);
-       
+
        StartGesture.connect (mem_fun(*this, &AutomationController::start_touch));
        StopGesture.connect (mem_fun(*this, &AutomationController::end_touch));
-       
+
        _adjustment->signal_value_changed().connect (
                        mem_fun(*this, &AutomationController::value_adjusted));
-               
+
        _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect (
                        mem_fun (*this, &AutomationController::display_effective_value));
-       
+
        ac->Changed.connect (mem_fun(*this, &AutomationController::value_changed));
 }
 
@@ -61,25 +62,34 @@ AutomationController::~AutomationController()
 }
 
 boost::shared_ptr<AutomationController>
-AutomationController::create(Session& s, boost::shared_ptr<AutomationList> al, boost::shared_ptr<AutomationControl> ac)
+AutomationController::create(
+               boost::shared_ptr<Automatable> parent,
+               const Evoral::Parameter& param,
+               boost::shared_ptr<AutomationControl> ac)
 {
-       Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(al->default_value(), al->get_min_y(), al->get_max_y()));
+       Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(param.normal(), param.min(), param.max()));
        if (!ac) {
-               PBD::warning << "Creating AutomationController for " << al->param_id().to_string() << endmsg;
-               ac = boost::shared_ptr<AutomationControl>(new AutomationControl(s, al));
+               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));
 }
 
-void
-AutomationController::update_label(char* label, int label_len)
+std::string
+AutomationController::get_label (int&)
 {
-       if (label && label_len)
-               // Hack to display CC rounded to int
-               if (_controllable->list()->param_id().type() == MidiCCAutomation)
-                       snprintf(label, label_len, "%d", (int)_controllable->get_value());
-               else
-                       snprintf(label, label_len, "%.3f", _controllable->get_value());
+       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 ();
 }
 
 void
@@ -89,9 +99,9 @@ AutomationController::display_effective_value()
        //      return;
 
        float value = _controllable->get_value();
-       
+
        if (_adjustment->get_value() != value) {
-               _ignore_change = true; 
+               _ignore_change = true;
                _adjustment->set_value (value);
                _ignore_change = false;
        }
@@ -108,13 +118,13 @@ AutomationController::value_adjusted()
 void
 AutomationController::start_touch()
 {
-       _controllable->list()->start_touch();
+       _controllable->start_touch();
 }
 
 void
 AutomationController::end_touch()
 {
-       _controllable->list()->stop_touch();
+       _controllable->stop_touch();
 }
 
 void
@@ -122,10 +132,10 @@ AutomationController::automation_state_changed ()
 {
        ENSURE_GUI_THREAD(mem_fun(*this, &AutomationController::automation_state_changed));
 
-       bool x = (_controllable->list()->automation_state() != Off);
-       
+       bool x = (_controllable->automation_state() != Off);
+
        /* start watching automation so that things move */
-       
+
        _screen_update_connection.disconnect();
 
        if (x) {