Fix crash on using delay; fix x-thread GUI access caused by FilmState default copy...

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index c42ffaeebeb348f8d4a6068ecabf92e92620225f..5262338332e7073884b37bbc398c9d007eb057ca 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -26,7 +26,6 @@
 #include "lib/film.h"
 #include "lib/format.h"
 #include "lib/util.h"
-#include "lib/thumbs_job.h"
 #include "lib/job_manager.h"
 #include "lib/film_state.h"
 #include "lib/options.h"
@@ -50,7 +49,7 @@ public:
        /** Handle a paint event */
        void paint_event (wxPaintEvent& ev)
        {
-               if (!_film || _film->num_thumbs() == 0) {
+               if (!_film || _film->thumbs().size() == 0) {
                        wxPaintDC dc (this);
                        return;
                }
@@ -143,12 +142,14 @@ private:
                int vw, vh;
                GetSize (&vw, &vh);
 
+               Crop const fc = _film->crop ();
+
                /* Cropped rectangle */
-               Rectangle cropped_area (
-                       _film->crop().left,
-                       _film->crop().top,
-                       _image->GetWidth() - (_film->crop().left + _film->crop().right),
-                       _image->GetHeight() - (_film->crop().top + _film->crop().bottom)
+               Rect cropped_area (
+                       fc.left,
+                       fc.top,
+                       _image->GetWidth() - (fc.left + fc.right),
+                       _image->GetHeight() - (fc.top + fc.bottom)
                        );
 
                /* Target ratio */
@@ -181,8 +182,8 @@ private:
 
                        _subtitle->transformed_image = _subtitle->base_image;
                        _subtitle->transformed_image.Rescale (_subtitle->transformed_area.width, _subtitle->transformed_area.height, wxIMAGE_QUALITY_HIGH);
-                       _subtitle->transformed_area.x -= _film->crop().left;
-                       _subtitle->transformed_area.y -= _film->crop().top;
+                       _subtitle->transformed_area.x -= rint (_film->crop().left * x_scale);
+                       _subtitle->transformed_area.y -= rint (_film->crop().top * y_scale);
                        _subtitle->bitmap.reset (new wxBitmap (_subtitle->transformed_image));
                }
        }
@@ -207,8 +208,8 @@ private:
                        base_area.height = base_image.GetHeight ();
                }
 
-               Rectangle base_area;
-               Rectangle transformed_area;
+               Rect base_area;
+               Rect transformed_area;
                wxImage base_image;
                wxImage transformed_image;
                shared_ptr<wxBitmap> bitmap;
@@ -232,8 +233,8 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
        _thumb_panel = new ThumbPanel (this, f);
        _sizer->Add (_thumb_panel, 1, wxEXPAND);
 
-       int const max = f ? f->num_thumbs() - 1 : 0;
-       _slider = new wxSlider (this, wxID_ANY, 0, 0, max);
+       int const m = max ((size_t) 1, f ? f->thumbs().size() - 1 : 0);
+       _slider = new wxSlider (this, wxID_ANY, 0, 0, m);
        _sizer->Add (_slider, 0, wxEXPAND | wxLEFT | wxRIGHT);
        set_thumbnail (0);
 
@@ -245,7 +246,7 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
 void
 FilmViewer::set_thumbnail (int n)
 {
-       if (_film == 0 || _film->num_thumbs() <= n) {
+       if (_film == 0 || int (_film->thumbs().size()) <= n) {
                return;
        }
 
@@ -259,12 +260,14 @@ FilmViewer::slider_changed (wxCommandEvent &)
 }
 
 void
-FilmViewer::film_changed (Film::Property p)
+FilmViewer::film_changed (FilmState::Property p)
 {
+       ensure_ui_thread ();
+       
        switch (p) {
-       case Film::THUMBS:
-               if (_film && _film->num_thumbs() > 1) {
-                       _slider->SetRange (0, _film->num_thumbs () - 1);
+       case FilmState::THUMBS:
+               if (_film && _film->thumbs().size() > 1) {
+                       _slider->SetRange (0, _film->thumbs().size() - 1);
                } else {
                        _thumb_panel->clear ();
                        _slider->SetRange (0, 1);
@@ -273,16 +276,14 @@ FilmViewer::film_changed (Film::Property p)
                _slider->SetValue (0);
                set_thumbnail (0);
                break;
-       case Film::CONTENT:
+       case FilmState::CONTENT:
                setup_visibility ();
-               _film->examine_content ();
-               update_thumbs ();
                break;
-       case Film::CROP:
-       case Film::FORMAT:
-       case Film::WITH_SUBTITLES:
-       case Film::SUBTITLE_OFFSET:
-       case Film::SUBTITLE_SCALE:
+       case FilmState::CROP:
+       case FilmState::FORMAT:
+       case FilmState::WITH_SUBTITLES:
+       case FilmState::SUBTITLE_OFFSET:
+       case FilmState::SUBTITLE_SCALE:
                _thumb_panel->recompose ();
                break;
        default:
@@ -310,28 +311,6 @@ FilmViewer::set_film (Film* f)
        setup_visibility ();
 }
 
-void
-FilmViewer::update_thumbs ()
-{
-       if (!_film) {
-               return;
-       }
-
-       _film->update_thumbs_pre_gui ();
-
-       shared_ptr<const FilmState> s = _film->state_copy ();
-       shared_ptr<Options> o (new Options (s->dir ("thumbs"), ".png", ""));
-       o->out_size = _film->size ();
-       o->apply_crop = false;
-       o->decode_audio = false;
-       o->decode_video_frequency = 128;
-       o->decode_subtitles = true;
-       
-       shared_ptr<Job> j (new ThumbsJob (s, o, _film->log(), shared_ptr<Job> ()));
-       j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui));
-       JobManager::instance()->add (j);
-}
-
 void
 FilmViewer::setup_visibility ()
 {