X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=d53c61432ebcc0f06e04855d563aeb71e18fa6d2;hb=bd40b9132cbac2d2b79ba0ef480bd41d837f8f71;hp=1bce94dca2b464c9f024fd3f41bd67680891d607;hpb=877b258c74aa6e2fa737ca9112900dca8bce6628;p=ardour.git diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 1bce94dca2..d53c61432e 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -29,49 +29,48 @@ #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) { - assert (_printer); - if (ac->toggled()) { ArdourButton* but = manage(new ArdourButton()); @@ -83,12 +82,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 +117,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,10 +134,10 @@ 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); @@ -134,11 +150,18 @@ AutomationController::create(boost::shared_ptr printer, 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::display_effective_value() +AutomationController::automation_state_changed () +{ + bool x = _controllable->alist()->automation_state() & Play; + _widget->set_sensitive (!x); +} + +void +AutomationController::display_effective_value () { double const interface_value = _controllable->internal_to_interface(_controllable->get_value()); @@ -147,13 +170,14 @@ AutomationController::display_effective_value() _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 @@ -171,41 +195,30 @@ void AutomationController::start_touch() { _controllable->start_touch (_controllable->session().transport_frame()); - StartGesture.emit(); /* EMIT SIGNAL */ } 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); - } - StopGesture.emit(); /* EMIT SIGNAL */ + _controllable->stop_touch (_controllable->session().transport_frame()); } -void -AutomationController::toggled () +bool +AutomationController::button_press (GdkEventButton*) { ArdourButton* but = dynamic_cast(_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 @@ -235,7 +248,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; } @@ -246,11 +259,11 @@ 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 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 @@ -258,7 +271,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 @@ -307,12 +320,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 () @@ -326,7 +333,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)); } }