OSC: catch bad commands on /cue/* created crash on exit

[ardour.git] / libs / surfaces / osc / osc_select_observer.h

diff --git a/libs/surfaces/osc/osc_select_observer.h b/libs/surfaces/osc/osc_select_observer.h
index 54e8a4a4d69b0ac34f3087ef3b854bec93661282..002163be94eef004fe629bda346b3ed2ee49f06e 100644 (file)
--- a/libs/surfaces/osc/osc_select_observer.h
+++ b/libs/surfaces/osc/osc_select_observer.h
@@ -29,48 +29,80 @@
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
 #include "ardour/types.h"
+#include "ardour/processor.h"
+
+#include "osc.h"
 
 class OSCSelectObserver
 {
 
   public:
-       OSCSelectObserver (boost::shared_ptr<ARDOUR::Stripable>, lo_address addr, uint32_t sid, uint32_t gainmode, std::bitset<32> feedback);
+       OSCSelectObserver (ArdourSurface::OSC& o, ArdourSurface::OSC::OSCSurface* sur);
        ~OSCSelectObserver ();
 
        boost::shared_ptr<ARDOUR::Stripable> strip () const { return _strip; }
        lo_address address() const { return addr; };
        void tick (void);
+       void renew_sends (void);
+       void renew_plugin (void);
+       void eq_restart (int);
+       void clear_observer (void);
+       void refresh_strip (bool force);
 
   private:
        boost::shared_ptr<ARDOUR::Stripable> _strip;
-
+       ArdourSurface::OSC& _osc;
+       
        PBD::ScopedConnectionList strip_connections;
-       // sends need their own
+       // sends, plugins and eq need their own
        PBD::ScopedConnectionList send_connections;
+       PBD::ScopedConnectionList plugin_connections;
+       PBD::ScopedConnectionList eq_connections;
 
        lo_address addr;
        std::string path;
-       uint32_t ssid;
        uint32_t gainmode;
        std::bitset<32> feedback;
+       bool in_line;
+       ArdourSurface::OSC::OSCSurface* sur;
+       std::vector<int> send_timeout;
+       uint32_t gain_timeout;
        float _last_meter;
        uint32_t nsends;
-
+       float _last_gain;
+       float _last_trim;
+       std::vector<float> _last_send;
+       bool _init;
+       float _comp_redux;
+       ARDOUR::AutoState as;
+       uint32_t send_page_size;
+       uint32_t send_size;
+       uint32_t nplug_params;
+       uint32_t plug_size;
+       int eq_bands;
+       bool _tick_busy;
 
        void name_changed (const PBD::PropertyChange& what_changed);
        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 monitor_status (boost::shared_ptr<PBD::Controllable> controllable);
-       void gain_message (std::string path, 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 plugin_init (void);
+       void plugin_end (void);
+       void plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr<PBD::Controllable> controllable);
        void send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
-       void send_enable (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
-       void send_name (std::string path, uint32_t id, std::string name);
-       std::string set_path (std::string path, uint32_t id);
-       void clear_strip (std::string path, float val);
+       void send_enable (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);
+       void eq_init (void);
+       void eq_end (void);
+       void no_strip ();
 };
 
 #endif /* __osc_oscselectobserver_h__ */