#include "ardour/session.h"
#include "ardour/tempo.h"
-#include "ardour_button.h"
-#include "ardour_knob.h"
+#include "widgets/ardour_button.h"
+#include "widgets/ardour_knob.h"
#include "automation_controller.h"
#include "gui_thread.h"
#include "note_select_dialog.h"
using namespace ARDOUR;
using namespace Gtk;
+using namespace ArdourWidgets;
using PBD::Controllable;
AutomationBarController::AutomationBarController (
boost::shared_ptr<AutomationControl> ac,
Adjustment* adj)
- : Gtkmm2ext::BarController(*adj, ac)
- , _controllable(ac)
+ : ArdourWidgets::BarController (*adj, ac)
+ , _controllable (ac)
{
}
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(ac, adj));
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);
- } else {
- _controllable->stop_touch (false, _controllable->session().transport_frame());
- }
+ _controllable->stop_touch (_controllable->session().transport_frame());
}
bool
AutomationBarController* bar = dynamic_cast<AutomationBarController*>(_widget);
if (bar) {
bar->set_tweaks (
- Gtkmm2ext::PixFader::Tweaks(bar->tweaks() |
- Gtkmm2ext::PixFader::NoVerticalScroll));
+ ArdourWidgets::ArdourFader::Tweaks(bar->tweaks() | ArdourWidgets::ArdourFader::NoVerticalScroll));
}
}