X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fconfiguration.h;h=7b890500d8fc375f84db7fd9f5bb90f5a089c995;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=bb49b2dce4703a308411f59ff675b291deb1424f;hpb=fedf3d34f32264ac57c6a222b678dc90f2bb1a88;p=ardour.git

diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h
index bb49b2dce4..7b890500d8 100644
--- a/libs/ardour/ardour/configuration.h
+++ b/libs/ardour/ardour/configuration.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_configuration_h__
@@ -37,32 +36,27 @@ class XMLNode;
 
 namespace ARDOUR {
 
-class Configuration : public Stateful
+class Configuration : public PBD::Stateful
 {
   public:
 	Configuration();
 	virtual ~Configuration();
 
-	struct MidiPortDescriptor {
-	    std::string tag;
-	    std::string device;
-	    std::string type;
-	    std::string mode;
-
-	    MidiPortDescriptor (const XMLNode&);
-	    XMLNode& get_state();
-	};
-
-	std::map<std::string,MidiPortDescriptor *> midi_ports;
+	std::map<std::string,XMLNode> midi_ports;
 
 	void map_parameters (sigc::slot<void,const char*> theSlot);
 
 	int load_state ();
 	int save_state ();
 
+	/// calls Stateful::*instant_xml methods using 
+	/// ARDOUR::user_config_directory for the directory argument
+	void add_instant_xml (XMLNode&);
+	XMLNode * instant_xml (const std::string& str);
+
 	int set_state (const XMLNode&);
 	XMLNode& get_state (void);
-	XMLNode& get_variables (sigc::slot<bool,ConfigVariableBase::Owner>);
+	XMLNode& get_variables (sigc::slot<bool,ConfigVariableBase::Owner>, std::string which_node = "Config");
 	void set_variables (const XMLNode&, ConfigVariableBase::Owner owner);
 
 	void set_current_owner (ConfigVariableBase::Owner);
@@ -71,7 +65,7 @@ class Configuration : public Stateful
 
 	sigc::signal<void,const char*> ParameterChanged;
 
-        /* define accessor methods */
+	/* define accessor methods */
 
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
@@ -84,10 +78,10 @@ class Configuration : public Stateful
 #include "ardour/configuration_vars.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
-	
+
   private:
 
-        /* declare variables */
+	/* declare variables */
 
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL