From 8386874a0370747fe2849539f58d81cfa7348262 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 18 Jan 2021 23:36:35 +0100 Subject: [PATCH] OSC: Allow to specify marker name #8543 Patch from atsampson --- libs/surfaces/osc/osc.cc | 1 + libs/surfaces/osc/osc.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index eae5d2a2a5..6f18e8d45f 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -435,6 +435,7 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, X_("/surface/list"), "f", surface_list); REGISTER_CALLBACK (serv, X_("/add_marker"), "", add_marker); REGISTER_CALLBACK (serv, X_("/add_marker"), "f", add_marker); + REGISTER_CALLBACK (serv, X_("/add_marker"), "s", add_marker_name); REGISTER_CALLBACK (serv, X_("/access_action"), "s", access_action); REGISTER_CALLBACK (serv, X_("/loop_toggle"), "", loop_toggle); REGISTER_CALLBACK (serv, X_("/loop_toggle"), "f", loop_toggle); diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index dfa830c240..477d22c350 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -343,6 +343,10 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI void transport_speed (lo_message msg); void record_enabled (lo_message msg); + void add_marker_name(const std::string &markername) { + add_marker(markername); + } + // cue Sorted cue_get_sorted_stripables(boost::shared_ptr aux, uint32_t id, lo_message msg); int cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); @@ -482,6 +486,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI } PATH_CALLBACK1(set_transport_speed,f,); + PATH_CALLBACK1(add_marker_name,s,&); PATH_CALLBACK1(access_action,s,&); PATH_CALLBACK1(jump_by_bars,f,);