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

track scrolling and zooming

Browse source
This commit is contained in:
Ben Loftis 2016-01-16 20:33:04 -06:00 • committed by Robin Gareus
parent 27d82af077
commit c5b93e2a01
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -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_1_min() { access_action("Editor/zoom_1_min"); }
void BasicUI::zoom_5_min() { access_action("Editor/zoom_5_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_10_min() { access_action("Editor/zoom_10_min"); }
void BasicUI::zoom_to_session() { access_action("Editor/zooom-to-session"); } 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/scroll_up_1_track"); } void BasicUI::scroll_up_1_track() { access_action("Editor/step-tracks-up"); }
void BasicUI::scroll_dn_1_track() { access_action("Editor/scroll_dn_1_track"); } 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 bool

4
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View file

@ -122,9 +122,13 @@ class LIBCONTROLCP_API BasicUI {
void zoom_5_min(); void zoom_5_min();
void zoom_10_min(); void zoom_10_min();
void zoom_to_session(); void zoom_to_session();
void temporal_zoom_in();
void temporal_zoom_out();
void scroll_up_1_track(); void scroll_up_1_track();
void scroll_dn_1_track(); void scroll_dn_1_track();
void scroll_up_1_page();
void scroll_dn_1_page();
void rec_enable_toggle (); void rec_enable_toggle ();
void toggle_all_rec_enables (); void toggle_all_rec_enables ();

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

@ -389,6 +389,12 @@ OSC::register_callbacks()
REGISTER_CALLBACK (serv, "/ardour/zoom_5_min", "", zoom_5_min); 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_10_min", "", zoom_10_min);
REGISTER_CALLBACK (serv, "/ardour/zoom_to_session", "", zoom_to_session); 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_5_min", "f", zoom_5_min);
REGISTER_CALLBACK (serv, "/ardour/pushbutton/zoom_10_min", "f", zoom_10_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/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_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_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 */ /* 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); REGISTER_CALLBACK (serv, "/ardour/routes/mute", "ii", route_mute);

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

@ -219,8 +219,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
PATH_CALLBACK(zoom_5_min); PATH_CALLBACK(zoom_5_min);
PATH_CALLBACK(zoom_10_min); PATH_CALLBACK(zoom_10_min);
PATH_CALLBACK(zoom_to_session); PATH_CALLBACK(zoom_to_session);
PATH_CALLBACK(temporal_zoom_in);
PATH_CALLBACK(temporal_zoom_out);
PATH_CALLBACK(scroll_up_1_track); PATH_CALLBACK(scroll_up_1_track);
PATH_CALLBACK(scroll_dn_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) \ #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) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \