deleting pointers to incomplete types may cause undefined behavior

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index ea502f81815b02823d7306476b0d37fab15bb9e2..94f7708d9061e28b6d1c4644e4655ccdb6d1bcc4 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -21,6 +21,7 @@
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
+#include <boost/unordered_map.hpp>
 
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
@@ -45,12 +46,8 @@ namespace ARDOUR {
 class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
-       /**
-        * Returns the current 'Track' Color
-        *
-        * @return the current Track Color
-        */
-       Gdk::Color color() const { return _color; }
+       /** @return the track's own color */
+       Gdk::Color color () const { return _color; }
 
        ARDOUR::Session* session() const { return _session; }
 
@@ -67,11 +64,24 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
        std::string gui_property (const std::string& property_name) const;
        
        template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
-               gui_object_state().set<T> (state_id(), property_name, value);
+               std::stringstream s;
+               s << value;
+               property_hashtable.erase(property_name);
+               property_hashtable.emplace(property_name, s.str());
+               gui_object_state().set_property<T> (state_id(), property_name, value);
+       }
+    
+       void cleanup_gui_properties () {
+               /* remove related property node from the GUI state */
+               gui_object_state().remove_node (state_id());
+               property_hashtable.clear ();
        }
 
        bool marked_for_display () const;
        virtual bool set_marked_for_display (bool);
+
+       static GUIObjectState& gui_object_state();
+       void clear_property_cache() { property_hashtable.clear(); }
        
   protected:
 
@@ -85,19 +95,14 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
         */
        static Gdk::Color unique_random_color();
 
-
        Gdk::Color _color;
 
        static std::list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;
 
-       bool _marked_for_display;
+       mutable boost::unordered_map<std::string, std::string> property_hashtable;
        uint32_t _old_order_key;
-
-  private:
-       static GUIObjectState& gui_object_state();
-
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */