{
_player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
_player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2));
- _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3));
- _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3));
+ _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3, _4));
+ /* The butler must hear about things first, otherwise it might not sort out suspensions in time for
+ get_video() to be called in response to this signal.
+ */
+ _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3), boost::signals2::at_front);
_thread = new boost::thread (bind (&Butler::thread, this));
#ifdef DCPOMATIC_LINUX
pthread_setname_np (_thread->native_handle(), "butler");
multi-thread JPEG2000 decoding.
*/
- LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency());
+ if (_log) {
+ LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency());
+ }
+
for (size_t i = 0; i < boost::thread::hardware_concurrency(); ++i) {
_prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service));
}
(__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()));
}
- if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) {
+ if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2 && _log) {
LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size());
}
- if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2) {
+ if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2 && _log) {
LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size());
}
}
pair<shared_ptr<PlayerVideo>, DCPTime>
-Butler::get_video ()
+Butler::get_video (Error* e)
{
boost::mutex::scoped_lock lm (_mutex);
+ if (_suspended) {
+ if (e) {
+ *e = AGAIN;
+ }
+ return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
+ }
+
/* Wait for data if we have none */
- while (_video.empty() && !_finished && !_died && !_suspended) {
+ while (_video.empty() && !_finished && !_died) {
_arrived.wait (lm);
}
if (_video.empty()) {
- return make_pair (shared_ptr<PlayerVideo>(), DCPTime());
+ if (e) {
+ *e = NONE;
+ }
+ return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
}
pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get ();
return r;
}
-optional<pair<PlayerText, DCPTimePeriod> >
+optional<TextRingBuffers::Data>
Butler::get_closed_caption ()
{
boost::mutex::scoped_lock lm (_mutex);
shared_ptr<PlayerVideo> video = weak_video.lock ();
/* If the weak_ptr cannot be locked the video obviously no longer requires any work */
if (video) {
- LOG_TIMING("start-prepare in %1", thread_id());
+ if (_log) {
+ LOG_TIMING("start-prepare in %1", thread_id());
+ }
+
video->prepare ();
- LOG_TIMING("finish-prepare in %1", thread_id());
+
+ if (_log) {
+ LOG_TIMING("finish-prepare in %1", thread_id());
+ }
}
}
{
boost::mutex::scoped_lock lm (_mutex);
- if (_pending_seek_position || _suspended) {
- /* Don't store any video in these cases */
+ if (_pending_seek_position) {
+ /* Don't store any video in this case */
return;
}
{
{
boost::mutex::scoped_lock lm (_mutex);
- if (_pending_seek_position || _disable_audio || _suspended) {
+ if (_pending_seek_position || _disable_audio) {
/* Don't store any audio in these cases */
return;
}
} else if (type == CHANGE_TYPE_DONE) {
--_suspended;
if (_died || _pending_seek_position || frequent) {
+ lm.unlock ();
+ _summon.notify_all ();
return;
}
} else if (type == CHANGE_TYPE_CANCELLED) {
--_suspended;
}
+
+ lm.unlock ();
+ _summon.notify_all ();
}
void
-Butler::text (PlayerText pt, TextType type, DCPTimePeriod period)
+Butler::text (PlayerText pt, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
{
if (type != TEXT_CLOSED_CAPTION) {
return;
}
+ DCPOMATIC_ASSERT (track);
+
boost::mutex::scoped_lock lm2 (_buffers_mutex);
- _closed_caption.put (make_pair(pt, period));
+ _closed_caption.put (pt, *track, period);
}