use syntactic sugar

[ardour.git] / gtk2_ardour / gui_object.h

diff --git a/gtk2_ardour/gui_object.h b/gtk2_ardour/gui_object.h
index 025be30fabc9b634ea6164a019e7cdeffbdbed85..c9082807fbebfbfd453b350b7c9c21bee2779802 100644 (file)
--- a/gtk2_ardour/gui_object.h
+++ b/gtk2_ardour/gui_object.h
@@ -28,41 +28,50 @@
 #include "pbd/xml++.h"
 #include "pbd/id.h"
 
-class GUIObjectState {
-  private:
-       typedef boost::variant<int64_t,std::string> Variant;
-       typedef std::map<std::string,Variant> PropertyMap;
-       typedef std::map<std::string,PropertyMap> StringPropertyMap;
-
-  public:
-       GUIObjectState() {}
-       ~GUIObjectState();
-
-       XMLNode& get_state () const;
-       int set_state (const XMLNode&);
+class GUIObjectState
+{
+public:
+       GUIObjectState ();
 
        static const std::string xml_node_name;
        void load (const XMLNode&);
 
-       GUIObjectState& operator= (const GUIObjectState& other);
+       int set_state (const XMLNode&);
+       XMLNode& get_state () const;
 
+       /** Get a string from our state.
+        *  @param id property of Object node to look for.
+        *  @param prop_name name of the Object property to return.
+        *  @param empty if non-0, filled in with true if the property is currently non-existant, otherwise false.
+        *  @return value of property `prop_name', or empty.
+        */
        std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0);
 
-       template<typename T> void set (const std::string& id, const std::string& prop_name, const T& val) {
-               StringPropertyMap::iterator i = _property_maps.find (id);
-               
-               if (i != _property_maps.end()) {
-                       i->second[prop_name] = val;
-               } else {
-                       _property_maps[id] = PropertyMap();
-                       _property_maps[id][prop_name] = val;
-               }
+       template<typename T> void set_property (const std::string& id, const std::string& prop_name, const T& val) {
+               XMLNode* child = get_or_add_node (id);
+               child->set_property (prop_name.c_str(), val);
        }
-  private:
-       StringPropertyMap _property_maps;
 
-       void clear_maps ();
-};
+       /** Remove node with provided id.
+        *  @param id property of Object node to look for.
+        */
+       void remove_node (const std::string& id);
+       std::list<std::string> all_ids () const;
+
+       XMLNode* get_or_add_node (const std::string &);
 
+       static XMLNode* get_node (const XMLNode *, const std::string &);
+       static XMLNode* get_or_add_node (XMLNode *, const std::string &);
+
+  private:
+       // no copy construction. object_map saves pointers to _state XMLNodes
+       // use set_state(get_state())
+       GUIObjectState (const GUIObjectState& other);
+
+       XMLNode _state;
+       // ideally we'd use a O(1) hash table here,
+       // but O(log(N)) is fine already.
+       std::map <std::string, XMLNode*> object_map;
+};
 
 #endif /* __gtk_ardour_gui_object_h__ */