X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=25665325dd34933d3d56f46ba6a94b9a156164fa;hp=b7227b59dfcca50a8e4a98ac11ee3cf8b75f8130;hb=c5f67166138c3849cc49f1223742343ce4b11b9f;hpb=1e76e9d06cb86cc7a29e5603097d74ab0057057f diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index b7227b59d..25665325d 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -44,6 +44,7 @@ #include "lib/log.h" #include "lib/config.h" #include "lib/compose.hpp" +#include "lib/dcpomatic_log.h" extern "C" { #include } @@ -83,12 +84,13 @@ FilmViewer::FilmViewer (wxWindow* p) , _playing (false) , _latency_history_count (0) , _dropped (0) - , _closed_captions_dialog (new ClosedCaptionsDialog(p)) + , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) , _outline_content (false) , _eyes (EYES_LEFT) , _pad_black (false) #ifdef DCPOMATIC_VARIANT_SWAROOP , _in_watermark (false) + , _background_image (false) #endif { #ifndef __WXOSX__ @@ -121,8 +123,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 (); @@ -141,7 +144,7 @@ FilmViewer::set_film (shared_ptr film) if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); } - } catch (bad_alloc) { + } catch (bad_alloc &) { error_dialog (_panel, _("There is not enough free memory to do that.")); _film.reset (); return; @@ -198,7 +201,7 @@ FilmViewer::recreate_butler () _butler->disable_audio (); } - _closed_captions_dialog->set_butler (_butler); + _closed_captions_dialog->set_film_and_butler (_film, _butler); if (was_running) { start (); @@ -227,10 +230,15 @@ FilmViewer::get () } while ( _player_video.first && _film->three_d() && - (_eyes != _player_video.first->eyes()) + _eyes != _player_video.first->eyes() && + _player_video.first->eyes() != EYES_BOTH ); - _butler->rethrow (); + try { + _butler->rethrow (); + } catch (DecodeError& e) { + error_dialog (_video_view->get(), e.what()); + } display_player_video (); } @@ -297,8 +305,11 @@ FilmViewer::timer () if (next >= _film->length()) { stop (); + Finished (); + return; } + LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0)); _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); if (_butler) { @@ -307,9 +318,9 @@ FilmViewer::timer () } bool +#ifdef DCPOMATIC_VARIANT_SWAROOP 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())); @@ -317,50 +328,58 @@ FilmViewer::maybe_draw_background_image (wxPaintDC& dc) 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; } +#else +FilmViewer::maybe_draw_background_image (wxPaintDC &) +{ + return false; +} +#endif void FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (_background_image) { dc.Clear (); maybe_draw_background_image (dc); return; } +#endif - if (_video_position == DCPTime() && maybe_draw_background_image (dc)) { - return; - } + if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) { + dc.Clear (); + } else { - wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); - wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); + wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); + wxBitmap frame_bitmap (frame); + dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); #ifdef DCPOMATIC_VARIANT_SWAROOP - 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; + 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; } - 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) { /* XXX: these colours are right for GNOME; may need adjusting for other OS */ @@ -378,7 +397,7 @@ FilmViewer::paint_panel () 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 + 1, _panel_size.width, gap); + dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap + 1); } if (_outline_content) { @@ -600,7 +619,6 @@ FilmViewer::seek (DCPTime t, bool accurate) } PositionChanged (); - Seeked (position()); } void @@ -638,7 +656,6 @@ FilmViewer::config_changed (Config::Property p) } _audio_channels = _audio.getDeviceInfo(st).outputChannels; - cout << "RtAudio reports " << _audio_channels << " channels.\n"; RtAudio::StreamParameters sp; sp.deviceId = st;