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 ee14f4a33523a6d428f2bbd0e633eabf595a4b99..4edc2cd23a28cf0f3b943fe3a9d6cb409fecd973 100644 (file)
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -22,8 +22,10 @@
 #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)
@@ -60,7 +62,9 @@ VideoView::get_next_frame (bool non_blocking)
        }
 
        shared_ptr<Butler> butler = _viewer->butler ();
-       DCPOMATIC_ASSERT (butler);
+       if (!butler) {
+               return false;
+       }
        add_get ();
 
        boost::mutex::scoped_lock lm (_mutex);
@@ -87,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();
@@ -110,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;
+}
+