Add assert.
[dcpomatic.git] / src / wx / film_viewer.cc
index 7a306de62dc88598aa1165a88070620149314bb9..17573b4388053fe1ea09539510d8632a7770cffa 100644 (file)
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
  *  @brief A wx widget to view a preview of a Film.
  */
 
+#include "film_viewer.h"
+#include "playhead_to_timecode_dialog.h"
+#include "playhead_to_frame_dialog.h"
+#include "wx_util.h"
+#include "closed_captions_dialog.h"
+#include "gl_video_view.h"
+#include "simple_video_view.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "lib/timer.h"
+#include "lib/butler.h"
 #include "lib/log.h"
-#include "film_viewer.h"
-#include "wx_util.h"
+#include "lib/config.h"
+#include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include <dcp/exceptions.h>
 #include <wx/tglbtn.h>
 #include <iostream>
@@ -54,69 +67,81 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
+using boost::optional;
 using dcp::Size;
+using namespace dcpomatic;
+
+static
+int
+rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamStatus, void* data)
+{
+       return reinterpret_cast<FilmViewer*>(data)->audio_callback (out, frames);
+}
 
 FilmViewer::FilmViewer (wxWindow* p)
-       : wxPanel (p)
-       , _panel (new wxPanel (this))
-       , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content")))
-       , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
-       , _back_button (new wxButton (this, wxID_ANY, wxT("<")))
-       , _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
-       , _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
-       , _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
-       , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
-       , _last_get_accurate (true)
-{
-#ifndef __WXOSX__
-       _panel->SetDoubleBuffered (true);
+       : _coalesce_player_changes (false)
+       , _audio (DCPOMATIC_RTAUDIO_API)
+       , _audio_channels (0)
+       , _audio_block_size (1024)
+       , _playing (false)
+       , _suspended (0)
+       , _latency_history_count (0)
+       , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
+       , _outline_content (false)
+       , _pad_black (false)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       , _background_image (false)
 #endif
+       , _idle_get (false)
+{
+       switch (Config::instance()->video_view_type()) {
+       case Config::VIDEO_VIEW_OPENGL:
+               _video_view = new GLVideoView (this, p);
+               break;
+       case Config::VIDEO_VIEW_SIMPLE:
+               _video_view = new SimpleVideoView (this, p);
+               break;
+       }
 
-       _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
-
-       _v_sizer = new wxBoxSizer (wxVERTICAL);
-       SetSizer (_v_sizer);
-
-       _v_sizer->Add (_panel, 1, wxEXPAND);
-
-       _v_sizer->Add (_outline_content, 0, wxALL, DCPOMATIC_SIZER_GAP);
-
-       wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
-
-       wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL);
-       time_sizer->Add (_frame_number, 0, wxEXPAND);
-       time_sizer->Add (_timecode, 0, wxEXPAND);
+       _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this));
 
-       h_sizer->Add (_back_button, 0, wxALL, 2);
-       h_sizer->Add (time_sizer, 0, wxEXPAND);
-       h_sizer->Add (_forward_button, 0, wxALL, 2);
-       h_sizer->Add (_play_button, 0, wxEXPAND);
-       h_sizer->Add (_slider, 1, wxEXPAND);
+       set_film (shared_ptr<Film> ());
 
-       _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
+       _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
+       config_changed (Config::SOUND_OUTPUT);
+}
 
-       _frame_number->SetMinSize (wxSize (84, -1));
-       _back_button->SetMinSize (wxSize (32, -1));
-       _forward_button->SetMinSize (wxSize (32, -1));
+FilmViewer::~FilmViewer ()
+{
+       stop ();
+}
 
