X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=6ebb1d05dacdbe2423f2ad009c284d43ad2aa773;hb=c229e31720013e5147efe2929204faee476bfe2d;hp=8eb7dd1e0344ebf7f4db3c1896a37360b6ada7a5;hpb=b620e5ab3fe49e96445f76af48dc88d445b10363;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 8eb7dd1e03..6ebb1d05da 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -39,7 +39,7 @@ #include "ardour/types.h" #include "control_protocol/control_protocol.h" -#include "i18n.h" +#include "pbd/i18n.h" class OSCControllable; class OSCRouteObserver; @@ -108,7 +108,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::bitset<32> strip_types;// what strip types are a part of this bank uint32_t nstrips; // how many strips are there for strip_types std::bitset<32> feedback; // What is fed back? strips/meters/timecode/bar_beat/global - int gainmode; // what kind of faders do we have Gain db or position 0 to 1023? + int gainmode; // what kind of faders do we have Gain db or position 0 to 1? uint32_t expand; // Used by /select/select bool expand_enable; // use expand instead of select OSCSelectObserver* sel_obs; // So we can sync select feedback with selected channel @@ -159,6 +159,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::string _osc_url_file; bool _send_route_changes; OSCDebugMode _debugmode; + bool address_only; + std::string remote_port; + uint32_t default_banksize; + uint32_t default_strip; + uint32_t default_feedback; + uint32_t default_gainmode; bool tick; bool bank_dirty; bool global_init; @@ -175,6 +181,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI // end "Application Hook" handles std::string get_unix_server_url (); + lo_address get_address (lo_message msg); OSCSurface * get_surface (lo_address addr); uint32_t get_sid (boost::shared_ptr strip, lo_address addr); boost::shared_ptr get_strip (uint32_t ssid, lo_address addr); @@ -213,6 +220,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK_MSG(transport_frame); PATH_CALLBACK_MSG(transport_speed); PATH_CALLBACK_MSG(record_enabled); + PATH_CALLBACK_MSG(refresh_surface); PATH_CALLBACK_MSG(bank_up); PATH_CALLBACK_MSG(bank_down); @@ -301,11 +309,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1(jump_by_bars,f,); PATH_CALLBACK1(jump_by_seconds,f,); PATH_CALLBACK1(master_set_gain,f,); - PATH_CALLBACK1(master_set_fader,i,); + PATH_CALLBACK1(master_set_fader,f,); PATH_CALLBACK1(master_set_trim,f,); PATH_CALLBACK1(master_set_mute,i,); PATH_CALLBACK1(monitor_set_gain,f,); - PATH_CALLBACK1(monitor_set_fader,i,); + PATH_CALLBACK1(monitor_set_fader,f,); #define PATH_CALLBACK1_MSG(name,arg1type) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ @@ -422,13 +430,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2_MSG(strip_phase,i,i); PATH_CALLBACK2_MSG(strip_expand,i,i); PATH_CALLBACK2_MSG(strip_gui_select,i,i); - PATH_CALLBACK2_MSG(route_set_gain_abs,i,f); PATH_CALLBACK2_MSG(route_set_gain_dB,i,f); PATH_CALLBACK2_MSG(route_set_gain_fader,i,f); PATH_CALLBACK2_MSG(route_set_trim_dB,i,f); PATH_CALLBACK2_MSG(route_set_pan_stereo_position,i,f); PATH_CALLBACK2_MSG(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_CALLBACK3(route_set_send_fader,i,i,f); PATH_CALLBACK3(route_set_send_enable,i,i,f); @@ -454,7 +460,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int route_set_trim_dB (int rid, float dB, lo_message msg); int route_set_pan_stereo_position (int rid, float left_right_fraction, lo_message msg); int route_set_pan_stereo_width (int rid, float percent, lo_message msg); - int route_set_send_gain_abs (int rid, int sid, float val, lo_message msg); int route_set_send_gain_dB (int rid, int sid, float val, lo_message msg); int route_set_send_fader (int rid, int sid, float val, lo_message msg); int route_set_send_enable (int rid, int sid, float val, lo_message msg); @@ -471,14 +476,15 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int set_surface_strip_types (uint32_t st, lo_message msg); int set_surface_feedback (uint32_t fb, lo_message msg); int set_surface_gainmode (uint32_t gm, lo_message msg); + int refresh_surface (lo_message msg); int master_set_gain (float dB); - int master_set_fader (uint32_t position); + int master_set_fader (float position); int master_set_trim (float dB); int master_set_pan_stereo_position (float position, lo_message msg); int master_set_mute (uint32_t state); int monitor_set_gain (float dB); - int monitor_set_fader (uint32_t position); + int monitor_set_fader (float position); int sel_recenable (uint32_t state, lo_message msg); int sel_recsafe (uint32_t state, lo_message msg); int sel_mute (uint32_t state, lo_message msg);