X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=6ebb1d05dacdbe2423f2ad009c284d43ad2aa773;hb=c229e31720013e5147efe2929204faee476bfe2d;hp=cdc94003566f9f3c4d27cb1a7e9e425433aa0729;hpb=95beda06d918e94b14abfdb051fecc7dfdb5967a;p=ardour.git diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index cdc9400356..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,27 +108,12 @@ 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 Sorted strips; // list of stripables for this surface }; - /* - * Reminder of what strip_types there are - * - AudioTrack = 0x1 = [0] - MidiTrack = 0x2 = [1] - AudioBus = 0x4 = [2] - MidiBus = 0x8 = [3] - VCA = 0x10 = [4] - MasterOut = 0x20 = [5] - MonitorOut = 0x40 = [6] - Auditioner = 0x80 = [7] skip don't look for. - Selected = 0x100 = [8] - Hidden = 0x200 = [9] - OrderSet = 0x400, - */ /* * feedback bits: * [0] - Strips - buttons @@ -141,6 +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] - Send Playhead position as samples + * [11] - Send Playhead position as minutes seconds + * [12] - Send Playhead position like primary/secondary GUI clocks */ @@ -171,8 +159,15 @@ 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; boost::shared_ptr _select; // which stripable out of /surface/stripables is gui selected void register_callbacks (); @@ -186,10 +181,11 @@ 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); - void global_feedback (std::bitset<32> feedback, lo_address msg, uint32_t gainmode); + 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); @@ -224,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); @@ -257,6 +254,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); @@ -311,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) { \ @@ -350,6 +348,16 @@ 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) \ @@ -403,6 +411,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); @@ -418,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); @@ -450,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); @@ -467,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); @@ -493,12 +503,26 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI 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 (); @@ -507,12 +531,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;