-       _panel->Bind          (wxEVT_PAINT,                        boost::bind (&FilmViewer::paint_panel,     this));
-       _panel->Bind          (wxEVT_SIZE,                         boost::bind (&FilmViewer::panel_sized,     this, _1));
-       _outline_content->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED,     boost::bind (&FilmViewer::refresh_panel,   this));
-       _slider->Bind         (wxEVT_SCROLL_THUMBTRACK,            boost::bind (&FilmViewer::slider_moved,    this));
-       _slider->Bind         (wxEVT_SCROLL_PAGEUP,                boost::bind (&FilmViewer::slider_moved,    this));
-       _slider->Bind         (wxEVT_SCROLL_PAGEDOWN,              boost::bind (&FilmViewer::slider_moved,    this));
-       _play_button->Bind    (wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, boost::bind (&FilmViewer::play_clicked,    this));
-       _timer.Bind           (wxEVT_TIMER,                        boost::bind (&FilmViewer::timer,           this));
-       _back_button->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::back_clicked,    this));
-       _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::forward_clicked, this));
+/** Ask for ::get() to be called next time we are idle */
+void
+FilmViewer::request_idle_display_next_frame ()
+{
+       if (_idle_get) {
+               return;
+       }
 
-       set_film (shared_ptr<Film> ());
+       _idle_get = true;
+       DCPOMATIC_ASSERT (signal_manager);
+       signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this));
+}
 
-       JobManager::instance()->ActiveJobsChanged.connect (
-               bind (&FilmViewer::active_jobs_changed, this, _1)
-               );
+void
+FilmViewer::idle_handler ()
+{
+       if (!_idle_get) {
+               return;
+       }
 
-       setup_sensitivity ();
+       if (_video_view->display_next_frame(true)) {
+               _idle_get = false;
+       } else {
+               /* get() could not complete quickly so we'll try again later */
+               signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this));
+       }
 }
 
 void
@@ -128,332 +153,515 @@ FilmViewer::set_film (shared_ptr<Film> film)
 
        _film = film;
 
-       _frame.reset ();
-
-       update_position_slider ();
-       update_position_label ();
+       _video_view->clear ();
+       _closed_captions_dialog->clear ();
 
        if (!_film) {
+               _player.reset ();
+               recreate_butler ();
+               _video_view->update ();
                return;
        }
 
        try {
-               _player.reset (new Player (_film));
-       } catch (bad_alloc) {
-               error_dialog (this, _("There is not enough free memory to do that."));
+               _player.reset (new Player (_film, _film->playlist ()));
+               _player->set_fast ();
+               if (_dcp_decode_reduction) {
+                       _player->set_dcp_decode_reduction (_dcp_decode_reduction);
+               }
+       } catch (bad_alloc &) {
+               error_dialog (_video_view->get(), _("There is not enough free memory to do that."));
                _film.reset ();
                return;
        }
 
-       /* Always burn in subtitles, even if content is set not to, otherwise we won't see them
-          in the preview.
-       */
-       _player->set_always_burn_subtitles (true);
+       _player->set_always_burn_open_subtitles ();
+       _player->set_play_referenced ();
+
+       _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+       _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
+       _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
-       _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+       /* Keep about 1 second's worth of history samples */
+       _latency_history_count = _film->audio_frame_rate() / _audio_block_size;
 
-       _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+       recreate_butler ();
 
        calculate_sizes ();
-       get (_position, _last_get_accurate);
+       slow_refresh ();
+}
+
+void
+FilmViewer::recreate_butler ()
+{
+       suspend ();
+       _butler.reset ();
+
+       if (!_film) {
+               resume ();
+               return;
+       }
+
+       _butler.reset(
+               new Butler(
+                       _player,
+                       Config::instance()->audio_mapping(_audio_channels),
+                       _audio_channels,
+                       bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+                       false,
+                       true
+                       )
+               );
+
+       if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
+               _butler->disable_audio ();
+       }
+
+       _closed_captions_dialog->set_film_and_butler (_film, _butler);
 
-       setup_sensitivity ();
+       resume ();
 }
 
 void
-FilmViewer::refresh_panel ()
+FilmViewer::set_outline_content (bool o)
 {
-       _panel->Refresh ();
-       _panel->Update ();
+       _outline_content = o;
+       _video_view->update ();
 }
 
 void
