X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=0d02d25cdbcd9254288f807721eed74469d89ef5;hb=06ea56a2ce2fb8cf7e6803486292bf7b89d81de7;hp=343526fcf90d722ff8c9834b6b720689c22d6af7;hpb=2a809dcf7005ab91bc297ef88365822728c06c56;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 343526fcf9..0d02d25cdb 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -87,6 +87,14 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int set_active (bool yn); bool get_active () const; + // generic osc send + + int float_message (std::string, float 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 start (); int stop (); @@ -117,11 +125,26 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI // keep a surface's global setup by remote server url struct OSCSurface { public: + //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 + 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 strips; // list of stripables for this surface + // strips uint32_t bank; // current bank uint32_t bank_size; // size of banks for this surface + std::vector observers; // route observers for this surface + std::bitset<32> strip_types;// what strip types are a part of this bank + //select + 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) int plug_page; // current plugin page uint32_t plug_page_size; // plugin page size (number of controls) int plugin_id; // id of current plugin @@ -129,18 +152,15 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::vector plugins; // stores allowable plugins with index (work around MB strip PIs) int send_page; // current send page uint32_t send_page_size; // send page size in channels + uint32_t nsends; // number of sends select has PBD::ScopedConnection proc_connection; // for processor signal monitoring - 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 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 - Sorted strips; // list of stripables for this surface + // cue bool cue; // is this a cue surface uint32_t aux; // aux index for this cue surface Sorted sends; // list of sends for cue aux + OSCCueObserver* cue_obs; // pointer to this surface's cue observer + uint32_t linkset; // ID of a set of surfaces used as one + uint32_t linkid; // ID of this surface within a linkset }; /* * feedback bits: @@ -167,6 +187,22 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI typedef std::vector Surface; Surface _surface; +// linked surfaces + struct LinkSet { + public: + std::vector urls; //urls of linked surfaces + uint32_t banksize; // linkset banksize + uint32_t bank; // linkset current bank + bool autobank; // banksize is derived from total + uint32_t not_ready; // number of 1st device, 0 = ready + std::bitset<32> strip_types; // strip_types for this linkset + Sorted strips; // list of valid strips in order for this set + }; + + std::map link_sets; + // list of linksets + +// GUI calls std::string get_server_url (); void set_debug_mode (OSCDebugMode m) { _debugmode = m; } OSCDebugMode get_debug_mode () { return _debugmode; } @@ -217,6 +253,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI uint32_t default_plugin_size; bool tick; bool bank_dirty; + bool observer_busy; float scrub_speed; // Current scrub speed double scrub_place; // place of play head at latest jog/scrub wheel tick int64_t scrub_time; // when did the wheel move last? @@ -235,11 +272,15 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::string get_unix_server_url (); lo_address get_address (lo_message msg); - OSCSurface * get_surface (lo_address addr); + 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); boost::shared_ptr get_strip (uint32_t ssid, lo_address addr); - void global_feedback (std::bitset<32> feedback, lo_address addr, uint32_t gainmode); + void global_feedback (OSCSurface* sur); + void strip_feedback (OSCSurface* sur, bool new_bank_size); + void surface_destroy (OSCSurface* sur); + uint32_t bank_limits_check (uint32_t bank, uint32_t size, uint32_t total); + void bank_leds (OSCSurface* sur); 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); @@ -256,7 +297,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int route_get_sends (lo_message msg); int route_get_receives(lo_message msg); void routes_list (lo_message msg); - void transport_frame (lo_message msg); + void surface_list (lo_message msg); + void transport_sample (lo_message msg); void transport_speed (lo_message msg); void record_enabled (lo_message msg); @@ -272,13 +314,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int cue_aux_fader (float position, lo_message msg); int cue_aux_mute (float state, lo_message msg); void cue_set_aux (uint32_t aux, lo_message msg); - int cue_float_message (std::string, float value, lo_address addr); - int text_message (std::string path, std::string val, lo_address addr); boost::shared_ptr cue_get_send (uint32_t id, lo_address addr); // end cue - int select_plugin_parameter (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); - int surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); + // link + LinkSet * get_linkset (uint32_t set, lo_address addr); + int parse_link (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); + int link_check (uint32_t linkset); + int set_link (uint32_t set, uint32_t id, lo_address addr); + void surface_link_state (LinkSet * set); + void link_strip_types (uint32_t linkset, uint32_t striptypes); #define OSC_DEBUG \ if (_debugmode == All) { \ @@ -299,12 +344,14 @@ 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(transport_frame); + PATH_CALLBACK_MSG(surface_list); + PATH_CALLBACK_MSG(transport_sample); 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); + PATH_CALLBACK_MSG(master_select); #define PATH_CALLBACK(name) \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ @@ -403,6 +450,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1(monitor_set_mute,i,); PATH_CALLBACK1(monitor_set_dim,i,); PATH_CALLBACK1(monitor_set_mono,i,); + PATH_CALLBACK1(click_level,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) { \ @@ -423,6 +471,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(jog,f); PATH_CALLBACK1_MSG(jog_mode,f); PATH_CALLBACK1_MSG(bank_delta,f); + PATH_CALLBACK1_MSG(use_group,f); PATH_CALLBACK1_MSG(sel_recenable,i); PATH_CALLBACK1_MSG(sel_recsafe,i); PATH_CALLBACK1_MSG(sel_mute,i); @@ -445,6 +494,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(sel_send_page,f); PATH_CALLBACK1_MSG(sel_plug_page,f); PATH_CALLBACK1_MSG(sel_plugin,f); + PATH_CALLBACK1_MSG(sel_plugin_activate,f); PATH_CALLBACK1_MSG(sel_comp_enable,f); PATH_CALLBACK1_MSG(sel_comp_threshold,f); PATH_CALLBACK1_MSG(sel_comp_speed,f); @@ -595,30 +645,38 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int _set_bank (uint32_t bank_start, lo_address addr); int bank_up (lo_message msg); int bank_delta (float delta, lo_message msg); + int use_group (float value, lo_message msg); int bank_down (lo_message msg); + // surface set up + int surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg); int set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gmode, uint32_t se_size, uint32_t pi_size, lo_message msg); int set_surface_bank_size (uint32_t bs, lo_message msg); 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); + // select int sel_send_pagesize (uint32_t size, lo_message msg); int sel_send_page (int page, lo_message msg); int sel_plug_pagesize (uint32_t size, lo_message msg); int sel_plug_page (int page, lo_message msg); int sel_plugin (int delta, lo_message msg); 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); int scrub (float delta, lo_message msg); int jog (float delta, lo_message msg); int jog_mode (float mode, lo_message msg); + int click_level (float position); int master_set_gain (float dB); int master_set_fader (float position); int master_delta_gain (float delta); 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 master_select (lo_message msg); int monitor_set_gain (float dB); int monitor_set_fader (float position); int monitor_delta_gain (float delta); @@ -666,10 +724,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int sel_eq_shape (int id, float val, lo_message msg); 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_lost (boost::weak_ptr); - void gui_selection_changed (void); void route_name_changed (const PBD::PropertyChange&, boost::weak_ptr r, lo_address addr); void recalcbanks (); @@ -681,21 +735,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI bool periodic (void); sigc::connection periodic_connection; PBD::ScopedConnectionList session_connections; - PBD::ScopedConnectionList cueobserver_connections; - - int route_send_fail (std::string path, uint32_t ssid, float val, lo_address addr); - int sel_send_fail (std::string path, uint32_t id, float val, lo_address addr); - int sel_fail (std::string path, float val, lo_address addr); - - typedef std::list RouteObservers; - - RouteObservers route_observers; - - typedef std::list GlobalObservers; - GlobalObservers global_observers; - - typedef std::list CueObservers; - CueObservers cue_observers; void debugmsg (const char *prefix, const char *path, const char* types, lo_arg **argv, int argc);