X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.cc;h=03054fa98b60ae073eb7b4e3a646c598d6aabbc3;hb=fdf63ace6a655f772a46e73719de14f9dd6fb940;hp=a7922d2f00302413e6691b4c93d4743aadfd941d;hpb=4d4c20b8ccbe9638e9288abdadf66a6f7840b391;p=ardour.git diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index a7922d2f00..03054fa98b 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,19 @@ AutomationController::AutomationController(boost::shared_ptr } else { but->set_name("generic button"); } + but->set_controllable(ac); but->signal_clicked.connect( sigc::mem_fun(*this, &AutomationController::toggled)); - + 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,7 +117,7 @@ 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()); @@ -121,31 +134,21 @@ 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); const double normal = ac->internal_to_interface(desc.normal); - double smallstep = desc.smallstep; - double largestep = desc.largestep; - if (smallstep == 0.0) { - smallstep = up / 1000.; - } else { - smallstep = ac->internal_to_interface(desc.lower + smallstep); - } - - if (largestep == 0.0) { - largestep = up / 40.; - } else { - largestep = ac->internal_to_interface(desc.lower + largestep); - } + const double smallstep = ac->internal_to_interface(desc.lower + desc.smallstep); + const double largestep = ac->internal_to_interface(desc.lower + desc.largestep); 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(printer, ac, adjustment, use_knob)); } void @@ -164,7 +167,7 @@ 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 @@ -182,7 +185,6 @@ void AutomationController::start_touch() { _controllable->start_touch (_controllable->session().transport_frame()); - StartGesture.emit(); /* EMIT SIGNAL */ } void @@ -199,25 +201,37 @@ AutomationController::end_touch () } _controllable->stop_touch (mark, when); + } else { + _controllable->stop_touch (false, _controllable->session().transport_frame()); } - StopGesture.emit(); /* EMIT SIGNAL */ } void AutomationController::toggled () { 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) { - start_touch(); - const bool was_active = _controllable->get_value() >= 0.5; - if (was_active) { - _adjustment->set_value(0.0); - but->set_active(false); - } else { - _adjustment->set_value(1.0); - but->set_active(true); + 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); + } + /* set to opposite value.*/ + _controllable->set_double (but->get_active () ? 0.0 : 1.0, 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); } - end_touch(); } } @@ -248,7 +262,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; } @@ -259,11 +273,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 ARDOUR::Tempo& tempo = session.tempo_map().tempo_at_frame (pos); const double bpm = tempo.beats_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 +285,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,10 +321,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);