Don't busy-wait when there's nothing to play.

[dcpomatic.git] / src / wx / video_view.cc

diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index d54487a937f9c70f7f01e1038359d3db24c4b85e..4edc2cd23a28cf0f3b943fe3a9d6cb409fecd973 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -22,14 +22,22 @@
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/butler.h"
+#include <boost/optional.hpp>
+
+using boost::shared_ptr;
+using boost::optional;
 
 VideoView::VideoView (FilmViewer* viewer)
        : _viewer (viewer)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        , _in_watermark (false)
 #endif
+       , _state_timer ("viewer")
        , _video_frame_rate (0)
+       , _eyes (EYES_LEFT)
+       , _three_d (false)
        , _dropped (0)
+       , _gets (0)
 {
 
 }
@@ -42,31 +50,35 @@ VideoView::clear ()
        _player_video.second = dcpomatic::DCPTime ();
 }
 
-/** @param non_blocking true to return false quickly if no video is available quickly.
+/** Could be called from any thread.
+ *  @param non_blocking true to return false quickly if no video is available quickly.
  *  @return false if we gave up because it would take too long, otherwise true.
  */
 bool
 VideoView::get_next_frame (bool non_blocking)
 {
-       if (_length == dcpomatic::DCPTime()) {
+       if (length() == dcpomatic::DCPTime()) {
                return true;
        }
 
-       DCPOMATIC_ASSERT (_viewer->butler());
-       _viewer->_gets++;
+       shared_ptr<Butler> butler = _viewer->butler ();
+       if (!butler) {
+               return false;
+       }
+       add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);
 
        do {
                Butler::Error e;
-               _player_video = _viewer->butler()->get_video (!non_blocking, &e);
+               _player_video = butler->get_video (!non_blocking, &e);
                if (!_player_video.first && e == Butler::AGAIN) {
                        return false;
                }
        } while (
                _player_video.first &&
-               _viewer->film()->three_d() &&
-               _viewer->_eyes != _player_video.first->eyes() &&
+               _three_d &&
+               _eyes != _player_video.first->eyes() &&
                _player_video.first->eyes() != EYES_BOTH
                );
 
@@ -79,13 +91,13 @@ VideoView::one_video_frame () const
        return dcpomatic::DCPTime::from_frames (1, video_frame_rate());
 }
 
-/** @return Time in ms until the next frame is due */
-int
+/** @return Time in ms until the next frame is due, or empty if nothing is due */
+optional<int>
 VideoView::time_until_next_frame () const
 {
        if (length() == dcpomatic::DCPTime()) {
                /* There's no content, so this doesn't matter */
-               return 0;
+               return optional<int>();
        }
 
        dcpomatic::DCPTime const next = position() + one_video_frame();
@@ -102,3 +114,20 @@ VideoView::start ()
        boost::mutex::scoped_lock lm (_mutex);
        _dropped = 0;
 }
+
+bool
+VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       if (!_player_video.first) {
+               return false;
+       }
+
+       if (!_player_video.first->reset_metadata (film, video_container_size, film_frame_size)) {
+               return false;
+       }
+
+       update ();
+       return true;
+}
+