X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=7c24869a0089219185c7ad45c52a9eb96cdce5f3;hb=13d704b25d51a79344d776d859829cc06ffea322;hp=f046053091d7e48dfb4e3c771c9cc6aa29865f7b;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index f046053091..7c24869a00 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -44,7 +44,7 @@ namespace ARDOUR { class Session; class Route; } - + /* this is mostly a placeholder because I suspect that at some point we will want to add more members to accomodate certain types of requests to the OSC UI @@ -85,7 +85,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI GSource* local_server; GSource* remote_server; - + bool osc_input_handler (Glib::IOCondition, lo_server); private: @@ -102,7 +102,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI void register_callbacks (); void route_added (ARDOUR::RouteList&); - + // Handlers for "Application Hook" signals void session_loaded (ARDOUR::Session&); void session_exported (std::string, std::string); @@ -114,14 +114,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI void send_current_value (const char* path, lo_arg** argv, int argc, lo_message msg); void current_value_query (const char* path, size_t len, lo_arg **argv, int argc, lo_message msg); - + int current_value (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data); - + int catchall (const char *path, const char *types, lo_arg **argv, int argc, void *data); static int _catchall (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data); void routes_list (lo_message msg); - void transport_frame(lo_message msg); + void transport_frame (lo_message msg); + void transport_speed (lo_message msg); + void record_enabled (lo_message msg); #define PATH_CALLBACK_MSG(name) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ @@ -131,10 +133,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI name (data); \ return 0; \ } - + PATH_CALLBACK_MSG(routes_list); PATH_CALLBACK_MSG(transport_frame); - + PATH_CALLBACK_MSG(transport_speed); + PATH_CALLBACK_MSG(record_enabled); + #define PATH_CALLBACK(name) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ return static_cast(user_data)->cb_ ## name (path, types, argv, argc, data); \ @@ -238,18 +242,18 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int route_set_send_gain_dB (int rid, int sid, float val); int route_plugin_parameter (int rid, int piid,int par, float val); int route_plugin_parameter_print (int rid, int piid,int par); - + void listen_to_route (boost::shared_ptr, lo_address); void end_listen (boost::shared_ptr, lo_address); void drop_route (boost::weak_ptr); - + void route_name_changed (const PBD::PropertyChange&, boost::weak_ptr r, lo_address addr); - + void update_clock (); typedef std::list RouteObservers; - + RouteObservers route_observers; static OSC* _instance;