X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=005cac2b5f847e8b5e9731e3332d581c899b9bd1;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=7cb256e725531fee6f846b30b226801ab08717d5;hpb=f4047b9a2656cbdc3e5cb3e943c6bdb421dccbfa;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 7cb256e725..005cac2b5f 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; @@ -96,6 +96,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI All }; + typedef std::vector > Sorted; + Sorted get_sorted_stripables(std::bitset<32> types); + // keep a surface's global setup by remote server url struct OSCSurface { public: @@ -106,24 +109,11 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI 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? - uint32_t surface_sel; // which strip within the bank is locally selected + 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 - //StripableList strips; //list of stripables for the current bank + Sorted strips; // list of stripables for this surface }; - /* - * Reminder of what strip_types there are - * XXX these have changed!!! - AudioTrack = 0x1, - MidiTrack = 0x2, - AudioBus = 0x4, - MidiBus = 0x8, - VCA = 0x10, - MasterOut = 0x800, - MonitorOut = 0x1000, - Auditioner = 0x2000, - Selected = 0x4000, - Hidden = 0x8000, - */ /* * feedback bits: * [0] - Strips - buttons @@ -136,7 +126,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI * [7] - Send metering as dB or positional depending on gainmode * [8] - Send metering as 16 bits (led strip) * [9] - Send signal present (signal greater than -20dB) - * [10] - Selection is local + * [10] - Send Playhead position as samples + * [11] - Send Playhead position as minutes seconds + * [12] - Send Playhead position like primary/secondary GUI clocks */ @@ -169,6 +161,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI OSCDebugMode _debugmode; bool tick; bool bank_dirty; + bool global_init; + boost::shared_ptr _select; // which stripable out of /surface/stripables is gui selected void register_callbacks (); @@ -182,9 +176,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI std::string get_unix_server_url (); OSCSurface * get_surface (lo_address addr); - uint32_t get_sid (uint32_t rid, lo_address addr); - uint32_t get_rid (uint32_t sid, lo_address addr); - void global_feedback (std::bitset<32> feedback, lo_address msg, uint32_t gainmode); + 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 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); @@ -252,6 +246,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK(toggle_all_rec_enables); PATH_CALLBACK(all_tracks_rec_in); PATH_CALLBACK(all_tracks_rec_out); + PATH_CALLBACK(cancel_all_solos); PATH_CALLBACK(remove_marker_at_playhead); PATH_CALLBACK(mark_in); PATH_CALLBACK(mark_out); @@ -345,6 +340,17 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK1_MSG(sel_trim,f); PATH_CALLBACK1_MSG(sel_pan_position,f); PATH_CALLBACK1_MSG(sel_pan_width,f); + PATH_CALLBACK1_MSG(sel_pan_elevation,f); + PATH_CALLBACK1_MSG(sel_pan_frontback,f); + PATH_CALLBACK1_MSG(sel_pan_lfe,f); + PATH_CALLBACK1_MSG(sel_comp_enable,f); + PATH_CALLBACK1_MSG(sel_comp_threshold,f); + PATH_CALLBACK1_MSG(sel_comp_speed,f); + PATH_CALLBACK1_MSG(sel_comp_mode,f); + PATH_CALLBACK1_MSG(sel_comp_makeup,f); + PATH_CALLBACK1_MSG(sel_eq_enable,f); + PATH_CALLBACK1_MSG(sel_eq_hpf,f); + PATH_CALLBACK1_MSG(sel_expand,i); #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) { \ @@ -397,6 +403,10 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2_MSG(sel_sendgain,i,f); PATH_CALLBACK2_MSG(sel_sendfader,i,f); PATH_CALLBACK2_MSG(sel_sendenable,i,f); + PATH_CALLBACK2_MSG(sel_eq_gain,i,f); + PATH_CALLBACK2_MSG(sel_eq_freq,i,f); + PATH_CALLBACK2_MSG(sel_eq_q,i,f); + PATH_CALLBACK2_MSG(sel_eq_shape,i,f); PATH_CALLBACK4(set_surface,i,i,i,i); PATH_CALLBACK2(locate,i,i); @@ -410,7 +420,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI PATH_CALLBACK2_MSG(route_monitor_input,i,i); PATH_CALLBACK2_MSG(route_monitor_disk,i,i); PATH_CALLBACK2_MSG(strip_phase,i,i); - PATH_CALLBACK2_MSG(strip_select,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); @@ -434,8 +444,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int route_monitor_input (int rid, int yn, lo_message msg); int route_monitor_disk (int rid, int yn, lo_message msg); int strip_phase (int rid, int yn, lo_message msg); - int strip_select (int rid, int yn, lo_message msg); - int _strip_select (int rid, lo_address addr); + int strip_expand (int rid, 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); @@ -486,12 +496,27 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int sel_sendgain (int id, float dB, lo_message msg); int sel_sendfader (int id, float pos, lo_message msg); int sel_sendenable (int id, float pos, lo_message msg); + int sel_expand (uint32_t state, lo_message msg); + int sel_pan_elevation (float val, lo_message msg); + int sel_pan_frontback (float val, lo_message msg); + int sel_pan_lfe (float val, lo_message msg); + int sel_comp_enable (float val, lo_message msg); + int sel_comp_threshold (float val, lo_message msg); + int sel_comp_speed (float val, lo_message msg); + int sel_comp_mode (float val, lo_message msg); + int sel_comp_makeup (float val, lo_message msg); + int sel_eq_enable (float val, lo_message msg); + int sel_eq_hpf (float val, lo_message msg); + int sel_eq_gain (int id, float val, lo_message msg); + 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); 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 (ARDOUR::StripableNotificationListPtr stripables); + void gui_selection_changed (void); void route_name_changed (const PBD::PropertyChange&, boost::weak_ptr r, lo_address addr); void recalcbanks (); @@ -500,12 +525,14 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI void notify_vca_added (ARDOUR::VCAList &); void update_clock (); + int cancel_all_solos (); bool periodic (void); sigc::connection periodic_connection; PBD::ScopedConnectionList session_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;