X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=21e6b429cbf3e39ca6a1313261bbf572cc64e11e;hb=88a22d40b5befe71d8c51939b3bb3aeea754642a;hp=6acf37f953c63485490a46a82c6819bb5f7039d0;hpb=24727e65befc310f24196d11a56ec7b269977c16;p=ardour.git diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 6acf37f953..21e6b429cb 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -30,16 +30,19 @@ #include "ardour/tempo.h" #include "ardour_button.h" -#include "ardour_ui.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 printer, boost::shared_ptr ac, @@ -63,7 +66,8 @@ AutomationBarController::~AutomationBarController() AutomationController::AutomationController(boost::shared_ptr printer, boost::shared_ptr ac, - Adjustment* adj) + Adjustment* adj, + bool use_knob) : _widget(NULL) , _printer (printer) , _controllable(ac) @@ -83,10 +87,22 @@ AutomationController::AutomationController(boost::shared_ptr } else { but->set_name("generic button"); } - but->signal_clicked.connect( - sigc::mem_fun(*this, &AutomationController::toggled)); - + but->set_fallthrough_to_parent(true); + but->set_controllable(ac); + 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)); @@ -104,10 +120,10 @@ AutomationController::AutomationController(boost::shared_ptr _adjustment->signal_value_changed().connect( sigc::mem_fun(*this, &AutomationController::value_adjusted)); - _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.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(); @@ -121,7 +137,8 @@ boost::shared_ptr AutomationController::create(boost::shared_ptr printer, 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,7 +151,7 @@ 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(printer, ac, adjustment, use_knob)); } void @@ -147,13 +164,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,7 +189,6 @@ void AutomationController::start_touch() { _controllable->start_touch (_controllable->session().transport_frame()); - StartGesture.emit(); /* EMIT SIGNAL */ } void @@ -188,32 +205,27 @@ AutomationController::end_touch () } _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(_widget); if (but) { - if (_controllable->session().transport_rolling()) { - if (_controllable->automation_state() == Touch) { - _controllable->set_automation_state(Write); - } - if (_controllable->list()) { - _controllable->list()->set_in_write_pass(true, false, _controllable->session().audible_frame()); - } - } - 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 @@ -243,7 +255,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; } @@ -254,11 +266,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 @@ -266,7 +278,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 @@ -302,10 +314,10 @@ AutomationController::on_button_release(GdkEventButton* ev) sigc::mem_fun(*this, &AutomationController::run_note_select_dialog))); } if (is_low) { - for (double beats = 1.0; beats <= 16; ++beats) { - items.push_back(MenuElem(string_compose(_("Set to %1 beat(s)"), (int)beats), + for (int beats = 1; beats <= 16; ++beats) { + items.push_back(MenuElem (string_compose(P_("Set to %1 beat", "Set to %1 beats", beats), beats), sigc::bind(sigc::mem_fun(*this, &AutomationController::set_freq_beats), - beats))); + (double)beats))); } } menu->popup(1, ev->time); @@ -315,12 +327,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 ()