X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Frc_configuration.h;h=d54fd1b4e8aa6ca78943788bf31b05beee880a74;hb=ba0458cf1f6c69366e89631d8fff916ad183d768;hp=d12a9c63e7224c9932026456f2aac415fb08f81c;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index d12a9c63e7..d54fd1b4e8 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -35,15 +35,14 @@ class RCConfiguration : public Configuration
 {
   public:
 	RCConfiguration();
+	~RCConfiguration();
 
-	void map_parameters (sigc::slot<void, std::string>);
-	int set_state (XMLNode const &);
+	void map_parameters (boost::function<void (std::string)>&);
+	int set_state (XMLNode const &, int version);
 	XMLNode& get_state ();
 	XMLNode& get_variables ();
 	void set_variables (XMLNode const &);
 
-	std::map<std::string, XMLNode> midi_ports;
-
 	int load_state ();
 	int save_state ();
 
@@ -53,6 +52,7 @@ class RCConfiguration : public Configuration
 	XMLNode * instant_xml (const std::string& str);
 
 	XMLNode* control_protocol_state () { return _control_protocol_state; }
+	std::list<XMLNode*> midi_port_states () { return _midi_port_states; }
 
 	/* define accessor methods */
 
@@ -81,6 +81,11 @@ class RCConfiguration : public Configuration
 #undef  CONFIG_VARIABLE_SPECIAL
 
 	XMLNode* _control_protocol_state;
+
+	/** MIDI port nodes from the RC configuration.  We store them so that we can set their
+	    state once the audio engine and hence ports are up.
+	*/
+	std::list<XMLNode*> _midi_port_states;
 };
 
 /* XXX: rename this */