X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=2479eceaff07e951f86b44d7547518334bd993d2;hb=859d6e20432f8f195ec68291b98bd031ea2fc2b0;hp=a814726b4e5bfd1f603c88a987526b52bfea58b1;hpb=79f91c7a205d981d2b8cc15e32a6da02d8423065;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index a814726b4e..2479eceaff 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -29,27 +29,43 @@ #include -#include +#include -#include -#include -#include +#define ABSTRACT_UI_EXPORTS +#include "pbd/abstract_ui.h" + +#include "ardour/types.h" +#include "control_protocol/control_protocol.h" class OSCControllable; +class OSCRouteObserver; namespace ARDOUR { class Session; class Route; } -class OSC : public ARDOUR::ControlProtocol +/* 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 +*/ + +struct OSCUIRequest : public BaseUI::BaseRequestObject { + public: + OSCUIRequest () {} + ~OSCUIRequest() {} +}; + +class OSC : public ARDOUR::ControlProtocol, public AbstractUI { public: OSC (ARDOUR::Session&, uint32_t port); virtual ~OSC(); + static OSC* instance() { return _instance; } + XMLNode& get_state (); - int set_state (const XMLNode&, int version = 3000); + int set_state (const XMLNode&, int version); int set_active (bool yn); bool get_active () const; @@ -61,6 +77,15 @@ class OSC : public ARDOUR::ControlProtocol int start (); int stop (); + protected: + void thread_init (); + void do_request (OSCUIRequest*); + + GSource* local_server; + GSource* remote_server; + + bool osc_input_handler (Glib::IOCondition, lo_server); + private: uint32_t _port; volatile bool _ok; @@ -71,16 +96,6 @@ class OSC : public ARDOUR::ControlProtocol std::string _osc_url_file; std::string _namespace_root; bool _send_route_changes; - pthread_t _osc_thread; - int _request_pipe[2]; - - static void * _osc_receiver(void * arg); - void osc_receiver(); - void send(); // This should accept an OSC payload - - bool init_osc_thread (); - void terminate_osc_thread (); - void poke_osc_thread (); void register_callbacks (); @@ -97,11 +112,27 @@ class OSC : public ARDOUR::ControlProtocol 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); - int current_value (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); +#define PATH_CALLBACK_MSG(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); \ + } \ + int cb_ ## name (const char *, const char *, lo_arg **, int, void *data) { \ + name (data); \ + return 0; \ + } + + PATH_CALLBACK_MSG(routes_list); + PATH_CALLBACK_MSG(transport_frame); + #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); \ @@ -154,25 +185,67 @@ class OSC : public ARDOUR::ControlProtocol return 0; \ } +#define PATH_CALLBACK3(name,arg1type,arg2type,arg3type) \ + 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); \ + } \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \ + if (argc > 1) { \ + name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \ + } \ + return 0; \ + } + +#define PATH_CALLBACK4(name,arg1type,arg2type,arg3type,arg4type) \ + 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); \ + } \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \ + if (argc > 1) { \ + name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ + } \ + return 0; \ + } + + PATH_CALLBACK2(locate,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_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); 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_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 Controllables; - Controllables controllables; + typedef std::list RouteObservers; + + RouteObservers route_observers; + + static OSC* _instance; }; #endif // ardour_osc_h