Keep current frame visible when trimming start. Don't trim the current

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ead1cf9aee227717d26413ada1071c4e4ff16182..e3f76cbc75960ea94ca3f1218c09b29c61b329ed 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -70,6 +70,7 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
        , _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
        , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
+       , _ignore_player_changes (false)
        , _last_get_accurate (true)
 {
 #ifndef __WXOSX__
@@ -431,7 +432,7 @@ FilmViewer::forward_clicked ()
 void
 FilmViewer::player_changed (bool frequent)
 {
-       if (frequent) {
+       if (frequent || _ignore_player_changes) {
                return;
        }
 
@@ -469,3 +470,18 @@ FilmViewer::refresh ()
 {
        get (_position, _last_get_accurate);
 }
+
+void
+FilmViewer::set_position (DCPTime p)
+{
+       _position = p;
+       get (_position, true);
+       update_position_label ();
+       update_position_slider ();
+}
+
+void
+FilmViewer::set_ignore_player_changes (bool i)
+{
+       _ignore_player_changes = i;
+}