Clarify stop-at-session-end behaviour; should fix #4033.

[ardour.git] / libs / ardour / session_configuration.cc

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 498e91ea200c7c3300ec27d41674170d43e68478..899b85e7701504aa0010b89113f857ddd278c86a 100644 (file)
--- 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
@@ -24,12 +24,13 @@
 #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, 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);
+#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
 }