Merge branch 'master' into windows

[ardour.git] / libs / ardour / ardour / configuration.h

diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h
index bd164a08e914a9f128451e47fca74400dcc25a3a..14a43e160c947c0f694a9c3ccd3b7c74c1ba4ad6 100644 (file)
--- a/libs/ardour/ardour/configuration.h
+++ b/libs/ardour/ardour/configuration.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_configuration_h__
 #define __ardour_configuration_h__
 
+#include <boost/function.hpp>
+#include "pbd/signals.h"
 #include "pbd/stateful.h"
 #include "ardour/configuration_variable.h"
 
@@ -33,13 +35,13 @@ class Configuration : public PBD::Stateful
        Configuration();
        virtual ~Configuration();
 
-       virtual void map_parameters (sigc::slot<void, std::string> s) = 0;
+       virtual void map_parameters (boost::function<void (std::string)>&) = 0;
        virtual int set_state (XMLNode const &, int) = 0;
        virtual XMLNode & get_state () = 0;
        virtual XMLNode & get_variables () = 0;
        virtual void set_variables (XMLNode const &) = 0;
 
-       sigc::signal<void, std::string> ParameterChanged;
+       PBD::Signal1<void,std::string> ParameterChanged;
 };
 
 } // namespace ARDOUR