std::shared_ptr

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

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index d68ea48ddf679c38c818e8394e00004882ca4620..342829471701f31bdee469a73ffd956d4e4a6dca 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -27,14 +27,18 @@
 #include "lib/butler.h"
 #include <dcp/util.h>
 #include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::max;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
        : VideoView (viewer)
 {
@@ -62,19 +66,6 @@ SimpleVideoView::paint ()
        dcp::Size const out_size = _viewer->out_size ();
        wxSize const panel_size = _panel->GetSize ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (_viewer->background_image()) {
-               dc.Clear ();
-               optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
-               if (bg) {
-                       wxImage image (std_to_wx(bg->string()));
-                       wxBitmap bitmap (image);
-                       dc.DrawBitmap (bitmap, max(0, (panel_size.GetWidth() - image.GetSize().GetWidth()) / 2), max(0, (panel_size.GetHeight() - image.GetSize().GetHeight()) / 2));
-               }
-               return;
-       }
-#endif
-
        if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
                dc.Clear ();
        } else {
@@ -82,27 +73,6 @@ SimpleVideoView::paint ()
                wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
                wxBitmap frame_bitmap (frame);
                dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
-               int64_t n = position().get() / period.get();
-               DCPTime from(n * period.get());
-               DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
-               if (from <= position() && position() <= to) {
-                       if (!_in_watermark) {
-                               _in_watermark = true;
-                               _watermark_x = rand() % panel_size.GetWidth();
-                               _watermark_y = rand() % panel_size.GetHeight();
-                       }
-                       dc.SetTextForeground(*wxWHITE);
-                       string wm = Config::instance()->player_watermark_theatre();
-                       boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
-                       wm += "\n" + boost::posix_time::to_iso_extended_string(t);
-                       dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
-               } else {
-                       _in_watermark = false;
-               }
-#endif
        }
 
        if (out_size.width < panel_size.GetWidth()) {
@@ -186,19 +156,12 @@ SimpleVideoView::start ()
  *  false to ask the butler to block until it has video (unless it is suspended).
  *  @return true on success, false if we did nothing because it would have taken too long.
  */
-bool
+VideoView::NextFrameResult
 SimpleVideoView::display_next_frame (bool non_blocking)
 {
-       bool r = get_next_frame (non_blocking);
-       if (!r) {
-               if (non_blocking) {
-                       /* No video available; return saying we failed */
-                       return false;
-               } else {
-                       /* Player was suspended; come back later */
-                       signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
-                       return false;
-               }
+       NextFrameResult const r = get_next_frame (non_blocking);
+       if (r != SUCCESS) {
+               return r;
        }
 
        update ();
@@ -209,7 +172,7 @@ SimpleVideoView::display_next_frame (bool non_blocking)
                error_dialog (get(), e.what());
        }
 
-       return true;
+       return SUCCESS;
 }
 
 void
@@ -250,11 +213,11 @@ SimpleVideoView::update ()
        _state_timer.set ("get image");
 
        set_image (
-               player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+               player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)
                );
 
        _state_timer.set ("ImageChanged");
-       _viewer->ImageChanged (player_video().first);
+       _viewer->image_changed (player_video().first);
        _state_timer.unset ();
 
        _inter_position = player_video().first->inter_position ();