*/
#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"
using namespace ARDOUR;
using namespace Gtk;
-
-AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
+AutomationController::AutomationController(boost::shared_ptr<Automatable> owner, boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
: BarController (*adj, ac)
, _ignore_change(false)
+ , _owner (owner)
, _controllable(ac)
, _adjustment(adj)
{
} else {
assert(ac->parameter() == param);
}
- return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment));
+ return boost::shared_ptr<AutomationController>(new AutomationController(parent, 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 _owner->value_as_string (_controllable);
}
void
AutomationController::display_effective_value()
{
- //if ( ! _controllable->list()->automation_playback())
- // return;
-
float value = _controllable->get_value();
if (_adjustment->get_value() != 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