summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-09 21:58:05 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-09 21:58:05 +0100
commitb03b2c447a8ed9f855d09a62609ca03cc705fdbf (patch)
tree15d75eea623a42d8aea0842e1c093811723ccc85 /src/lib
parent892bcd1e98f6d533ce530deb11eb7a01b1f2f09a (diff)
Fix some POSIX-isms.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/j2k_wav_encoder.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc
index 2f892948d..a1f70a08a 100644
--- a/src/lib/j2k_wav_encoder.cc
+++ b/src/lib/j2k_wav_encoder.cc
@@ -149,7 +149,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server)
while (1) {
- TIMING ("encoder thread %1 sleeps", pthread_self ());
+ TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id());
boost::mutex::scoped_lock lock (_worker_mutex);
while (_queue.empty () && !_process_end) {
_worker_condition.wait (lock);
@@ -159,9 +159,9 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server)
return;
}
- TIMING ("encoder thread %1 wakes with queue of %2", pthread_self(), _queue.size());
+ TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
- _log->log (String::compose ("Encoder thread %1 pops frame %2 from queue", pthread_self(), vf->frame()));
+ _log->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()));
_queue.pop_front ();
lock.unlock ();
@@ -193,9 +193,9 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server)
} else {
try {
- TIMING ("encoder thread %1 begins local encode of %2", pthread_self(), vf->frame());
+ TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame());
encoded = vf->encode_locally ();
- TIMING ("encoder thread %1 finishes local encode of %2", pthread_self(), vf->frame());
+ TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame());
} catch (std::exception& e) {
_log->log (String::compose ("Local encode failed (%1)", e.what ()));
}
@@ -206,7 +206,7 @@ J2KWAVEncoder::encoder_thread (ServerDescription* server)
frame_done (vf->frame ());
} else {
lock.lock ();
- _log->log (String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", pthread_self(), vf->frame()));
+ _log->log (String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame()));
_queue.push_front (vf);
lock.unlock ();
}