diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-16 20:14:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-16 21:51:15 +0100 |
| commit | 74a8d26a8907c6e00e29f054178a3425f44e38ed (patch) | |
| tree | fd700ba8471edcbd6e9e6481a3ca1397397a2d5d /src/lib/encoder.cc | |
| parent | c2909b61d360510241ef37abd255269bd8aa9526 (diff) | |
Very basics of colour conversion configuration.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 0c7434220..a1c024799 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -71,12 +71,12 @@ void Encoder::process_begin () { for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { - _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0))); + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, shared_ptr<ServerDescription> ()))); } - vector<ServerDescription*> servers = Config::instance()->servers (); + vector<shared_ptr<ServerDescription> > servers = Config::instance()->servers (); - for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) { + for (vector<shared_ptr<ServerDescription> >::iterator i = servers.begin(); i != servers.end(); ++i) { for (int j = 0; j < (*i)->threads (); ++j) { _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i))); } @@ -244,7 +244,7 @@ Encoder::terminate_threads () } void -Encoder::encoder_thread (ServerDescription* server) +Encoder::encoder_thread (shared_ptr<ServerDescription> server) { /* Number of seconds that we currently wait between attempts to connect to the server; not relevant for localhost |