X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_configuration.cc;h=cfb6fb86686408734a3777e99390cd4260e99aad;hb=d7e39ee5c779ab5e118ecea60bb3f86e94fba069;hp=2cae7021e167a0245e3aca547e1270b11f89b994;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 2cae7021e1..cfb6fb8668 100644
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -20,10 +20,10 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 #include "ardour/session_configuration.h"
-#include "ardour/ardour.h"
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 
 SessionConfiguration::SessionConfiguration ()
 	:
@@ -76,7 +76,7 @@ SessionConfiguration::get_variables ()
 
 
 int
-SessionConfiguration::set_state (XMLNode const& root)
+SessionConfiguration::set_state (XMLNode const& root, int /*version*/)
 {
 	if (root.name() != "Ardour") {
 		return -1;
@@ -111,12 +111,12 @@ SessionConfiguration::set_variables (const XMLNode& node)
 
 }
 void
-SessionConfiguration::map_parameters (sigc::slot<void, std::string> theSlot)
+SessionConfiguration::map_parameters (boost::function<void (std::string)>& functor)
 {
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
-#define CONFIG_VARIABLE(type,var,name,value)                 theSlot (name);
-#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name);
+#define CONFIG_VARIABLE(type,var,name,value)                 functor (name);
+#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name);
 #include "ardour/session_configuration_vars.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL