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 c9e04bf70b7d521c3116eac7b8c63e71368a1694..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 <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));
 }
 
@@ -76,16 +77,19 @@ AutomationController::create(
        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->parameter().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
@@ -95,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;
        }
@@ -129,9 +133,9 @@ AutomationController::automation_state_changed ()
        ENSURE_GUI_THREAD(mem_fun(*this, &AutomationController::automation_state_changed));
 
        bool x = (_controllable->automation_state() != Off);
-       
+
        /* start watching automation so that things move */
-       
+
        _screen_update_connection.disconnect();
 
        if (x) {