X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Ftransmitter.h;h=47ab9c7e3e92ffcf034d069295f79bdc3f3553ce;hb=6180c5a5fc9a663858d12c31a6783e12f02bfcba;hp=d77fca8da32a4c67f38fdf4420cb127b6a824a21;hpb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;p=ardour.git diff --git a/libs/pbd/pbd/transmitter.h b/libs/pbd/pbd/transmitter.h index d77fca8da3..47ab9c7e3e 100644 --- a/libs/pbd/pbd/transmitter.h +++ b/libs/pbd/pbd/transmitter.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-99 Paul Barton-Davis + Copyright (C) 1998-99 Paul Barton-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 @@ -23,7 +23,7 @@ #include #include -#include +#include #include "pbd/libpbd_visibility.h" @@ -41,7 +41,7 @@ class LIBPBD_API Transmitter : public std::stringstream Transmitter (Channel); - sigc::signal &sender() { + PBD::Signal2 &sender() { return *send; } @@ -53,16 +53,16 @@ class LIBPBD_API Transmitter : public std::stringstream private: Channel channel; - sigc::signal *send; + PBD::Signal2 *send; - sigc::signal info; - sigc::signal warning; - sigc::signal error; - sigc::signal fatal; + PBD::Signal2 info; + PBD::Signal2 warning; + PBD::Signal2 error; + PBD::Signal2 fatal; }; /* for EGCS 2.91.66, if this function is not compiled within the same - compilation unit as the one where a ThrownError is thrown, then + compilation unit as the one where a ThrownError is thrown, then nothing will catch the error. This is a pretty small function, so inlining it here seems like a reasonable workaround. */ @@ -94,7 +94,7 @@ endmsg (std::ostream &ostr) /* hmm. not a Transmitter, so just put a newline on it and assume that that will be enough. */ - + ostr << std::endl; }