Try to tidy up behaviour of seek during playback in the preview;

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 60025a7de290dbebcdbdabc5bf1facea81d08767..b160d775388e08fca3caab87406c5675f6eacb35 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -80,6 +80,7 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye")))
        , _jump_to_selected (0)
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
+       , _rewind_button (new wxButton (this, wxID_ANY, wxT("|<")))
        , _back_button (new wxButton (this, wxID_ANY, wxT("<")))
        , _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
        , _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
@@ -87,7 +88,8 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
        , _coalesce_player_changes (false)
        , _pending_player_change (false)
-       , _last_seek_accurate (true)
+       , _slider_being_moved (false)
+       , _was_running_before_slider (false)
        , _audio (DCPOMATIC_RTAUDIO_API)
        , _audio_channels (0)
        , _audio_block_size (1024)
@@ -125,6 +127,7 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        time_sizer->Add (_frame_number, 0, wxEXPAND);
        time_sizer->Add (_timecode, 0, wxEXPAND);
 
+       h_sizer->Add (_rewind_button, 0, wxALL, 2);
        h_sizer->Add (_back_button, 0, wxALL, 2);
        h_sizer->Add (time_sizer, 0, wxEXPAND);
        h_sizer->Add (_forward_button, 0, wxALL, 2);
@@ -134,6 +137,7 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
 
        _frame_number->SetMinSize (wxSize (84, -1));
+       _rewind_button->SetMinSize (wxSize (32, -1));
        _back_button->SetMinSize (wxSize (32, -1));
        _forward_button->SetMinSize (wxSize (32, -1));
 
@@ -145,11 +149,12 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        _left_eye->Bind         (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::refresh,         this));
        _right_eye->Bind        (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::refresh,         this));
        _slider->Bind           (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved,    this, false));
-       _slider->Bind           (wxEVT_SCROLL_PAGEUP,     boost::bind (&FilmViewer::slider_moved,    this, false));
-       _slider->Bind           (wxEVT_SCROLL_PAGEDOWN,   boost::bind (&FilmViewer::slider_moved,    this, false));
-       _slider->Bind           (wxEVT_SCROLL_CHANGED,    boost::bind (&FilmViewer::slider_moved,    this, true));
+       _slider->Bind           (wxEVT_SCROLL_PAGEUP,     boost::bind (&FilmViewer::slider_moved,    this, true));
+       _slider->Bind           (wxEVT_SCROLL_PAGEDOWN,   boost::bind (&FilmViewer::slider_moved,    this, true));
+       _slider->Bind           (wxEVT_SCROLL_THUMBRELEASE, boost::bind (&FilmViewer::slider_released, this));
        _play_button->Bind      (wxEVT_TOGGLEBUTTON,      boost::bind (&FilmViewer::play_clicked,    this));
        _timer.Bind             (wxEVT_TIMER,             boost::bind (&FilmViewer::timer,           this));
+       _rewind_button->Bind    (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::rewind_clicked,  this, _1));
        _back_button->Bind      (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::back_clicked,    this, _1));
        _forward_button->Bind   (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::forward_clicked, this, _1));
        _frame_number->Bind     (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::frame_number_clicked, this));
@@ -191,6 +196,10 @@ FilmViewer::set_film (shared_ptr<Film> film)
        update_position_label ();
 
        if (!_film) {
+               _player.reset ();
+               recreate_butler ();
+               _frame.reset ();
+               refresh_panel ();
                return;
        }
 
@@ -253,7 +262,7 @@ FilmViewer::recreate_butler ()
        }
 
        _butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
-       if (!Config::instance()->sound()) {
+       if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
                _butler->disable_audio ();
        }
 
@@ -393,13 +402,19 @@ FilmViewer::paint_panel ()
        }
 }
 
+/** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */
 void
-FilmViewer::slider_moved (bool update_slider)
+FilmViewer::slider_moved (bool page)
 {
        if (!_film) {
                return;
        }
 
+       if (!page && !_slider_being_moved) {
+               /* This is the first event of a drag; stop playback for the duration of the drag */
+               _was_running_before_slider = stop ();
+               _slider_being_moved = true;
+       }
 
        DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
        /* Ensure that we hit the end of the film at the end of the slider */
@@ -408,9 +423,16 @@ FilmViewer::slider_moved (bool update_slider)
        }
        seek (t, false);
        update_position_label ();
-       if (update_slider) {
-               update_position_slider ();
+}
+
+void
+FilmViewer::slider_released ()
+{
+       if (_was_running_before_slider) {
+               /* Restart after a drag */
+               start ();
        }
+       _slider_being_moved = false;
 }
 
 void
@@ -485,13 +507,14 @@ FilmViewer::start ()
        _playing = true;
        _dropped = 0;
        timer ();
+       _play_button->SetValue (true);
 }
 
 bool
 FilmViewer::stop ()
 {
        if (_audio.isStreamRunning()) {
-               /* stop stream and discard any remainig queued samples */
+               /* stop stream and discard any remaining queued samples */
                _audio.abortStream ();
        }
 
@@ -578,6 +601,13 @@ FilmViewer::go_to (DCPTime t)
        update_position_slider ();
 }
 
+void
+FilmViewer::rewind_clicked (wxMouseEvent& ev)
+{
+       go_to(DCPTime());
+       ev.Skip();
+}
+
 void
 FilmViewer::back_clicked (wxMouseEvent& ev)
 {
@@ -616,6 +646,7 @@ FilmViewer::setup_sensitivity ()
        bool const c = _film && !_film->content().empty ();
 
        _slider->Enable (c);
+       _rewind_button->Enable (c);
        _back_button->Enable (c);
        _forward_button->Enable (c);
        _play_button->Enable (c);
@@ -644,7 +675,7 @@ FilmViewer::film_changed (Film::Property p)
 void
 FilmViewer::refresh ()
 {
-       seek (_video_position, _last_seek_accurate);
+       seek (_video_position, true);
 }
 
 void
@@ -706,7 +737,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
        bool const was_running = stop ();
 
        _butler->seek (t, accurate);
-       _last_seek_accurate = accurate;
        get ();
 
        if (was_running) {
@@ -743,8 +773,6 @@ FilmViewer::config_changed (Config::Property p)
 
                _audio_channels = _audio.getDeviceInfo(st).outputChannels;
 
-               recreate_butler ();
-
                RtAudio::StreamParameters sp;
                sp.deviceId = st;
                sp.nChannels = _audio_channels;
@@ -758,9 +786,10 @@ FilmViewer::config_changed (Config::Property p)
 #endif
                        error_dialog (
                                this,
-                               wxString::Format (_("Could not set up audio output (%s).  There will be no audio during the preview."), e.what())
+                               _("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(e.what())
                                );
                }
+               recreate_butler ();
 
        } else {
                _audio_channels = 0;
@@ -820,6 +849,12 @@ FilmViewer::set_dcp_decode_reduction (optional<int> reduction)
        }
 }
 
+optional<int>
+FilmViewer::dcp_decode_reduction () const
+{
+       return _dcp_decode_reduction;
+}
+
 DCPTime
 FilmViewer::one_video_frame () const
 {