-FilmViewer::get (DCPTime p, bool accurate)
+FilmViewer::set_eyes (Eyes e)
 {
-       if (!_player) {
-               return;
+       _video_view->set_eyes (e);
+       slow_refresh ();
+}
+
+void
+FilmViewer::video_view_sized ()
+{
+       calculate_sizes ();
+       if (!quick_refresh()) {
+               slow_refresh ();
        }
+}
 
-       list<shared_ptr<PlayerVideo> > pvf;
-       try {
-               pvf = _player->get_video (p, accurate);
-       } catch (exception& e) {
-               error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
+void
+FilmViewer::calculate_sizes ()
+{
+       if (!_film || !_player) {
+               return;
        }
 
-       if (!pvf.empty ()) {
-               try {
-                       _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+       Ratio const * container = _film->container ();
 
-                       dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
-                       if (pvf.front()->colour_conversion()) {
-                               yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
-                       }
+       float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
+       float const film_ratio = container ? container->ratio () : 1.78;
 
-                       _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
-                       _position = pvf.front()->time ();
-                       _inter_position = pvf.front()->inter_position ();
-                       _inter_size = pvf.front()->inter_size ();
-               } catch (dcp::DCPReadError& e) {
-                       /* This can happen on the following sequence of events:
-                        * - load encrypted DCP
-                        * - add KDM
-                        * - DCP is examined again, which sets its "playable" flag to 1
-                        * - as a side effect of the exam, the viewer is updated using the old pieces
-                        * - the DCPDecoder in the old piece gives us an encrypted frame
-                        * - then, the pieces are re-made (but too late).
-                        *
-                        * I hope there's a better way to handle this ...
-                        */
-                       _frame.reset ();
-                       _position = p;
-               }
+       if (view_ratio < film_ratio) {
+               /* panel is less widscreen than the film; clamp width */
+               _out_size.width = _video_view->get()->GetSize().x;
+               _out_size.height = lrintf (_out_size.width / film_ratio);
        } else {
-               _frame.reset ();
-               _position = p;
+               /* panel is more widescreen than the film; clamp height */
+               _out_size.height = _video_view->get()->GetSize().y;
+               _out_size.width = lrintf (_out_size.height * film_ratio);
        }
 
-       refresh_panel ();
+       /* Catch silly values */
+       _out_size.width = max (64, _out_size.width);
+       _out_size.height = max (64, _out_size.height);
 
-       _last_get_accurate = accurate;
+       _player->set_video_container_size (_out_size);
 }
 
 void
-FilmViewer::timer ()
+FilmViewer::suspend ()
 {
-       DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-
-       if ((_position + frame) >= _film->length ()) {
-               _play_button->SetValue (false);
-               check_play_state ();
-       } else {
-               get (_position + frame, true);
+       ++_suspended;
+       if (_audio.isStreamRunning()) {
+               _audio.abortStream();
        }
-
-       update_position_label ();
-       update_position_slider ();
 }
 
 void
-FilmViewer::paint_panel ()
+FilmViewer::resume ()
 {
-       wxPaintDC dc (_panel);
+       DCPOMATIC_ASSERT (_suspended > 0);
+       --_suspended;
+       if (_playing && !_suspended) {
+               if (_audio.isStreamOpen()) {
+                       _audio.setStreamTime (_video_view->position().seconds());
+                       _audio.startStream ();
+               }
+               _video_view->start ();
+       }
+}
 
-       if (!_frame || !_film || !_out_size.width || !_out_size.height) {
-               dc.Clear ();
+void
+FilmViewer::start ()
+{
+       if (!_film) {
                return;
        }
 
-       wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
-       wxBitmap frame_bitmap (frame);
-       dc.DrawBitmap (frame_bitmap, 0, 0);
-
-       if (_out_size.width < _panel_size.width) {
-               wxPen p (GetBackgroundColour ());
-               wxBrush b (GetBackgroundColour ());
-               dc.SetPen (p);
-               dc.SetBrush (b);
-               dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
+       optional<bool> v = PlaybackPermitted ();
+       if (v && !*v) {
+               /* Computer says no */
+               return;
        }
 
-       if (_out_size.height < _panel_size.height) {
-               wxPen p (GetBackgroundColour ());
-               wxBrush b (GetBackgroundColour ());
-               dc.SetPen (p);
-               dc.SetBrush (b);
-               dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
+       if (_audio.isStreamOpen()) {
+               _audio.setStreamTime (_video_view->position().seconds());
+               _audio.startStream ();
        }
 
-       if (_outline_content->GetValue ()) {
-               wxPen p (wxColour (255, 0, 0), 2);
-               dc.SetPen (p);
-               dc.SetBrush (*wxTRANSPARENT_BRUSH);
-               dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height);
-       }
+       _playing = true;
+       _video_view->start ();
+       Started (position());
 }
 
-void
-FilmViewer::slider_moved ()
+bool
+FilmViewer::stop ()
 {
-       if (!_film) {
-               return;
+       if (_audio.isStreamRunning()) {
+               /* stop stream and discard any remaining queued samples */
+               _audio.abortStream ();
        }
 
-       DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
-       /* Ensure that we hit the end of the film at the end of the slider */
-       if (t >= _film->length ()) {
-               t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ());
+       if (!_playing) {
+               return false;
        }
-       get (t, false);
-       update_position_label ();
+
+       _playing = false;
+       _video_view->stop ();
+       Stopped (position());
+
+       _video_view->rethrow ();
+       return true;
 }
 
 void
-FilmViewer::panel_sized (wxSizeEvent& ev)
+FilmViewer::player_change (ChangeType type, int property, bool frequent)
 {
-       _panel_size.width = ev.GetSize().GetWidth();
-       _panel_size.height = ev.GetSize().GetHeight();
+       if (type != CHANGE_TYPE_DONE || frequent) {
+               return;
+       }
+
+       if (_coalesce_player_changes) {
+               _pending_player_changes.push_back (property);
+               return;
+       }
 
        calculate_sizes ();
-       get (_position, _last_get_accurate);
-       update_position_label ();
-       update_position_slider ();
+       bool refreshed = false;
+       if (
+               property == VideoContentProperty::CROP ||
+               property == VideoContentProperty::SCALE ||
+               property == VideoContentProperty::FADE_IN ||
+               property == VideoContentProperty::FADE_OUT ||
+               property == VideoContentProperty::COLOUR_CONVERSION ||
+               property == PlayerProperty::VIDEO_CONTAINER_SIZE ||
+               property == PlayerProperty::FILM_CONTAINER
+               ) {
+               refreshed = quick_refresh ();
+       }
+
+       if (!refreshed) {
+               slow_refresh ();
+       }
 }
 
 void
-FilmViewer::calculate_sizes ()
+FilmViewer::film_change (ChangeType type, Film::Property p)
 {
-       if (!_film || !_player) {
+       if (type != CHANGE_TYPE_DONE) {
                return;
        }
 
-       Ratio const * container = _film->container ();
+       if (p == Film::AUDIO_CHANNELS) {
+               recreate_butler ();
+       } else if (p == Film::VIDEO_FRAME_RATE) {
+               _video_view->set_video_frame_rate (_film->video_frame_rate());
+       } else if (p == Film::THREE_D) {
+               _video_view->set_three_d (_film->three_d());
+       }
+}
 
-       float const panel_ratio = _panel_size.ratio ();
-       float const film_ratio = container ? container->ratio () : 1.78;
+void
+FilmViewer::film_length_change ()
+{
+       _video_view->set_length (_film->length());
+}
 
-       if (panel_ratio < film_ratio) {
-               /* panel is less widscreen than the film; clamp width */
-               _out_size.width = _panel_size.width;
-               _out_size.height = rint (_out_size.width / film_ratio);
-       } else {
-               /* panel is more widescreen than the film; clamp height */
-               _out_size.height = _panel_size.height;
-               _out_size.width = rint (_out_size.height * film_ratio);
-       }
+/** Re-get the current frame slowly by seeking */
+void
+FilmViewer::slow_refresh ()
+{
+       seek (_video_view->position(), true);
+}
 
-       /* Catch silly values */
-       _out_size.width = max (64, _out_size.width);
-       _out_size.height = max (64, _out_size.height);
+/** Try to re-get the current frame quickly by resetting the metadata
+ *  in the PlayerVideo that we used last time.
+ *  @return true if this was possible, false if not.
+ */
+bool
+FilmViewer::quick_refresh ()
+{
+       if (!_video_view || !_film) {
+               return true;
+       }
+       return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
+}
 
-       _player->set_video_container_size (_out_size);
+void
+FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
+{
+       optional<DCPTime> dt = _player->content_time_to_dcp (content, t);
+       if (dt) {
+               seek (*dt, accurate);
+       }
 }
 
 void
-FilmViewer::play_clicked ()
+FilmViewer::set_coalesce_player_changes (bool c)
 {
-       check_play_state ();
+       _coalesce_player_changes = c;
+
+       if (!c) {
+               BOOST_FOREACH (int i, _pending_player_changes) {
+                       player_change (CHANGE_TYPE_DONE, i, false);
+               }
+               _pending_player_changes.clear ();
+       }
 }
 
 void
-FilmViewer::check_play_state ()
+FilmViewer::seek (DCPTime t, bool accurate)
 {
-       if (!_film || _film->video_frame_rate() == 0) {
+       if (!_butler) {
                return;
        }
 
-       if (_play_button->GetValue()) {
-               _timer.Start (1000 / _film->video_frame_rate());
+       if (t < DCPTime ()) {
+               t = DCPTime ();
+       }
+
+       if (t >= _film->length ()) {
+               t = _film->length ();
+       }
+
+       suspend ();
+
+       _closed_captions_dialog->clear ();
+       _butler->seek (t, accurate);
+
+       if (!_playing) {
+               request_idle_display_next_frame ();
        } else {
-               _timer.Stop ();
+               while (!_video_view->display_next_frame(false)) {}
        }
+
+       resume ();
 }
 
 void
-FilmViewer::update_position_slider ()
+FilmViewer::config_changed (Config::Property p)
 {
-       if (!_film) {
-               _slider->SetValue (0);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       if (p == Config::PLAYER_BACKGROUND_IMAGE) {
+               _video_view->update ();
+               return;
+       }
+#endif
+
+       if (p == Config::AUDIO_MAPPING) {
+               recreate_butler ();
+               return;
+       }
+
+       if (p != Config::SOUND && p != Config::SOUND_OUTPUT) {
                return;
        }
 
-       DCPTime const len = _film->length ();
+       if (_audio.isStreamOpen ()) {
+               _audio.closeStream ();
+       }
 
-       if (len.get ()) {
-               int const new_slider_position = 4096 * _position.get() / len.get();
-               if (new_slider_position != _slider->GetValue()) {
-                       _slider->SetValue (new_slider_position);
+       if (Config::instance()->sound() && _audio.getDeviceCount() > 0) {
+               unsigned int st = 0;
+               if (Config::instance()->sound_output()) {
+                       while (st < _audio.getDeviceCount()) {
+                               if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
+                                       break;
+                               }
+                               ++st;
+                       }
+                       if (st == _audio.getDeviceCount()) {
+                               st = _audio.getDefaultOutputDevice();
+                       }
+               } else {
+                       st = _audio.getDefaultOutputDevice();
+               }
+
+               _audio_channels = _audio.getDeviceInfo(st).outputChannels;
+
+               RtAudio::StreamParameters sp;
+               sp.deviceId = st;
+               sp.nChannels = _audio_channels;
+               sp.firstChannel = 0;
+               try {
+                       _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this);
+#ifdef DCPOMATIC_USE_RTERROR
+               } catch (RtError& e) {
+#else
+               } catch (RtAudioError& e) {
+#endif
+                       error_dialog (
+                               _video_view->get(),
+                               _("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;
+               recreate_butler ();
        }
 }
 
-void
-FilmViewer::update_position_label ()
+DCPTime
+FilmViewer::uncorrected_time () const
 {
-       if (!_film) {
-               _frame_number->SetLabel ("0");
-               _timecode->SetLabel ("0:0:0.0");
-               return;
+       if (_audio.isStreamRunning ()) {
+               return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
        }
 
-       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));
-       _timecode->SetLabel (time_to_timecode (_position, fps));
+       return _video_view->position();
 }
 
-void
-FilmViewer::active_jobs_changed (bool a)
+optional<DCPTime>
+FilmViewer::audio_time () const
 {
-       if (a) {
-               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-               list<shared_ptr<Job> >::iterator i = jobs.begin ();
-               while (i != jobs.end() && boost::dynamic_pointer_cast<ExamineContentJob> (*i) == 0) {
-                       ++i;
-               }
+       if (!_audio.isStreamRunning()) {
+               return optional<DCPTime>();
+       }
+
+       return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+               DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+}
+
+DCPTime
+FilmViewer::time () const
+{
+       return audio_time().get_value_or(_video_view->position());
+}
 
-               if (i == jobs.end() || (*i)->finished()) {
-                       /* no examine content job running, so we're ok to use the viewer */
-                       a = false;
+int
+FilmViewer::audio_callback (void* out_p, unsigned int frames)
+{
+       while (true) {
+               optional<DCPTime> t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+               if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) {
+                       /* There was an underrun or this audio is on time; carry on */
+                       break;
                }
+               /* The audio we just got was (very) late; drop it and get some more. */
        }
 
-       _slider->Enable (!a);
-       _play_button->Enable (!a);
+        boost::mutex::scoped_lock lm (_latency_history_mutex, boost::try_to_lock);
+        if (lm) {
+                _latency_history.push_back (_audio.getStreamLatency ());
+                if (_latency_history.size() > static_cast<size_t> (_latency_history_count)) {
+                        _latency_history.pop_front ();
+                }
+        }
+
+       return 0;
+}
+
+Frame
+FilmViewer::average_latency () const
+{
+        boost::mutex::scoped_lock lm (_latency_history_mutex);
+        if (_latency_history.empty()) {
+                return 0;
+        }
+
+        Frame total = 0;
+        BOOST_FOREACH (Frame i, _latency_history) {
+                total += i;
+        }
+
+        return total / _latency_history.size();
 }
 
 void
-FilmViewer::back_clicked ()
+FilmViewer::set_dcp_decode_reduction (optional<int> reduction)
 {
-       DCPTime p = _position - DCPTime::from_frames (1, _film->video_frame_rate ());
-       if (p < DCPTime ()) {
-               p = DCPTime ();
+       _dcp_decode_reduction = reduction;
+       if (_player) {
+               _player->set_dcp_decode_reduction (reduction);
        }
+}
 
-       get (p, true);
-       update_position_label ();
-       update_position_slider ();
+optional<int>
+FilmViewer::dcp_decode_reduction () const
+{
+       return _dcp_decode_reduction;
 }
 
-void
-FilmViewer::forward_clicked ()
+DCPTime
+FilmViewer::one_video_frame () const
 {
-       get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true);
-       update_position_label ();
-       update_position_slider ();
+       return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24);
 }
 
+/** Open a dialog box showing our film's closed captions */
 void
-FilmViewer::player_changed (bool frequent)
+FilmViewer::show_closed_captions ()
 {
-       if (frequent) {
-               return;
-       }
+       _closed_captions_dialog->Show();
+}
 
-       calculate_sizes ();
-       get (_position, _last_get_accurate);
-       update_position_label ();
-       update_position_slider ();
+void
+FilmViewer::seek_by (DCPTime by, bool accurate)
+{
+       seek (_video_view->position() + by, accurate);
 }
 
 void
-FilmViewer::setup_sensitivity ()
+FilmViewer::set_pad_black (bool p)
 {
-       bool const c = _film && !_film->content().empty ();
+       _pad_black = p;
+}
 
-       _slider->Enable (c);
-       _back_button->Enable (c);
-       _forward_button->Enable (c);
-       _play_button->Enable (c);
-       _outline_content->Enable (c);
-       _frame_number->Enable (c);
-       _timecode->Enable (c);
+/** Called when a player has finished the current film.
+ *  May be called from a non-UI thread.
+ */
+void
+FilmViewer::finished ()
+{
+       emit (boost::bind(&FilmViewer::ui_finished, this));
 }
 
+/** Called by finished() in the UI thread */
 void
-FilmViewer::film_changed (Film::Property p)
+FilmViewer::ui_finished ()
 {
-       if (p == Film::CONTENT) {
-               setup_sensitivity ();
-       }
+       stop ();
+       Finished ();
+}
+
+int
+FilmViewer::dropped () const
+{
+       return _video_view->dropped ();
+}
+
+int
+FilmViewer::gets () const
+{
+       return _video_view->gets ();
 }
+
+