, _latency_history_count (0)
, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
, _outline_content (false)
- , _eyes (EYES_LEFT)
, _pad_black (false)
#ifdef DCPOMATIC_VARIANT_SWAROOP
, _background_image (false)
#endif
- , _gets (0)
, _idle_get (false)
{
switch (Config::instance()->video_view_type()) {
if (!_film) {
_player.reset ();
recreate_butler ();
- refresh_view ();
+ _video_view->update ();
return;
}
resume ();
}
-void
-FilmViewer::refresh_view ()
-{
- _video_view->update ();
-}
-
void
FilmViewer::set_outline_content (bool o)
{
_outline_content = o;
- refresh_view ();
+ _video_view->update ();
}
void
FilmViewer::set_eyes (Eyes e)
{
- _eyes = e;
+ _video_view->set_eyes (e);
slow_refresh ();
}
void
FilmViewer::resume ()
{
+ DCPOMATIC_ASSERT (_suspended > 0);
--_suspended;
if (_playing && !_suspended) {
if (_audio.isStreamOpen()) {
_playing = false;
_video_view->stop ();
Stopped (position());
+
+ _video_view->rethrow ();
return true;
}
recreate_butler ();
} else if (p == Film::VIDEO_FRAME_RATE) {
_video_view->set_video_frame_rate (_film->video_frame_rate());
+ } else if (p == Film::THREE_D) {
+ _video_view->set_three_d (_film->three_d());
}
}
bool
FilmViewer::quick_refresh ()
{
- if (!_video_view->_player_video.first) {
- return false;
- }
-
- if (!_video_view->_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
- return false;
+ if (!_video_view || !_film) {
+ return true;
}
-
- _video_view->display_player_video ();
- return true;
+ return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
}
void
{
#ifdef DCPOMATIC_VARIANT_SWAROOP
if (p == Config::PLAYER_BACKGROUND_IMAGE) {
- refresh_view ();
+ _video_view->update ();
return;
}
#endif
_pad_black = p;
}
-/* May be called from a non-UI thread */
+/** Called when a player has finished the current film.
+ * May be called from a non-UI thread.
+ */
+void
+FilmViewer::finished ()
+{
+ emit (boost::bind(&FilmViewer::ui_finished, this));
+}
+
+/** Called by finished() in the UI thread */
void
-FilmViewer::emit_finished ()
+FilmViewer::ui_finished ()
{
- emit (boost::bind(boost::ref(Finished)));
+ stop ();
+ Finished ();
}
int
return _video_view->dropped ();
}
+int
+FilmViewer::gets () const
+{
+ return _video_view->gets ();
+}
+
+