#include <sstream>
#include <iostream>
-#include <sigc++/sigc++.h>
+#include <pbd/signals.h>
#include "pbd/libpbd_visibility.h"
Transmitter (Channel);
- sigc::signal<void,Channel, const char *> &sender() {
+ PBD::Signal2<void,Channel, const char *> &sender() {
return *send;
}
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
void
Receiver::hangup ()
{
- vector<sigc::connection *>::iterator i;
-
- for (i = connections.begin(); i != connections.end (); i++) {
- (*i)->disconnect ();
- delete *i;
- }
-
- connections.erase (connections.begin(), connections.end());
+ connections.drop_connections ();
}
void
Receiver::listen_to (Transmitter &transmitter)
{
- sigc::connection *c = new sigc::connection;
-
- (*c) = transmitter.sender().connect(mem_fun(*this, &Receiver::receive));
+ /* odd syntax here because boost's placeholders (_1, _2) are in an
+ anonymous namespace which causes ambiguity with sigc++ (and will also
+ do so with std::placeholder in the C++11 future
+ */
+ transmitter.sender().connect_same_thread (connections, boost::bind (&Receiver::receive, this, boost::arg<1>(), boost::arg<2>()));
- connections.push_back (c);
}