projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a bit more debug logging to the player.
[dcpomatic.git]
/
src
/
lib
/
butler.h
diff --git
a/src/lib/butler.h
b/src/lib/butler.h
index ea43374434f033a5becfebc13f2fce09a6436d5c..ce3c9ae4859be430633ba6b629edafe94bde79e3 100644
(file)
--- a/
src/lib/butler.h
+++ b/
src/lib/butler.h
@@
-73,7
+73,7
@@
private:
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
boost::shared_ptr<Player> _player;
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
boost::shared_ptr<Player> _player;
- boost::thread
*
_thread;
+ boost::thread _thread;
VideoRingBuffers _video;
AudioRingBuffers _audio;
VideoRingBuffers _video;
AudioRingBuffers _audio;
@@
-83,7
+83,7
@@
private:
boost::asio::io_service _prepare_service;
boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
boost::asio::io_service _prepare_service;
boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
- /** mutex to protect _pending_seek_position, _pending_seek_acurate, _finished, _died, _stop_thread */
+ /** mutex to protect _pending_seek_position, _pending_seek_ac
c
urate, _finished, _died, _stop_thread */
boost::mutex _mutex;
boost::condition _summon;
boost::condition _arrived;
boost::mutex _mutex;
boost::condition _summon;
boost::condition _arrived;