X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=2195afe5f1f995eb3be30f1733b1af7b6001509b;hb=e1ce87956a15e41105c2a2f0269dde1c63cb501e;hp=34d024f4cfc18d9190f04bc1fd38131bbaebd413;hpb=559344d99d237ee5f9c8995919956446d32daade;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 34d024f4cf..2195afe5f1 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -88,13 +88,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI bool get_active () const; // generic osc send - + Glib::Threads::Mutex _lo_lock; int float_message (std::string, float value, lo_address addr); + int int_message (std::string, int value, lo_address addr); int text_message (std::string path, std::string val, lo_address addr); int float_message_with_id (std::string, uint32_t ssid, float value, bool in_line, lo_address addr); int int_message_with_id (std::string, uint32_t ssid, int value, bool in_line, lo_address addr); int text_message_with_id (std::string path, uint32_t ssid, std::string val, bool in_line, lo_address addr); + int send_group_list (lo_address addr); + int start (); int stop (); @@ -106,19 +109,15 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI All }; - enum JogMode { - JOG, - NUDGE, - SCRUB, - SHUTTLE, - MARKER, - SCROLL, - TRACK, - BANK + enum OSCTempMode { + TempOff = 0, + GroupOnly = 1, + VCAOnly = 2, + BusOnly = 3 }; typedef std::vector > Sorted; - Sorted get_sorted_stripables(std::bitset<32> types, bool cue, bool custom, Sorted my_list); + Sorted get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sorted my_list); typedef std::map, uint32_t> FakeTouchMap; FakeTouchMap _touch_timeout; @@ -128,14 +127,17 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI //global std::string remote_url; // the url these setting belong to bool no_clear; // don't send osc clear messages on strip change - JogMode jogmode; // current jogmode + uint32_t jogmode; // current jogmode OSCGlobalObserver* global_obs; // pointer to this surface's global observer 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 1? PBD::Controllable::GroupControlDisposition usegroup; // current group disposition Sorted custom_strips; // a sorted list of user selected strips - int custom_enable; // use custom strip list + uint32_t custom_mode; // use custom strip list + OSCTempMode temp_mode; // use temp strip list + Sorted temp_strips; // temp strip list for grouponly, vcaonly, auxonly + boost::shared_ptr temp_master; // stripable this surface uses as temp master Sorted strips; // list of stripables for this surface // strips uint32_t bank; // current bank @@ -146,7 +148,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI OSCSelectObserver* sel_obs; // So we can sync select feedback with selected channel uint32_t expand; // Used by /select/select bool expand_enable; // use expand instead of select - boost::shared_ptr select; // stripable this surface uses (maybe expand strip) + boost::shared_ptr expand_strip; // stripable this surface uses for expand + boost::shared_ptr select; // stripable this surface uses as selected int plug_page; // current plugin page uint32_t plug_page_size; // plugin page size (number of controls) int plugin_id; // id of current plugin @@ -181,9 +184,22 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI * [12] - Send Playhead position like primary/secondary GUI clocks * [13] - Send well known feedback (for /select/command * [14] - use OSC 1.0 only (#reply -> /reply) + * + * Strip_type bits: + * [0] - Audio Tracks + * [1] - Midi Tracks + * [2] - Audio Bus + * [3] - Midi Bus + * [4] - VCAs + * [5] - master + * [6] - Monitor + * [7] - Aux Bus + * [8] - Selected + * [9] - Hidden + * [10] - Use Groups + * [11] - Global Expand */ - // storage for each surface's settings mutable Glib::Threads::Mutex surfaces_lock; typedef std::vector Surface; @@ -197,6 +213,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI uint32_t bank; // linkset current bank bool autobank; // banksize is derived from total uint32_t not_ready; // number of 1st device, 0 = ready + Sorted custom_strips; // a sorted list of user selected strips + uint32_t custom_mode; // use custom strip list + OSCTempMode temp_mode; // use custom strip list + Sorted temp_strips; // temp strip list for grouponly, vcaonly, auxonly + boost::shared_ptr temp_master; // temp master stripable std::bitset<32> strip_types; // strip_types for this linkset Sorted strips; // list of valid strips in order for this set }; @@ -204,6 +225,14 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::map link_sets; // list of linksets + struct PortAdd { + public: + std::string host; + std::string port; + }; + + std::vector _ports; + // GUI calls std::string get_server_url (); void set_debug_mode (OSCDebugMode m) { _debugmode = m; } @@ -224,6 +253,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI void set_plugin_size (int ps) { default_plugin_size = ps; } void clear_devices (); void gui_changed (); + void get_surfaces (); std::string get_remote_port () { return remote_port; } void set_remote_port (std::string pt) { remote_port = pt; } @@ -274,6 +304,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::string get_unix_server_url (); lo_address get_address (lo_message msg); + std::string get_port (std::string host); OSCSurface * get_surface (lo_address addr, bool quiet = false); int check_surface (lo_message msg); uint32_t get_sid (boost::shared_ptr strip, lo_address addr); @@ -296,9 +327,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int touch_detect (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); int fake_touch (boost::shared_ptr ctrl); + int spill (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); + int route_get_sends (lo_message msg); int route_get_receives(lo_message msg); void routes_list (lo_message msg); + int group_list (lo_message msg); void surface_list (lo_message msg); void transport_sample (lo_message msg); void transport_speed (lo_message msg); @@ -346,6 +380,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK_MSG(route_get_sends); PATH_CALLBACK_MSG(route_get_receives); PATH_CALLBACK_MSG(routes_list); + PATH_CALLBACK_MSG(group_list); + PATH_CALLBACK_MSG(sel_previous); + PATH_CALLBACK_MSG(sel_next); PATH_CALLBACK_MSG(surface_list); PATH_CALLBACK_MSG(transport_sample); PATH_CALLBACK_MSG(transport_speed); @@ -467,6 +504,18 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI return 0; \ } +#define PATH_CALLBACK1_MSG_s(name,arg1type) \ + 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 *path, const char *types, lo_arg **argv, int argc, void *data) { \ + OSC_DEBUG; \ + if (argc > 0) { \ + name (&argv[0]->arg1type, data); \ + } \ + return 0; \ + } + // pan position needs message info to send feedback PATH_CALLBACK1_MSG(master_set_pan_stereo_position,f); @@ -475,6 +524,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(jog_mode,f); PATH_CALLBACK1_MSG(bank_delta,f); PATH_CALLBACK1_MSG(use_group,f); + PATH_CALLBACK1_MSG_s(name_session,s); + PATH_CALLBACK1_MSG_s(sel_rename,s); + PATH_CALLBACK1_MSG_s(sel_comment,s); PATH_CALLBACK1_MSG(sel_recenable,i); PATH_CALLBACK1_MSG(sel_recsafe,i); PATH_CALLBACK1_MSG(sel_mute,i); @@ -489,6 +541,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(sel_fader,f); PATH_CALLBACK1_MSG(sel_dB_delta,f); PATH_CALLBACK1_MSG(sel_trim,f); + PATH_CALLBACK1_MSG(sel_hide,i); PATH_CALLBACK1_MSG(sel_pan_position,f); PATH_CALLBACK1_MSG(sel_pan_width,f); PATH_CALLBACK1_MSG(sel_pan_elevation,f); @@ -511,7 +564,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(sel_eq_lpf_enable,f); PATH_CALLBACK1_MSG(sel_eq_lpf_slope,f); PATH_CALLBACK1_MSG(sel_expand,i); - PATH_CALLBACK1_MSG(custom_enable,f); + PATH_CALLBACK1_MSG(custom_mode,f); #define PATH_CALLBACK2(name,arg1type,arg2type) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ @@ -585,6 +638,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2(locate,i,i); PATH_CALLBACK2(loop_location,i,i); PATH_CALLBACK2_MSG_s(route_rename,i,s); + PATH_CALLBACK2_MSG_s(strip_group,i,s); PATH_CALLBACK2_MSG(route_mute,i,i); PATH_CALLBACK2_MSG(route_solo,i,i); PATH_CALLBACK2_MSG(route_solo_iso,i,i); @@ -595,9 +649,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2_MSG(route_monitor_disk,i,i); PATH_CALLBACK2_MSG(strip_phase,i,i); PATH_CALLBACK2_MSG(strip_expand,i,i); + PATH_CALLBACK2_MSG(strip_hide,i,i); PATH_CALLBACK2_MSG(strip_gui_select,i,i); PATH_CALLBACK2_MSG(route_set_gain_dB,i,f); PATH_CALLBACK2_MSG(route_set_gain_fader,i,f); + PATH_CALLBACK2_MSG(strip_db_delta,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); @@ -613,6 +669,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2_MSG(route_plugin_reset,i,i); int route_rename (int rid, char *s, lo_message msg); + int strip_group (int ssid, char *g, lo_message msg); + int strip_select_group (boost::shared_ptr s, char *g); int route_mute (int rid, int yn, lo_message msg); int route_solo (int rid, int yn, lo_message msg); int route_solo_iso (int rid, int yn, lo_message msg); @@ -623,9 +681,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int route_monitor_disk (int rid, int yn, lo_message msg); int strip_phase (int rid, int yn, lo_message msg); int strip_expand (int rid, int yn, lo_message msg); + int strip_hide (int ssid, int yn, lo_message msg); int _strip_select (boost::shared_ptr s, lo_address addr); int strip_gui_select (int rid, int yn, lo_message msg); - int route_set_gain_abs (int rid, float level, lo_message msg); int route_set_gain_dB (int rid, float dB, lo_message msg); int route_set_gain_fader (int rid, float pos, lo_message msg); int strip_db_delta (int ssid, float delta, lo_message msg); @@ -658,9 +716,12 @@ 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 set_surface_port (uint32_t po, lo_message msg); int refresh_surface (lo_message msg); int custom_clear (lo_message msg); - int custom_enable (float state, lo_message msg); + int custom_mode (float state, lo_message msg); + int _custom_mode (uint32_t state, lo_address addr); + int name_session (char *n, lo_message msg); // select int sel_send_pagesize (uint32_t size, lo_message msg); int sel_send_page (int page, lo_message msg); @@ -670,11 +731,12 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int _sel_plugin (int id, lo_address addr); int sel_plugin_activate (float state, lo_message msg); int select_plugin_parameter (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); - void processor_changed (lo_address addr); + void processor_changed (std::string remote_url); int scrub (float delta, lo_message msg); int jog (float delta, lo_message msg); int jog_mode (float mode, lo_message msg); + int set_marker (const char* types, lo_arg **argv, int argc, lo_message msg); int click_level (float position); int master_set_gain (float dB); int master_set_fader (float position); @@ -689,6 +751,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int monitor_set_mute (uint32_t state); int monitor_set_dim (uint32_t state); int monitor_set_mono (uint32_t state); + int sel_group (char *g, lo_message msg); + int sel_rename (char *n, lo_message msg); + int sel_comment (char *c, lo_message msg); 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); @@ -702,6 +767,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int sel_fader (float state, lo_message msg); int sel_dB_delta (float delta, lo_message msg); int sel_trim (float val, lo_message msg); + int sel_hide (uint32_t state, lo_message msg); + int sel_previous (lo_message msg); + int sel_next (lo_message msg); + int sel_delta (int delta, lo_message msg); + boost::shared_ptr get_send (boost::shared_ptr st, lo_address addr); int sel_pan_position (float val, lo_message msg); int sel_pan_width (float val, lo_message msg); int sel_sendgain (int id, float dB, lo_message msg); @@ -728,6 +798,10 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int sel_eq_freq (int id, float val, lo_message msg); int sel_eq_q (int id, float val, lo_message msg); int sel_eq_shape (int id, float val, lo_message msg); + int set_temp_mode (lo_address addr); + int parse_sel_group (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); + int parse_sel_vca (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); + boost::shared_ptr get_vca_by_name (std::string vname); void listen_to_route (boost::shared_ptr, lo_address);