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 ea5ab5aeedf5f9529166b57002ef4bb972a9df88..002163be94eef004fe629bda346b3ed2ee49f06e 100644 (file)
--- a/libs/surfaces/osc/osc_select_observer.h
+++ b/libs/surfaces/osc/osc_select_observer.h
@@ -37,7 +37,7 @@ class OSCSelectObserver
 {
 
   public:
-       OSCSelectObserver (boost::shared_ptr<ARDOUR::Stripable>, lo_address addr, ArdourSurface::OSC::OSCSurface* sur);
+       OSCSelectObserver (ArdourSurface::OSC& o, ArdourSurface::OSC::OSCSurface* sur);
        ~OSCSelectObserver ();
 
        boost::shared_ptr<ARDOUR::Stripable> strip () const { return _strip; }
@@ -46,10 +46,13 @@ class OSCSelectObserver
        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, plugins and eq need their own
        PBD::ScopedConnectionList send_connections;
@@ -60,17 +63,24 @@ class OSCSelectObserver
        std::string path;
        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);
@@ -78,8 +88,6 @@ class OSCSelectObserver
        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 ();
@@ -94,9 +102,7 @@ class OSCSelectObserver
        void send_enable (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);
        void eq_init (void);
        void eq_end (void);
-       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);
+       void no_strip ();
 };
 
 #endif /* __osc_oscselectobserver_h__ */