From c5b93e2a019193f4aec47191b24e37e6ffef99b3 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Sat, 16 Jan 2016 20:33:04 -0600 Subject: track scrolling and zooming --- libs/surfaces/control_protocol/basic_ui.cc | 12 ++++++++---- libs/surfaces/control_protocol/control_protocol/basic_ui.h | 6 +++++- libs/surfaces/osc/osc.cc | 10 ++++++++++ libs/surfaces/osc/osc.h | 4 ++++ 4 files changed, 27 insertions(+), 5 deletions(-) (limited to 'libs') diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index a1e499b93e..13b41ba373 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -379,10 +379,14 @@ void BasicUI::zoom_10_sec() { access_action("Editor/zoom_10_sec"); } void BasicUI::zoom_1_min() { access_action("Editor/zoom_1_min"); } void BasicUI::zoom_5_min() { access_action("Editor/zoom_5_min"); } void BasicUI::zoom_10_min() { access_action("Editor/zoom_10_min"); } -void BasicUI::zoom_to_session() { access_action("Editor/zooom-to-session"); } - -void BasicUI::scroll_up_1_track() { access_action("Editor/scroll_up_1_track"); } -void BasicUI::scroll_dn_1_track() { access_action("Editor/scroll_dn_1_track"); } +void BasicUI::zoom_to_session() { access_action("Editor/zoom-to-session"); } +void BasicUI::temporal_zoom_in() { access_action("Editor/temporal-zoom-in"); } +void BasicUI::temporal_zoom_out() { access_action("Editor/temporal-zoom-out"); } + +void BasicUI::scroll_up_1_track() { access_action("Editor/step-tracks-up"); } +void BasicUI::scroll_dn_1_track() { access_action("Editor/step-tracks-down"); } +void BasicUI::scroll_up_1_page() { access_action("Editor/scroll-tracks-up"); } +void BasicUI::scroll_dn_1_page() { access_action("Editor/scroll-tracks-down"); } bool diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 4ddf5c1716..5f15cc3e70 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -122,9 +122,13 @@ class LIBCONTROLCP_API BasicUI { void zoom_5_min(); void zoom_10_min(); void zoom_to_session(); - + void temporal_zoom_in(); + void temporal_zoom_out(); + void scroll_up_1_track(); void scroll_dn_1_track(); + void scroll_up_1_page(); + void scroll_dn_1_page(); void rec_enable_toggle (); void toggle_all_rec_enables (); diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 9dd0bc5144..b6fd8727a0 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -389,6 +389,12 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/ardour/zoom_5_min", "", zoom_5_min); REGISTER_CALLBACK (serv, "/ardour/zoom_10_min", "", zoom_10_min); REGISTER_CALLBACK (serv, "/ardour/zoom_to_session", "", zoom_to_session); + REGISTER_CALLBACK (serv, "/ardour/temporal_zoom_in", "f", temporal_zoom_in); + REGISTER_CALLBACK (serv, "/ardour/temporal_zoom_out", "f", temporal_zoom_out); + REGISTER_CALLBACK (serv, "/ardour/scroll_up_1_track", "f", scroll_up_1_track); + REGISTER_CALLBACK (serv, "/ardour/scroll_dn_1_track", "f", scroll_dn_1_track); + REGISTER_CALLBACK (serv, "/ardour/scroll_up_1_page", "f", scroll_up_1_page); + REGISTER_CALLBACK (serv, "/ardour/scroll_dn_1_page", "f", scroll_dn_1_page); /* @@ -446,8 +452,12 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/ardour/pushbutton/zoom_5_min", "f", zoom_5_min); REGISTER_CALLBACK (serv, "/ardour/pushbutton/zoom_10_min", "f", zoom_10_min); REGISTER_CALLBACK (serv, "/ardour/pushbutton/zoom_to_session", "f", zoom_to_session); + REGISTER_CALLBACK (serv, "/ardour/pushbutton/temporal_zoom_in", "f", temporal_zoom_in); + REGISTER_CALLBACK (serv, "/ardour/pushbutton/temporal_zoom_out", "f", temporal_zoom_out); REGISTER_CALLBACK (serv, "/ardour/pushbutton/scroll_up_1_track", "f", scroll_up_1_track); REGISTER_CALLBACK (serv, "/ardour/pushbutton/scroll_dn_1_track", "f", scroll_dn_1_track); + REGISTER_CALLBACK (serv, "/ardour/pushbutton/scroll_up_1_page", "f", scroll_up_1_page); + REGISTER_CALLBACK (serv, "/ardour/pushbutton/scroll_dn_1_page", "f", scroll_dn_1_page); /* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these */ REGISTER_CALLBACK (serv, "/ardour/routes/mute", "ii", route_mute); diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 6ccbbfdbb0..937893ecac 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -219,8 +219,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK(zoom_5_min); PATH_CALLBACK(zoom_10_min); PATH_CALLBACK(zoom_to_session); + PATH_CALLBACK(temporal_zoom_in); + PATH_CALLBACK(temporal_zoom_out); PATH_CALLBACK(scroll_up_1_track); PATH_CALLBACK(scroll_dn_1_track); + PATH_CALLBACK(scroll_up_1_page); + PATH_CALLBACK(scroll_dn_1_page); #define PATH_CALLBACK1(name,type,optional) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ -- cgit v1.2.3