X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=7c24869a0089219185c7ad45c52a9eb96cdce5f3;hb=13d704b25d51a79344d776d859829cc06ffea322;hp=2479eceaff07e951f86b44d7547518334bd993d2;hpb=6acdfc69b785841ac10a324484ddd0208612a213;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 2479eceaff..7c24869a00 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2006-2009 Paul Davis - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * + * */ #ifndef ardour_osc_h @@ -44,12 +44,14 @@ 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 */ +namespace ArdourSurface { + struct OSCUIRequest : public BaseUI::BaseRequestObject { public: OSCUIRequest () {} @@ -83,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: @@ -100,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); @@ -112,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) { \ @@ -129,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); \ @@ -205,47 +211,54 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ } \ return 0; \ - } + } PATH_CALLBACK2(locate,i,i); + PATH_CALLBACK2(loop_location,i,i); PATH_CALLBACK2(route_mute,i,i); PATH_CALLBACK2(route_solo,i,i); PATH_CALLBACK2(route_recenable,i,i); PATH_CALLBACK2(route_set_gain_abs,i,f); PATH_CALLBACK2(route_set_gain_dB,i,f); + PATH_CALLBACK2(route_set_trim_abs,i,f); + PATH_CALLBACK2(route_set_trim_dB,i,f); PATH_CALLBACK2(route_set_pan_stereo_position,i,f); PATH_CALLBACK2(route_set_pan_stereo_width,i,f); PATH_CALLBACK3(route_set_send_gain_abs,i,i,f); PATH_CALLBACK3(route_set_send_gain_dB,i,i,f); PATH_CALLBACK4(route_plugin_parameter,i,i,i,f); - PATH_CALLBACK3(route_plugin_parameter_print,i,i,i); + PATH_CALLBACK3(route_plugin_parameter_print,i,i,i); int route_mute (int rid, int yn); int route_solo (int rid, int yn); int route_recenable (int rid, int yn); int route_set_gain_abs (int rid, float level); int route_set_gain_dB (int rid, float dB); + int route_set_trim_abs (int rid, float level); + int route_set_trim_dB (int rid, float dB); int route_set_pan_stereo_position (int rid, float left_right_fraction); int route_set_pan_stereo_width (int rid, float percent); int route_set_send_gain_abs (int rid, int sid, float val); 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; }; +} // namespace + #endif // ardour_osc_h