#include "ardour/tempo.h"
#include "ardour_button.h"
+#include "ardour_knob.h"
#include "automation_controller.h"
#include "gui_thread.h"
#include "note_select_dialog.h"
#include "timers.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace Gtk;
+using PBD::Controllable;
+
AutomationBarController::AutomationBarController (
- boost::shared_ptr<Automatable> printer,
boost::shared_ptr<AutomationControl> ac,
Adjustment* adj)
: Gtkmm2ext::BarController(*adj, ac)
- , _printer(printer)
, _controllable(ac)
{
}
std::string
AutomationBarController::get_label (double& xpos)
{
- xpos = 0.5;
- return _printer->value_as_string (_controllable);
+ xpos = 0.5;
+ return _controllable->get_user_string();
}
AutomationBarController::~AutomationBarController()
{
}
-AutomationController::AutomationController(boost::shared_ptr<Automatable> printer,
- boost::shared_ptr<AutomationControl> ac,
- Adjustment* adj)
+AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac,
+ Adjustment* adj,
+ bool use_knob)
: _widget(NULL)
- , _printer (printer)
, _controllable(ac)
, _adjustment(adj)
, _ignore_change(false)
{
- assert (_printer);
-
if (ac->toggled()) {
ArdourButton* but = manage(new ArdourButton());
} else {
but->set_name("generic button");
}
+ but->set_fallthrough_to_parent(true);
but->set_controllable(ac);
- but->signal_clicked.connect(
- sigc::mem_fun(*this, &AutomationController::toggled));
+ but->signal_button_press_event().connect(
+ sigc::mem_fun(*this, &AutomationController::button_press));
+ but->signal_button_release_event().connect(
+ sigc::mem_fun(*this, &AutomationController::button_release));
+ const bool active = _adjustment->get_value() >= 0.5;
+ if (but->get_active() != active) {
+ but->set_active(active);
+ }
_widget = but;
+ } else if (use_knob) {
+ ArdourKnob* knob = manage (new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Detent));
+ knob->set_controllable (ac);
+ knob->set_name("processor control knob");
+ _widget = knob;
} else {
- AutomationBarController* bar = manage(new AutomationBarController(_printer, ac, adj));
+ AutomationBarController* bar = manage(new AutomationBarController(ac, adj));
bar->set_name(X_("ProcessorControlSlider"));
bar->StartGesture.connect(
_screen_update_connection = Timers::rapid_connect (
sigc::mem_fun (*this, &AutomationController::display_effective_value));
- ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::value_changed, this), gui_context());
+ ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::display_effective_value, this), gui_context());
add(*_widget);
show_all();
}
boost::shared_ptr<AutomationController>
-AutomationController::create(boost::shared_ptr<Automatable> printer,
- const Evoral::Parameter& param,
+AutomationController::create(const Evoral::Parameter& param,
const ParameterDescriptor& desc,
- boost::shared_ptr<AutomationControl> ac)
+ boost::shared_ptr<AutomationControl> ac,
+ bool use_knob)
{
const double lo = ac->internal_to_interface(desc.lower);
const double up = ac->internal_to_interface(desc.upper);
assert (ac);
assert(ac->parameter() == param);
- return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
+ return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment, use_knob));
}
void
_adjustment->set_value (interface_value);
_ignore_change = false;
}
+
}
void
AutomationController::value_adjusted ()
{
if (!_ignore_change) {
- _controllable->set_value (_controllable->interface_to_internal(_adjustment->get_value()));
+ _controllable->set_value (_controllable->interface_to_internal(_adjustment->get_value()), Controllable::NoGroup);
}
/* A bar controller will automatically follow the adjustment, but for a
AutomationController::start_touch()
{
_controllable->start_touch (_controllable->session().transport_frame());
- StartGesture.emit(); /* EMIT SIGNAL */
}
void
}
_controllable->stop_touch (mark, when);
+ } else {
+ _controllable->stop_touch (false, _controllable->session().transport_frame());
}
- StopGesture.emit(); /* EMIT SIGNAL */
}
-void
-AutomationController::toggled ()
+bool
+AutomationController::button_press (GdkEventButton*)
{
ArdourButton* but = dynamic_cast<ArdourButton*>(_widget);
if (but) {
- const bool was_active = _controllable->get_value() >= 0.5;
- if (was_active && but->get_active()) {
- _adjustment->set_value(0.0);
- but->set_active(false);
- } else if (!was_active && !but->get_active()) {
- _adjustment->set_value(1.0);
- but->set_active(true);
- }
+ start_touch ();
+ _controllable->set_value (but->get_active () ? 0.0 : 1.0, Controllable::UseGroup);
}
+ return false;
+}
+
+bool
+AutomationController::button_release (GdkEventButton*)
+{
+ end_touch ();
+ return true;
}
static double
const double value = ((_controllable->desc().unit == ARDOUR::ParameterDescriptor::HZ)
? midi_note_to_hz(dialog->note_number())
: dialog->note_number());
- _controllable->set_value(clamp(value, desc.lower, desc.upper));
+ _controllable->set_value(clamp(value, desc.lower, desc.upper), Controllable::NoGroup);
}
delete dialog;
}
const ARDOUR::ParameterDescriptor& desc = _controllable->desc();
const ARDOUR::Session& session = _controllable->session();
const framepos_t pos = session.transport_frame();
- const ARDOUR::Tempo& tempo = session.tempo_map().tempo_at(pos);
- const double bpm = tempo.beats_per_minute();
+ const ARDOUR::Tempo& tempo = session.tempo_map().tempo_at_frame (pos);
+ const double bpm = tempo.note_types_per_minute();
const double bps = bpm / 60.0;
const double freq = bps / beats;
- _controllable->set_value(clamp(freq, desc.lower, desc.upper));
+ _controllable->set_value(clamp(freq, desc.lower, desc.upper), Controllable::NoGroup);
}
void
{
const ARDOUR::ParameterDescriptor& desc = _controllable->desc();
const double value = _controllable->get_value() * ratio;
- _controllable->set_value(clamp(value, desc.lower, desc.upper));
+ _controllable->set_value(clamp(value, desc.lower, desc.upper), Controllable::NoGroup);
}
bool
return false;
}
-void
-AutomationController::value_changed ()
-{
- 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 ()
projects / ardour.git / blobdiff