X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=005cac2b5f847e8b5e9731e3332d581c899b9bd1;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=6a38d32a31b31de344b1879118887e33d0dc5332;hpb=fef79d46bb54c0e9179e54a0977eeb602e4b2db3;p=ardour.git

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 6a38d32a31..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;
@@ -161,6 +161,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	OSCDebugMode _debugmode;
 	bool tick;
 	bool bank_dirty;
+	bool global_init;
 	boost::shared_ptr<ARDOUR::Stripable> _select;	// which stripable out of /surface/stripables is gui selected
 
 	void register_callbacks ();
@@ -177,7 +178,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	OSCSurface * get_surface (lo_address addr);
 	uint32_t get_sid (boost::shared_ptr<ARDOUR::Stripable> strip, lo_address addr);
 	boost::shared_ptr<ARDOUR::Stripable> 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);
@@ -245,6 +246,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	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);
@@ -338,6 +340,16 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	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)			\
@@ -391,6 +403,10 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	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);
@@ -481,6 +497,20 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	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<ARDOUR::Stripable>, lo_address);
 	void end_listen (boost::shared_ptr<ARDOUR::Stripable>, lo_address);
@@ -495,12 +525,14 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	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<OSCRouteObserver*> RouteObservers;