Various fixes.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a7f370f00188c8acc8a65dee722783ee8680c75e..9cf47950857d9d6ed6b30d5f439be395cceb21fe 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -28,13 +28,14 @@
 #include "lib/format.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
-#include "lib/options.h"
 #include "lib/subtitle.h"
 #include "lib/image.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
+#include "lib/playlist.h"
+#include "lib/video_content.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "video_decoder.h"
@@ -97,29 +98,10 @@ FilmViewer::film_changed (Film::Property p)
                break;
        case Film::CONTENT:
        {
-               DecodeOptions o;
-               o.decode_audio = false;
-               o.decode_subtitles = true;
-               o.video_sync = false;
-
-               try {
-                       _decoders = decoder_factory (_film, o);
-               } catch (StringError& e) {
-                       error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open content file (%1)")), e.what())));
-                       return;
-               }
-               
-               if (_decoders.video == 0) {
-                       break;
-               }
-               _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
-               _decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
-               _decoders.video->set_subtitle_stream (_film->subtitle_stream());
+               setup_player ();
                calculate_sizes ();
                get_frame ();
                _panel->Refresh ();
-               _slider->Show (_film->content_type() == VIDEO);
-               _play_button->Show (_film->content_type() == VIDEO);
                _v_sizer->Layout ();
                break;
        }
@@ -128,18 +110,36 @@ FilmViewer::film_changed (Film::Property p)
        case Film::SUBTITLE_SCALE:
        case Film::SCALER:
        case Film::FILTERS:
-               update_from_raw ();
-               break;
-       case Film::SUBTITLE_STREAM:
-               if (_decoders.video) {
-                       _decoders.video->set_subtitle_stream (_film->subtitle_stream ());
-               }
+       case Film::CROP:
+               update_from_decoder ();
                break;
        default:
                break;
        }
 }
 
+void
+FilmViewer::setup_player ()
+{
+       _player = _film->player ();
+       _player->disable_audio ();
+       _player->disable_subtitles ();
+       _player->disable_video_sync ();
+       _player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
+}
+
+void
+FilmViewer::film_content_changed (int p)
+{
+       if (p == VideoContentProperty::VIDEO_LENGTH || p == VideoContentProperty::VIDEO_SIZE) {
+               setup_player ();
+               calculate_sizes ();
+               get_frame ();
+               _panel->Refresh ();
+               _v_sizer->Layout ();
+       }
+}
+
 void
 FilmViewer::set_film (shared_ptr<Film> f)
 {
@@ -154,6 +154,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
        }
 
        _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+       _film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1));
 
        film_changed (Film::CONTENT);
        film_changed (Film::FORMAT);
@@ -164,9 +165,9 @@ FilmViewer::set_film (shared_ptr<Film> f)
 }
 
 void
-FilmViewer::decoder_changed ()
+FilmViewer::update_from_decoder ()
 {
-       if (_decoders.video == 0 || _decoders.video->seek_to_last ()) {
+       if (!_player || _player->seek_to_last ()) {
                return;
        }
 
@@ -178,7 +179,7 @@ FilmViewer::decoder_changed ()
 void
 FilmViewer::timer (wxTimerEvent &)
 {
-       if (!_film || !_decoders.video) {
+       if (!_player) {
                return;
        }
        
@@ -187,8 +188,8 @@ FilmViewer::timer (wxTimerEvent &)
 
        get_frame ();
 
-       if (_film->length()) {
-               int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
+       if (_film->video_length()) {
+               int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate());
                if (new_slider_position != _slider->GetValue()) {
                        _slider->SetValue (new_slider_position);
                }
@@ -233,11 +234,11 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-       if (!_film || !_film->length() || !_decoders.video) {
+       if (!_film || !_player) {
                return;
        }
-       
-       if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
+
+       if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
                return;
        }
        
@@ -300,7 +301,7 @@ FilmViewer::raw_to_display ()
                   when working out the scale that we are applying.
                */
 
-               Size const cropped_size = _film->cropped_size (_film->size ());
+               Size const cropped_size = _film->cropped_size (_film->video_size ());
 
                Rect tx = subtitle_transformed_area (
                        float (_film_size.width) / cropped_size.width,
@@ -319,7 +320,7 @@ FilmViewer::raw_to_display ()
 void
 FilmViewer::calculate_sizes ()
 {
-       if (!_film) {
+       if (!_film || !_player) {
                return;
        }
 
@@ -369,7 +370,7 @@ FilmViewer::check_play_state ()
        }
        
        if (_play_button->GetValue()) {
-               _timer.Start (1000 / _film->source_frame_rate());
+               _timer.Start (1000 / _film->video_frame_rate());
        } else {
                _timer.Stop ();
        }
@@ -386,13 +387,16 @@ FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
        _got_frame = true;
 }
 
+/** Get a new _raw_frame from the decoder and then do
+ *  raw_to_display ().
+ */
 void
 FilmViewer::get_frame ()
 {
        /* Clear our raw frame in case we don't get a new one */
        _raw_frame.reset ();
 
-       if (_decoders.video == 0) {
+       if (!_player) {
                _display_frame.reset ();
                return;
        }
@@ -400,7 +404,7 @@ FilmViewer::get_frame ()
        try {
                _got_frame = false;
                while (!_got_frame) {
-                       if (_decoders.video->pass ()) {
+                       if (_player->pass ()) {
                                /* We didn't get a frame before the decoder gave up,
                                   so clear our display frame.
                                */
@@ -411,7 +415,7 @@ FilmViewer::get_frame ()
        } catch (DecodeError& e) {
                _play_button->SetValue (false);
                check_play_state ();
-               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not decode video for view (%1)")), e.what())));
+               error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
        }
 }