Add buttons to set trim from current playhead position (#372).

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a1cc5dfc4bd37dd1751523895291005069975909..bdbfc6c03ea780a6564a3a06b5c5e530ff81a2df 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -130,8 +130,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 
        _frame.reset ();
        
-       _slider->SetValue (0);
-       set_position_text ();
+       update_position ();
        
        if (!_film) {
                return;
@@ -144,10 +143,14 @@ FilmViewer::set_film (shared_ptr<Film> f)
                _film.reset ();
                return;
        }
+
+       /* Always burn in subtitles, even if we are set not to, otherwise we won't see them
+          in the preview.
+       */
+       _player->set_burn_subtitles (true);
        
        _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
-       _player->set_approximate_size ();
        _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
        calculate_sizes ();
@@ -209,7 +212,7 @@ FilmViewer::get (DCPTime p, bool accurate)
                _position = p;
        }
 
-       set_position_text ();
+       update_position ();
        refresh_panel ();
 
        _last_get_accurate = accurate;
@@ -219,18 +222,8 @@ void
 FilmViewer::timer ()
 {
        get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true);
-
-       DCPTime const len = _film->length ();
-
-       if (len.get ()) {
-               int const new_slider_position = 4096 * _position.get() / len.get();
-               if (new_slider_position != _slider->GetValue()) {
-                       _slider->SetValue (new_slider_position);
-               }
-       }
 }
 
-
 void
 FilmViewer::paint_panel ()
 {
@@ -320,13 +313,6 @@ FilmViewer::calculate_sizes ()
        _out_size.width = max (64, _out_size.width);
        _out_size.height = max (64, _out_size.height);
 
-       /* The player will round its image size down to the next lowest 4 pixels
-          to speed up its scale, so do similar here to avoid black borders
-          around things.  This is a bit of a hack.
-       */
-       _out_size.width &= ~3;
-       _out_size.height &= ~3;
-
        _player->set_video_container_size (_out_size);
 }
 
@@ -351,27 +337,28 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::set_position_text ()
+FilmViewer::update_position ()
 {
        if (!_film) {
+               _slider->SetValue (0);
                _frame_number->SetLabel ("0");
                _timecode->SetLabel ("0:0:0.0");
                return;
        }
+
+       DCPTime const len = _film->length ();
+
+       if (len.get ()) {
+               int const new_slider_position = 4096 * _position.get() / len.get();
+               if (new_slider_position != _slider->GetValue()) {
+                       _slider->SetValue (new_slider_position);
+               }
+       }
                
        double const fps = _film->video_frame_rate ();
        /* Count frame number from 1 ... not sure if this is the best idea */
        _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (_position.seconds() * fps)) + 1));
-       
-       double w = _position.seconds ();
-       int const h = (w / 3600);
-       w -= h * 3600;
-       int const m = (w / 60);
-       w -= m * 60;
-       int const s = floor (w);
-       w -= s;
-       int const f = rint (w * fps);
-       _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f));
+       _timecode->SetLabel (time_to_timecode (_position, fps));
 }
 
 void