smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

fix up osc support after rebase/merge conflicts

Browse source
This commit is contained in:
Paul Davis 2021-01-31 19:13:48 -07:00
parent c9d3381935
commit 3702da5488
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libs/surfaces/osc/osc.cc
View file

@ -3221,6 +3221,12 @@ OSC::click_level (float position)
return 0; return 0;
} }
void
OSC::loop_location (int start, int end)
{
BasicUI::loop_location (timepos_t (start), timepos_t (end));
}
int int
OSC::route_get_sends(lo_message msg) { OSC::route_get_sends(lo_message msg) {
if (!session) { if (!session) {
@ -4454,11 +4460,11 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc,
if (control) { if (control) {
if (touch) { if (touch) {
//start touch //start touch
control->start_touch (control->session().transport_sample()); control->start_touch (timepos_t (control->session().transport_sample()));
ret = 0; ret = 0;
} else { } else {
// end touch // end touch
control->stop_touch (control->session().transport_sample()); control->stop_touch (timepos_t (control->session().transport_sample()));
ret = 0; ret = 0;
} }
// just in case some crazy surface starts sending control values before touch // just in case some crazy surface starts sending control values before touch
@ -4478,8 +4484,8 @@ OSC::fake_touch (boost::shared_ptr<ARDOUR::AutomationControl> ctrl)
if (ctrl) { if (ctrl) {
//start touch //start touch
if (ctrl->automation_state() == Touch && !ctrl->touching ()) { if (ctrl->automation_state() == Touch && !ctrl->touching ()) {
ctrl->start_touch (ctrl->session().transport_sample()); ctrl->start_touch (timepos_t (ctrl->session().transport_sample()));
_touch_timeout[ctrl] = 10; _touch_timeout[ctrl] = 10;
} }
} }

2
libs/surfaces/osc/osc.h
View file

@ -637,6 +637,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
int _strip_select (boost::shared_ptr<ARDOUR::Stripable> s, lo_address addr); int _strip_select (boost::shared_ptr<ARDOUR::Stripable> s, lo_address addr);
int _strip_select2 (boost::shared_ptr<ARDOUR::Stripable> s, OSCSurface *sur, lo_address addr); int _strip_select2 (boost::shared_ptr<ARDOUR::Stripable> s, OSCSurface *sur, lo_address addr);
void loop_location (int start, int end);
int route_set_send_gain_dB (int rid, int sid, float val, lo_message msg); int route_set_send_gain_dB (int rid, int sid, float val, lo_message msg);
int route_set_send_fader (int rid, int sid, float val, lo_message msg); int route_set_send_fader (int rid, int sid, float val, lo_message msg);
int route_set_send_enable (int rid, int sid, float val, lo_message msg); int route_set_send_enable (int rid, int sid, float val, lo_message msg);