diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-17 22:50:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-17 22:50:47 +0100 |
| commit | 1e8f1be709e8a3fa58f1147db2e58a39396313d8 (patch) | |
| tree | 1f86e375afbc1ec2a7e81ad48594bef7542bf71d /src/lib/j2k_wav_encoder.cc | |
| parent | d7135bda7b1db2ee2728c90ff4570c350834338f (diff) | |
Move server code into library; Server -> ServerDescription.
Diffstat (limited to 'src/lib/j2k_wav_encoder.cc')
| -rw-r--r-- | src/lib/j2k_wav_encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc index 2f29f9021..ff450d1ad 100644 --- a/src/lib/j2k_wav_encoder.cc +++ b/src/lib/j2k_wav_encoder.cc @@ -130,7 +130,7 @@ J2KWAVEncoder::process_video (shared_ptr<Image> yuv, int frame) } void -J2KWAVEncoder::encoder_thread (Server* server) +J2KWAVEncoder::encoder_thread (ServerDescription* server) { /* Number of seconds that we currently wait between attempts to connect to the server; not relevant for localhost @@ -210,12 +210,12 @@ void J2KWAVEncoder::process_begin () { for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { - _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, (Server *) 0))); + _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, (ServerDescription *) 0))); } - vector<Server*> servers = Config::instance()->servers (); + vector<ServerDescription*> servers = Config::instance()->servers (); - for (vector<Server*>::iterator i = servers.begin(); i != servers.end(); ++i) { + for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) { for (int j = 0; j < (*i)->threads (); ++j) { _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, *i))); } |