enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 14f778ffa84d3f9e1058489ae6fffe0b3ff05ed5..03054fa98b60ae073eb7b4e3a646c598d6aabbc3 100644 (file)
--- 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_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,
@@ -63,7 +66,8 @@ AutomationBarController::~AutomationBarController()
 
 AutomationController::AutomationController(boost::shared_ptr<Automatable>       printer,
                                            boost::shared_ptr<AutomationControl> ac,
-                                           Adjustment*                          adj)
+                                           Adjustment*                          adj,
+                                           bool                                 use_knob)
        : _widget(NULL)
        , _printer (printer)
        , _controllable(ac)
@@ -86,7 +90,16 @@ AutomationController::AutomationController(boost::shared_ptr<Automatable>
                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));
 
@@ -121,7 +134,8 @@ boost::shared_ptr<AutomationController>
 AutomationController::create(boost::shared_ptr<Automatable>       printer,
                              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);
@@ -134,7 +148,7 @@ AutomationController::create(boost::shared_ptr<Automatable>       printer,
 
        assert (ac);
        assert(ac->parameter() == param);
-       return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
+       return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment, use_knob));
 }
 
 void
@@ -153,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
@@ -171,7 +185,6 @@ void
 AutomationController::start_touch()
 {
        _controllable->start_touch (_controllable->session().transport_frame());
-       StartGesture.emit();  /* EMIT SIGNAL */
 }
 
 void
@@ -188,8 +201,9 @@ AutomationController::end_touch ()
                }
 
                _controllable->stop_touch (mark, when);
+       } else {
+               _controllable->stop_touch (false, _controllable->session().transport_frame());
        }
-       StopGesture.emit();  /* EMIT SIGNAL */
 }
 
 void
@@ -207,8 +221,8 @@ AutomationController::toggled ()
                        }
                        _controllable->list ()->set_in_write_pass (true, false, where);
                }
-
-               _controllable->set_double (!but->get_active (), where, to_list);
+               /* 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 ()) {
@@ -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