X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_configuration.cc;h=0cfdb52872ed37946d975fd3682d1120e8972c2a;hb=1b24aad933a850f61d7442778134a001b2002ec2;hp=00c95d241a877313a7285674ab08637d27770f70;hpb=6cf41417a0358d819bd4b5c862caa55ce7acf2cf;p=ardour.git

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 00c95d241a..0cfdb52872 100644
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,19 +17,20 @@
 
 */
 
+#include "pbd/pathexpand.h"
+
 #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 ()
 	:
 /* construct variables */
 #undef  CONFIG_VARIABLE
-#undef  CONFIG_VARIABLE_SPECIAL	
+#undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
 #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
 #include "ardour/session_configuration_vars.h"
@@ -37,7 +38,7 @@ SessionConfiguration::SessionConfiguration ()
 #undef  CONFIG_VARIABLE_SPECIAL
 	foo (0)
 {
-	
+
 }
 
 XMLNode&
@@ -62,21 +63,21 @@ SessionConfiguration::get_variables ()
 	node = new XMLNode ("Config");
 
 #undef  CONFIG_VARIABLE
-#undef  CONFIG_VARIABLE_SPECIAL	
+#undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(type,var,Name,value) \
 	var.add_to_node (*node);
 #define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
 	var.add_to_node (*node);
 #include "ardour/session_configuration_vars.h"
 #undef  CONFIG_VARIABLE
-#undef  CONFIG_VARIABLE_SPECIAL	
+#undef  CONFIG_VARIABLE_SPECIAL
 
 	return *node;
 }
 
 
 int
-SessionConfiguration::set_state (XMLNode const& root)
+SessionConfiguration::set_state (XMLNode const& root, int /*version*/)
 {
 	if (root.name() != "Ardour") {
 		return -1;
@@ -95,7 +96,7 @@ void
 SessionConfiguration::set_variables (const XMLNode& node)
 {
 #undef  CONFIG_VARIABLE
-#undef  CONFIG_VARIABLE_SPECIAL	
+#undef  CONFIG_VARIABLE_SPECIAL
 #define CONFIG_VARIABLE(type,var,name,value) \
 	if (var.set_from_node (node)) { \
 		ParameterChanged (name);		  \
@@ -108,16 +109,16 @@ SessionConfiguration::set_variables (const XMLNode& node)
 #include "ardour/session_configuration_vars.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
-	
+
 }
 void
-SessionConfiguration::map_parameters (sigc::slot<void,const char*> 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);
+#undef  CONFIG_VARIABLE_SPECIAL
+#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	
+#undef  CONFIG_VARIABLE_SPECIAL
 }