diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
| commit | 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch) | |
| tree | d248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/ab_transcoder.cc | |
| parent | 977b36672892b14de4ecb68e98415c64946e8a93 (diff) | |
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
| -rw-r--r-- | src/lib/ab_transcoder.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc index 4f0ce0a71..beedd478f 100644 --- a/src/lib/ab_transcoder.cc +++ b/src/lib/ab_transcoder.cc @@ -19,7 +19,6 @@ #include <iostream> #include <boost/shared_ptr.hpp> -#include <sigc++/bind.h> #include "ab_transcoder.h" #include "film.h" #include "decoder.h" @@ -34,8 +33,8 @@ * for the right half (to facilitate A/B comparisons of settings) */ -using namespace std; -using namespace boost; +using std::string; +using boost::shared_ptr; /** @param a Film to use for the left half of the screen. * @param b Film to use for the right half of the screen. @@ -56,9 +55,9 @@ ABTranscoder::ABTranscoder ( _da = decoder_factory (_film_a, o, j); _db = decoder_factory (_film_b, o, j); - _da->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 0)); - _db->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 1)); - _da->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio)); + _da->Video.connect (bind (&ABTranscoder::process_video, this, _1, _2, _3, 0)); + _db->Video.connect (bind (&ABTranscoder::process_video, this, _1, _2, _3, 1)); + _da->Audio.connect (bind (&Encoder::process_audio, e, _1)); } ABTranscoder::~ABTranscoder () |