X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=dd088db20fa2d59c0c201b0fdca3e260e64c7ba3;hb=4050a1278d1916719797d1cf2906a932d0d5f6c2;hp=0f18f2e722433d382513764362356aa971803c7c;hpb=2538ac5a15b56880438018c8ab17d8571fe76812;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 0f18f2e72..dd088db20 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -43,6 +43,7 @@ #include "lib/butler.h" #include "lib/log.h" #include "lib/config.h" +#include "lib/compose.hpp" extern "C" { #include } @@ -85,6 +86,10 @@ FilmViewer::FilmViewer (wxWindow* p) , _closed_captions_dialog (new ClosedCaptionsDialog(p)) , _outline_content (false) , _eyes (EYES_LEFT) + , _pad_black (false) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _in_watermark (false) +#endif { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); @@ -116,8 +121,9 @@ FilmViewer::set_film (shared_ptr film) } _film = film; - - FilmChanged (); + _video_position = DCPTime (); + _player_video.first.reset (); + _player_video.second = DCPTime (); _frame.reset (); _closed_captions_dialog->clear (); @@ -188,7 +194,7 @@ FilmViewer::recreate_butler () map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt } - _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); + _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); if (!Config::instance()->sound() && !_audio.isStreamOpen()) { _butler->disable_audio (); } @@ -262,15 +268,11 @@ FilmViewer::display_player_video () * The content's specified colour conversion indicates the colourspace * which the content is in (according to the user). * - * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source + * PlayerVideo::image (bound to PlayerVideo::force) will take the source * image and convert it (from whatever the user has said it is) to RGB. */ - _frame = _player_video.first->image ( - bind (&Log::dcp_log, _film->log().get(), _1, _2), - bind (&PlayerVideo::always_rgb, _1), - false, true - ); + _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true); ImageChanged (_player_video.first); @@ -296,6 +298,8 @@ FilmViewer::timer () if (next >= _film->length()) { stop (); + Finished (); + return; } _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); @@ -305,21 +309,35 @@ FilmViewer::timer () } } +bool +FilmViewer::maybe_draw_background_image (wxPaintDC& dc) +{ +#ifdef DCPOMATIC_VARIANT_SWAROOP + optional 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.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2)); + return true; + } +#endif + + return false; +} + void FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) { + if (!_out_size.width || !_out_size.height || !_frame || _out_size != _frame->size()) { dc.Clear (); -#ifdef DCPOMATIC_VARIANT_SWAROOP - optional 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.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2)); - } -#endif + return; + } + + if (!_film) { + dc.Clear (); + maybe_draw_background_image (dc); return; } @@ -328,32 +346,50 @@ FilmViewer::paint_panel () dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); #ifdef DCPOMATIC_VARIANT_SWAROOP - /* XXX: watermark */ + DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60); + int64_t n = _video_position.get() / period.get(); + DCPTime from(n * period.get()); + DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0); + if (from <= _video_position && _video_position <= to) { + if (!_in_watermark) { + _in_watermark = true; + _watermark_x = rand() % _panel_size.width; + _watermark_y = rand() % _panel_size.height; + } + 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.width) { - wxPen p (_panel->GetParent()->GetBackgroundColour()); - wxBrush b (_panel->GetParent()->GetBackgroundColour()); + /* XXX: these colours are right for GNOME; may need adjusting for other OS */ + wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); + wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); dc.SetPen (p); dc.SetBrush (b); dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height); } if (_out_size.height < _panel_size.height) { - wxPen p (_panel->GetParent()->GetBackgroundColour()); - wxBrush b (_panel->GetParent()->GetBackgroundColour()); + wxPen p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); + wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240)); dc.SetPen (p); dc.SetBrush (b); int const gap = (_panel_size.height - _out_size.height) / 2; dc.DrawRectangle (0, 0, _panel_size.width, gap); - dc.DrawRectangle (0, gap + _out_size.height, _panel_size.width, gap); + dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap); } if (_outline_content) { wxPen p (wxColour (255, 0, 0), 2); dc.SetPen (p); dc.SetBrush (*wxTRANSPARENT_BRUSH); - dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height); + dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height); } } @@ -512,7 +548,7 @@ FilmViewer::quick_refresh () return false; } - if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) { + if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { return false; } @@ -568,7 +604,6 @@ FilmViewer::seek (DCPTime t, bool accurate) } PositionChanged (); - Seeked (position()); } void @@ -724,3 +759,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate) { seek (_video_position + by, accurate); } + +void +FilmViewer::set_pad_black (bool p) +{ + _pad_black = p; +}