diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
| commit | 8687895abba4209a6de8d8a8fc1bda5996f0d875 (patch) | |
| tree | a2123e967e7c9906d787a5cec94ec53894d32734 /libs/ardour/ardour | |
| parent | 0c80b01f4724922a95d22fc441d6854da001c442 (diff) | |
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/configuration.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_configuration.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index bd164a08e9..02bbcaca23 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -19,7 +19,7 @@ #ifndef __ardour_configuration_h__ #define __ardour_configuration_h__ - +#include <boost/function.hpp> #include "pbd/stateful.h" #include "ardour/configuration_variable.h" @@ -33,7 +33,7 @@ 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; diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h index 555c925a01..ad31aac44e 100644 --- a/libs/ardour/ardour/rc_configuration.h +++ b/libs/ardour/ardour/rc_configuration.h @@ -36,7 +36,7 @@ class RCConfiguration : public Configuration public: RCConfiguration(); - void map_parameters (sigc::slot<void, std::string>); + void map_parameters (boost::function<void (std::string)>&); int set_state (XMLNode const &, int version); XMLNode& get_state (); XMLNode& get_variables (); diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h index 20df86ca4d..d19c28f0cb 100644 --- a/libs/ardour/ardour/session_configuration.h +++ b/libs/ardour/ardour/session_configuration.h @@ -29,7 +29,7 @@ class SessionConfiguration : public Configuration public: SessionConfiguration (); - void map_parameters (sigc::slot<void, std::string>); + void map_parameters (boost::function<void (std::string)>&); int set_state (XMLNode const &, int version); XMLNode& get_state (); XMLNode& get_variables (); |