X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=90f8c9fd2d885c20c974c13eb96835ade8b6866f;hb=e81d3bb9857d9de7ec9468a3efcb812042f5cef9;hp=54de78f275dea0dc32d37de69d7ac03861f264b2;hpb=97201e626d697e7dff203b2ea4f4a2c268d98313;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 54de78f27..90f8c9fd2 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,7 @@ 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 @@ -119,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 (); @@ -191,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 (); } @@ -265,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); @@ -299,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); @@ -308,6 +309,22 @@ 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 () { @@ -315,14 +332,11 @@ FilmViewer::paint_panel () if (!_frame || !_film || !_out_size.width || !_out_size.height || _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 + maybe_draw_background_image (dc); + return; + } + + if (_video_position == DCPTime() && maybe_draw_background_image (dc)) { return; } @@ -342,35 +356,39 @@ FilmViewer::paint_panel () _watermark_y = rand() % _panel_size.height; } dc.SetTextForeground(*wxWHITE); - dc.DrawText(std_to_wx(Config::instance()->player_watermark_theatre()), _watermark_x, _watermark_y); + 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); } } @@ -529,7 +547,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; } @@ -741,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; +}