Merge master.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e685b7b353564a3e6b6c81f9b318edb7855f19c8..a40a3c78df34b2892b5de52bed3e40aab28f888d 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -51,13 +51,13 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        : wxPanel (p)
        , _panel (new wxPanel (this))
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
-       , _play_button (new wxToggleButton (this, wxID_ANY, wxT ("Play")))
+       , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
        , _display_frame_x (0)
        , _got_frame (false)
        , _clear_required (false)
 {
        _panel->SetDoubleBuffered (true);
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9       
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
        _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
 #endif 
        
@@ -101,7 +101,14 @@ FilmViewer::film_changed (Film::Property p)
                o.decode_audio = false;
                o.decode_subtitles = true;
                o.video_sync = false;
-               _decoders = decoder_factory (_film, o);
+
+               try {
+                       _decoders = decoder_factory (_film, o);
+               } catch (StringError& e) {
+                       error_dialog (this, wxString::Format (_("Could not open content file (%s)"), e.what()));
+                       return;
+               }
+               
                if (_decoders.video == 0) {
                        break;
                }
@@ -149,7 +156,6 @@ FilmViewer::set_film (shared_ptr<Film> f)
        _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
        film_changed (Film::CONTENT);
-       film_changed (Film::CROP);
        film_changed (Film::FORMAT);
        film_changed (Film::WITH_SUBTITLES);
        film_changed (Film::SUBTITLE_OFFSET);
@@ -182,7 +188,7 @@ FilmViewer::timer (wxTimerEvent &)
        get_frame ();
 
        if (_film->length()) {
-               int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->frames_per_second());
+               int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
                if (new_slider_position != _slider->GetValue()) {
                        _slider->SetValue (new_slider_position);
                }
@@ -209,7 +215,7 @@ FilmViewer::paint_panel (wxPaintEvent &)
                dc.SetPen(*wxBLACK_PEN);
                dc.SetBrush(*wxBLACK_BRUSH);
                dc.DrawRectangle (0, 0, _display_frame_x, _film_size.height);
-               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x * 2 + _film_size.width, _film_size.height);
+               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x, _film_size.height);
        }
 
        wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true);
@@ -231,7 +237,7 @@ FilmViewer::slider_moved (wxScrollEvent &)
                return;
        }
        
-       if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->frames_per_second()))) {
+       if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
                return;
        }
        
@@ -289,9 +295,16 @@ FilmViewer::raw_to_display ()
        }
 
        if (_raw_sub) {
+
+               /* Our output is already cropped by the decoder, so we need to account for that
+                  when working out the scale that we are applying.
+               */
+
+               Size const cropped_size = _film->cropped_size (_film->size ());
+
                Rect tx = subtitle_transformed_area (
-                       float (_film_size.width) / _film->size().width,
-                       float (_film_size.height) / _film->size().height,
+                       float (_film_size.width) / cropped_size.width,
+                       float (_film_size.height) / cropped_size.height,
                        _raw_sub->area(), _film->subtitle_offset(), _film->subtitle_scale()
                        );
                
@@ -356,7 +369,7 @@ FilmViewer::check_play_state ()
        }
        
        if (_play_button->GetValue()) {
-               _timer.Start (1000 / _film->frames_per_second());
+               _timer.Start (1000 / _film->source_frame_rate());
        } else {
                _timer.Stop ();
        }