Give an error if 2D content is set to 3D (#1565). Also run

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index fee5605da9c3352193610325752a68dbe0ca03ba..25665325dd34933d3d56f46ba6a94b9a156164fa 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     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 <libavutil/pixfmt.h>
 }
@@ -83,7 +84,7 @@ 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)
@@ -200,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 ();
@@ -229,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 ();
 }
@@ -303,6 +309,7 @@ FilmViewer::timer ()
                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) {
@@ -346,33 +353,33 @@ FilmViewer::paint_panel ()
 
        if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
                dc.Clear ();
-               return;
-       }
+       } 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 */
@@ -390,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) {