X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_select_observer.h;h=6cd20a7769a8408cdd6b170faf60d63920086598;hb=d42da9046e787d3ca7b3c106c5f71315f2bc78b0;hp=66b4f04d6fa8528a2ab4d1090d11025f7a6f403c;hpb=03d2939f279c12ebf18d2cb95270ba2fb6dba9f0;p=ardour.git

diff --git a/libs/surfaces/osc/osc_select_observer.h b/libs/surfaces/osc/osc_select_observer.h
index 66b4f04d6f..6cd20a7769 100644
--- a/libs/surfaces/osc/osc_select_observer.h
+++ b/libs/surfaces/osc/osc_select_observer.h
@@ -29,12 +29,13 @@
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
 #include "ardour/types.h"
+#include "ardour/processor.h"
 
 class OSCSelectObserver
 {
 
   public:
-	OSCSelectObserver (boost::shared_ptr<ARDOUR::Stripable>, lo_address addr, uint32_t sid, uint32_t gainmode, std::bitset<32> feedback);
+	OSCSelectObserver (boost::shared_ptr<ARDOUR::Stripable>, lo_address addr, uint32_t gainmode, std::bitset<32> feedback);
 	~OSCSelectObserver ();
 
 	boost::shared_ptr<ARDOUR::Stripable> strip () const { return _strip; }
@@ -45,22 +46,45 @@ class OSCSelectObserver
 	boost::shared_ptr<ARDOUR::Stripable> _strip;
 
 	PBD::ScopedConnectionList strip_connections;
+	// sends and eq need their own
+	PBD::ScopedConnectionList send_connections;
+	PBD::ScopedConnectionList eq_connections;
 
 	lo_address addr;
 	std::string path;
-	uint32_t ssid;
 	uint32_t gainmode;
 	std::bitset<32> feedback;
+	std::vector<int> send_timeout;
+	uint32_t gain_timeout;
 	float _last_meter;
-
+	uint32_t nsends;
+	float _last_gain;
+	ARDOUR::AutoState as;
 
 	void name_changed (const PBD::PropertyChange& what_changed);
-	void send_change_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
-	void send_monitor_status (boost::shared_ptr<PBD::Controllable> controllable);
-	void send_gain_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
-	void send_trim_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
-	std::string set_path (std::string path);
-	void clear_strip (std::string path, float val);
+	void change_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
+	void enable_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
+	void comp_mode (void);
+	void change_message_with_id (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
+	void enable_message_with_id (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
+	void text_message (std::string path, std::string text);
+	void text_with_id (std::string path, uint32_t id, std::string name);
+	void monitor_status (boost::shared_ptr<PBD::Controllable> controllable);
+	void gain_message ();
+	void gain_automation ();
+	void trim_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
+	// sends stuff
+	void send_init (void);
+	void send_end (void);
+	void send_restart (int);
+	void send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
+	void send_enable (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);
+	void eq_init (void);
+	void eq_end (void);
+	void eq_restart (int);
+	std::string set_path (std::string path, uint32_t id);
+	void send_float (std::string path, float val);
+	void send_float_with_id (std::string path, uint32_t id, float val);
 };
 
 #endif /* __osc_oscselectobserver_h__ */