diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-14 08:33:23 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-14 08:33:23 -0400 |
| commit | 09ed9c44e7988067796da2febeb7a5edf1282f93 (patch) | |
| tree | 47173b4e4ea2492a1907f439a678c1683bdcada9 /libs/pbd/pbd | |
| parent | f77d1e0a36337f39937a14bec1a8822c4888d359 (diff) | |
change PBD::Transmitter code to use PBD::Signal<> not sigc::signal<>, since the latter is not thread safe
Diffstat (limited to 'libs/pbd/pbd')
| -rw-r--r-- | libs/pbd/pbd/receiver.h | 2 | ||||
| -rw-r--r-- | libs/pbd/pbd/transmitter.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libs/pbd/pbd/receiver.h b/libs/pbd/pbd/receiver.h index e7f3f25b0b..2f44deb93f 100644 --- a/libs/pbd/pbd/receiver.h +++ b/libs/pbd/pbd/receiver.h @@ -42,7 +42,7 @@ class LIBPBD_API Receiver : public sigc::trackable virtual void receive (Transmitter::Channel, const char *) = 0; private: - std::vector<sigc::connection *> connections; + PBD::ScopedConnectionList connections; }; #endif // __libmisc_receiver_h__ diff --git a/libs/pbd/pbd/transmitter.h b/libs/pbd/pbd/transmitter.h index a765f9e370..47ab9c7e3e 100644 --- a/libs/pbd/pbd/transmitter.h +++ b/libs/pbd/pbd/transmitter.h @@ -23,7 +23,7 @@ #include <sstream> #include <iostream> -#include <sigc++/sigc++.h> +#include <pbd/signals.h> #include "pbd/libpbd_visibility.h" @@ -41,7 +41,7 @@ class LIBPBD_API Transmitter : public std::stringstream Transmitter (Channel); - sigc::signal<void,Channel, const char *> &sender() { + PBD::Signal2<void,Channel, const char *> &sender() { return *send; } @@ -53,12 +53,12 @@ class LIBPBD_API Transmitter : public std::stringstream private: Channel channel; - sigc::signal<void, Channel, const char *> *send; + PBD::Signal2<void, Channel, const char *> *send; - sigc::signal<void, Channel, const char *> info; - sigc::signal<void, Channel, const char *> warning; - sigc::signal<void, Channel, const char *> error; - sigc::signal<void, Channel, const char *> fatal; + PBD::Signal2<void, Channel, const char *> info; + PBD::Signal2<void, Channel, const char *> warning; + PBD::Signal2<void, Channel, const char *> error; + PBD::Signal2<void, Channel, const char *> fatal; }; /* for EGCS 2.91.66, if this function is not compiled within the same |