/*
- 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
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
#include "ardour/automatable.h"
+#include "ardour/panner.h"
#include "ardour_ui.h"
#include "utils.h"
#include "automation_controller.h"
set_name (X_("PluginSlider")); // FIXME: get yer own name!
set_style (BarController::LeftToRight);
set_use_parent (true);
-
- StartGesture.connect (mem_fun(*this, &AutomationController::start_touch));
- StopGesture.connect (mem_fun(*this, &AutomationController::end_touch));
-
+
+ StartGesture.connect (sigc::mem_fun(*this, &AutomationController::start_touch));
+ StopGesture.connect (sigc::mem_fun(*this, &AutomationController::end_touch));
+
_adjustment->signal_value_changed().connect (
- mem_fun(*this, &AutomationController::value_adjusted));
-
+ sigc::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));
+ sigc::mem_fun (*this, &AutomationController::display_effective_value));
+
+ ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::value_changed, this), gui_context());
}
AutomationController::~AutomationController()
// 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 ();
}
// return;
float value = _controllable->get_value();
-
+
if (_adjustment->get_value() != value) {
- _ignore_change = true;
+ _ignore_change = true;
_adjustment->set_value (value);
_ignore_change = false;
}
void
AutomationController::automation_state_changed ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &AutomationController::automation_state_changed));
+ ENSURE_GUI_THREAD (*this, &AutomationController::automation_state_changed)
bool x = (_controllable->automation_state() != Off);
-
+
/* start watching automation so that things move */
-
+
_screen_update_connection.disconnect();
if (x) {
_screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect (
- mem_fun (*this, &AutomationController::display_effective_value));
+ sigc::mem_fun (*this, &AutomationController::display_effective_value));
}
}
void
AutomationController::value_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (
- mem_fun(*this, &AutomationController::display_effective_value));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationController::display_effective_value, this));
}
+/** Stop updating our value from our controllable */
+void
+AutomationController::stop_updating ()
+{
+ _screen_update_connection.disconnect ();
+}