X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=c7860c53cb5f5e89179ea8cc96980cc4dbae5731;hb=63a4cc9cf6e02153a6c647867abfec6b013e0708;hp=14f778ffa84d3f9e1058489ae6fffe0b3ff05ed5;hpb=ffed94d89bbc279561e8d670b4aec1a068d7e9a9;p=ardour.git diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 14f778ffa8..c7860c53cb 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -29,49 +29,49 @@ #include "ardour/session.h" #include "ardour/tempo.h" -#include "ardour_button.h" +#include "widgets/ardour_button.h" +#include "widgets/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 namespace ArdourWidgets; + +using PBD::Controllable; AutomationBarController::AutomationBarController ( - boost::shared_ptr printer, boost::shared_ptr ac, Adjustment* adj) - : Gtkmm2ext::BarController(*adj, ac) - , _printer(printer) - , _controllable(ac) + : ArdourWidgets::BarController (*adj, ac) + , _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 printer, - boost::shared_ptr ac, - Adjustment* adj) +AutomationController::AutomationController(boost::shared_ptr ac, + Adjustment* adj, + bool use_knob) : _widget(NULL) - , _printer (printer) , _controllable(ac) , _adjustment(adj) , _ignore_change(false) + , _grabbed(false) { - assert (_printer); - if (ac->toggled()) { ArdourButton* but = manage(new ArdourButton()); @@ -83,12 +83,26 @@ AutomationController::AutomationController(boost::shared_ptr } 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; + knob->StartGesture.connect(sigc::mem_fun(*this, &AutomationController::start_touch)); + knob->StopGesture.connect(sigc::mem_fun(*this, &AutomationController::end_touch)); } else { - AutomationBarController* bar = manage(new AutomationBarController(_printer, ac, adj)); + AutomationBarController* bar = manage(new AutomationBarController(ac, adj)); bar->set_name(X_("ProcessorControlSlider")); bar->StartGesture.connect( @@ -104,10 +118,13 @@ AutomationController::AutomationController(boost::shared_ptr _adjustment->signal_value_changed().connect( sigc::mem_fun(*this, &AutomationController::value_adjusted)); - _screen_update_connection = Timers::rapid_connect ( - sigc::mem_fun (*this, &AutomationController::display_effective_value)); + ac->Changed.connect (_changed_connections, invalidator (*this), boost::bind (&AutomationController::display_effective_value, this), gui_context()); + display_effective_value (); - ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::value_changed, this), gui_context()); + if (ac->alist ()) { + ac->alist()->automation_state_changed.connect (_changed_connections, invalidator (*this), boost::bind (&AutomationController::automation_state_changed, this), gui_context()); + automation_state_changed (); + } add(*_widget); show_all(); @@ -118,42 +135,60 @@ AutomationController::~AutomationController() } boost::shared_ptr -AutomationController::create(boost::shared_ptr printer, - const Evoral::Parameter& param, +AutomationController::create(const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr ac) + boost::shared_ptr ac, + bool use_knob) { const double lo = ac->internal_to_interface(desc.lower); const double up = ac->internal_to_interface(desc.upper); const double normal = ac->internal_to_interface(desc.normal); - const double smallstep = ac->internal_to_interface(desc.lower + desc.smallstep); - const double largestep = ac->internal_to_interface(desc.lower + desc.largestep); + const double smallstep = ac->internal_to_interface(desc.lower + desc.smallstep) - lo; + const double largestep = ac->internal_to_interface(desc.lower + desc.largestep) - lo; Gtk::Adjustment* adjustment = manage ( new Gtk::Adjustment (normal, lo, up, smallstep, largestep)); assert (ac); assert(ac->parameter() == param); - return boost::shared_ptr(new AutomationController(printer, ac, adjustment)); + return boost::shared_ptr(new AutomationController(ac, adjustment, use_knob)); +} + +void +AutomationController::automation_state_changed () +{ + bool x = _controllable->alist()->automation_state() & Play; + _widget->set_sensitive (!x); } void -AutomationController::display_effective_value() +AutomationController::display_effective_value () { double const interface_value = _controllable->internal_to_interface(_controllable->get_value()); + if (_grabbed) { + /* we cannot use _controllable->touching() here + * because that's only set in Write or Touch mode. + * Besides ctrl-surfaces may also set touching() + */ + return; + } if (_adjustment->get_value () != interface_value) { _ignore_change = true; _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())); + const double new_val = _controllable->interface_to_internal(_adjustment->get_value()); + if (_controllable->user_double() != new_val) { + _controllable->set_value (new_val, Controllable::NoGroup); + } } /* A bar controller will automatically follow the adjustment, but for a @@ -170,55 +205,36 @@ AutomationController::value_adjusted () void AutomationController::start_touch() { - _controllable->start_touch (_controllable->session().transport_frame()); - StartGesture.emit(); /* EMIT SIGNAL */ + _grabbed = true; + _controllable->start_touch (_controllable->session().transport_sample()); } void AutomationController::end_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); + _controllable->stop_touch (_controllable->session().transport_sample()); + if (_grabbed) { + _grabbed = false; + display_effective_value (); } - StopGesture.emit(); /* EMIT SIGNAL */ } -void -AutomationController::toggled () +bool +AutomationController::button_press (GdkEventButton*) { ArdourButton* but = dynamic_cast(_widget); - const AutoState as = _controllable->automation_state (); - const double where = _controllable->session ().audible_frame (); - const bool to_list = _controllable->list () && _controllable->session().transport_rolling () && (as == Touch || as == Write); - if (but) { - if (to_list) { - if (as == Touch && _controllable->list ()->in_new_write_pass ()) { - _controllable->alist ()->start_write_pass (where); - } - _controllable->list ()->set_in_write_pass (true, false, where); - } - - _controllable->set_double (!but->get_active (), where, to_list); - - const bool active = _controllable->get_double (to_list, where) >= 0.5; - if (active && !but->get_active ()) { - _adjustment->set_value (1.0); - but->set_active (true); - } else if (!active && but->get_active ()) { - _adjustment->set_value (0.0); - but->set_active (false); - } + 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 @@ -248,7 +264,7 @@ AutomationController::run_note_select_dialog() 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; } @@ -258,12 +274,12 @@ AutomationController::set_freq_beats(double beats) { 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 samplepos_t pos = session.transport_sample(); + const ARDOUR::Tempo& tempo = session.tempo_map().tempo_at_sample (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 @@ -271,7 +287,7 @@ AutomationController::set_ratio(double ratio) { 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 @@ -320,12 +336,6 @@ AutomationController::on_button_release(GdkEventButton* ev) 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 () @@ -339,7 +349,6 @@ AutomationController::disable_vertical_scroll () AutomationBarController* bar = dynamic_cast(_widget); if (bar) { bar->set_tweaks ( - Gtkmm2ext::PixFader::Tweaks(bar->tweaks() | - Gtkmm2ext::PixFader::NoVerticalScroll)); + ArdourWidgets::ArdourFader::Tweaks(bar->tweaks() | ArdourWidgets::ArdourFader::NoVerticalScroll)); } }