X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=9f42aaad25798c18729bab2b162693290e2c3319;hb=e00b9850a7336b7db0aee058fe12f576db5f84a3;hp=bddd3abba280316ae58409b1247a1994cd26c501;hpb=b29571d1fbf3bcd9f5cbd9c20f1d5f8211876e94;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bddd3abba..9f42aaad2 100644
--- 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.
 
@@ -39,6 +39,7 @@
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "lib/timer.h"
+#include "lib/butler.h"
 #include "lib/log.h"
 #include "lib/config.h"
 extern "C" {
@@ -64,22 +65,36 @@ using boost::weak_ptr;
 using boost::optional;
 using dcp::Size;
 
-FilmViewer::FilmViewer (wxWindow* p)
+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, bool outline_content, bool jump_to_selected)
 	: wxPanel (p)
 	, _panel (new wxPanel (this))
-	, _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content")))
+	, _outline_content (0)
 	, _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP))
 	, _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye")))
-	, _jump_to_selected (new wxCheckBox (this, wxID_ANY, _("Jump to selected content")))
+	, _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("")))
 	, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
 	, _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)
+	, _playing (false)
+	, _latency_history_count (0)
+	, _dropped (0)
 {
 #ifndef __WXOSX__
 	_panel->SetDoubleBuffered (true);
@@ -93,10 +108,16 @@ FilmViewer::FilmViewer (wxWindow* p)
 	_v_sizer->Add (_panel, 1, wxEXPAND);
 
 	wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
-	view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
+	if (outline_content) {
+		_outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
+		view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
+	}
 	view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
 	view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
-	view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	if (jump_to_selected) {
+		_jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
+		view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	}
 	_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
 	wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
@@ -105,6 +126,7 @@ FilmViewer::FilmViewer (wxWindow* p)
 	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);
@@ -114,26 +136,32 @@ FilmViewer::FilmViewer (wxWindow* p)
 	_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));
 
 	_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_CHECKBOX,          boost::bind (&FilmViewer::refresh_panel,   this));
-	_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));
-	_slider->Bind           (wxEVT_SCROLL_PAGEUP,     boost::bind (&FilmViewer::slider_moved,    this));
-	_slider->Bind           (wxEVT_SCROLL_PAGEDOWN,   boost::bind (&FilmViewer::slider_moved,    this));
+	if (_outline_content) {
+		_outline_content->Bind  (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel,   this));
+	}
+	_left_eye->Bind         (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::slow_refresh,    this));
+	_right_eye->Bind        (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::slow_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, 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));
 	_timecode->Bind         (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::timecode_clicked, this));
-	_jump_to_selected->Bind (wxEVT_CHECKBOX,          boost::bind (&FilmViewer::jump_to_selected_clicked, this));
-
-	_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
+	if (_jump_to_selected) {
+		_jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this));
+		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
+	}
 
 	set_film (shared_ptr<Film> ());
 
@@ -142,6 +170,14 @@ FilmViewer::FilmViewer (wxWindow* p)
 		);
 
 	setup_sensitivity ();
+
+	_config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
+	config_changed (Config::SOUND_OUTPUT);
+}
+
+FilmViewer::~FilmViewer ()
+{
+	stop ();
 }
 
 void
@@ -159,12 +195,19 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	update_position_label ();
 
 	if (!_film) {
+		_player.reset ();
+		recreate_butler ();
+		_frame.reset ();
+		refresh_panel ();
 		return;
 	}
 
 	try {
 		_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 (this, _("There is not enough free memory to do that."));
 		_film.reset ();
@@ -175,20 +218,63 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	   in the preview.
 	*/
 	_player->set_always_burn_subtitles (true);
-	_player->set_ignore_audio ();
 	_player->set_play_referenced ();
 
 	_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+	_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1, _2));
+
+	/* Keep about 1 second's worth of history samples */
+	_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
 
-	_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
-	_player->Video.connect (boost::bind (&FilmViewer::video, this, _1));
+	recreate_butler ();
 
 	calculate_sizes ();
-	refresh ();
+	slow_refresh ();
 
 	setup_sensitivity ();
 }
 
+void
+FilmViewer::recreate_butler ()
+{
+	bool const was_running = stop ();
+	_butler.reset ();
+
+	if (!_film) {
+		return;
+	}
+
+	AudioMapping map = AudioMapping (_film->audio_channels(), _audio_channels);
+
+	if (_audio_channels != 2 || _film->audio_channels() < 3) {
+		for (int i = 0; i < min (_film->audio_channels(), _audio_channels); ++i) {
+			map.set (i, i, 1);
+		}
+	} else {
+		/* Special case: stereo output, at least 3 channel input.
+		   Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
+		               Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
+		*/
+		map.set (dcp::LEFT,   0, 1 / sqrt(2)); // L -> Lt
+		map.set (dcp::RIGHT,  1, 1 / sqrt(2)); // R -> Rt
+		map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
+		map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
+		map.set (dcp::LFE,    0, 1 / sqrt(10)); // Lfe -> Lt
+		map.set (dcp::LFE,    1, 1 / sqrt(10)); // Lfe -> Rt
+		map.set (dcp::LS,     0, 1 / sqrt(2)); // Ls -> Lt
+		map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
+	}
+
+	_butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
+	if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
+		_butler->disable_audio ();
+	}
+
+	if (was_running) {
+		start ();
+	}
+}
+
 void
 FilmViewer::refresh_panel ()
 {
@@ -197,16 +283,38 @@ FilmViewer::refresh_panel ()
 }
 
 void
-FilmViewer::video (shared_ptr<PlayerVideo> pv)
+FilmViewer::get ()
 {
-	if (!_player) {
+	DCPOMATIC_ASSERT (_butler);
+
+	do {
+		_player_video = _butler->get_video ();
+	} while (
+		_film->three_d() &&
+		((_left_eye->GetValue() && _player_video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && _player_video.first->eyes() == EYES_LEFT))
+		);
+
+	_butler->rethrow ();
+
+	display_player_video ();
+}
+
+void
+FilmViewer::display_player_video ()
+{
+	if (!_player_video.first) {
+		_frame.reset ();
+		refresh_panel ();
 		return;
 	}
 
-	if (_film->three_d ()) {
-		if ((_left_eye->GetValue() && pv->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && pv->eyes() == EYES_LEFT)) {
-			return;
-		}
+	if (_playing && (time() - _player_video.second) > one_video_frame()) {
+		/* Too late; just drop this frame before we try to get its image (which will be the time-consuming
+		   part if this frame is J2K).
+		*/
+		_video_position = _player_video.second;
+		++_dropped;
+		return;
 	}
 
 	/* In an ideal world, what we would do here is:
@@ -227,42 +335,42 @@ FilmViewer::video (shared_ptr<PlayerVideo> pv)
 	 * image and convert it (from whatever the user has said it is) to RGB.
 	 */
 
-	_frame = pv->image (
+	_frame = _player_video.first->image (
 		bind (&Log::dcp_log, _film->log().get(), _1, _2),
 		bind (&PlayerVideo::always_rgb, _1),
 		false, true
 		);
 
-	ImageChanged (pv);
+	ImageChanged (_player_video.first);
 
-	_position = pv->time ();
-	_inter_position = pv->inter_position ();
-	_inter_size = pv->inter_size ();
+	_video_position = _player_video.second;
+	_inter_position = _player_video.first->inter_position ();
+	_inter_size = _player_video.first->inter_size ();
 
 	refresh_panel ();
 }
 
-void
-FilmViewer::get ()
-{
-	Image const * current = _frame.get ();
-	while (!_player->pass() && _frame.get() == current) {}
-}
-
 void
 FilmViewer::timer ()
 {
-	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 ();
+	if (!_film || !_playing) {
+		return;
 	}
 
+	get ();
 	update_position_label ();
 	update_position_slider ();
+	DCPTime const next = _video_position + one_video_frame();
+
+	if (next >= _film->length()) {
+		stop ();
+	}
+
+	_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
+
+	if (_butler) {
+		_butler->rethrow ();
+	}
 }
 
 void
@@ -270,7 +378,7 @@ FilmViewer::paint_panel ()
 {
 	wxPaintDC dc (_panel);
 
-	if (!_frame || !_film || !_out_size.width || !_out_size.height) {
+	if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
 		dc.Clear ();
 		return;
 	}
@@ -295,7 +403,7 @@ FilmViewer::paint_panel ()
 		dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
 	}
 
-	if (_outline_content->GetValue ()) {
+	if (_outline_content && _outline_content->GetValue ()) {
 		wxPen p (wxColour (255, 0, 0), 2);
 		dc.SetPen (p);
 		dc.SetBrush (*wxTRANSPARENT_BRUSH);
@@ -303,22 +411,40 @@ 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 ()
+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);
+	t = t.round (_film->video_frame_rate());
 	/* 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 ());
+		t = _film->length() - one_video_frame();
 	}
 	seek (t, false);
 	update_position_label ();
 }
 
+void
+FilmViewer::slider_released ()
+{
+	if (_was_running_before_slider) {
+		/* Restart after a drag */
+		start ();
+	}
+	_slider_being_moved = false;
+}
+
 void
 FilmViewer::panel_sized (wxSizeEvent& ev)
 {
@@ -326,7 +452,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev)
 	_panel_size.height = ev.GetSize().GetHeight();
 
 	calculate_sizes ();
-	refresh ();
+	if (!quick_refresh()) {
+		slow_refresh ();
+	}
 	update_position_label ();
 	update_position_slider ();
 }
@@ -334,7 +462,7 @@ FilmViewer::panel_sized (wxSizeEvent& ev)
 void
 FilmViewer::calculate_sizes ()
 {
-	if (!_film || !_player) {
+	if (!_film) {
 		return;
 	}
 
@@ -374,12 +502,47 @@ FilmViewer::check_play_state ()
 	}
 
 	if (_play_button->GetValue()) {
-		_timer.Start (1000 / _film->video_frame_rate());
+		start ();
 	} else {
-		_timer.Stop ();
+		stop ();
 	}
 }
 
+void
+FilmViewer::start ()
+{
+	if (!_film) {
+		return;
+	}
+
+	if (_audio.isStreamOpen()) {
+		_audio.setStreamTime (_video_position.seconds());
+		_audio.startStream ();
+	}
+
+	_playing = true;
+	_dropped = 0;
+	timer ();
+	_play_button->SetValue (true);
+}
+
+bool
+FilmViewer::stop ()
+{
+	if (_audio.isStreamRunning()) {
+		/* stop stream and discard any remaining queued samples */
+		_audio.abortStream ();
+	}
+
+	if (!_playing) {
+		return false;
+	}
+
+	_playing = false;
+	_play_button->SetValue (false);
+	return true;
+}
+
 void
 FilmViewer::update_position_slider ()
 {
@@ -391,7 +554,7 @@ FilmViewer::update_position_slider ()
 	DCPTime const len = _film->length ();
 
 	if (len.get ()) {
-		int const new_slider_position = 4096 * _position.get() / len.get();
+		int const new_slider_position = 4096 * _video_position.get() / len.get();
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -409,8 +572,8 @@ FilmViewer::update_position_label ()
 
 	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("%ld"), lrint (_position.seconds() * fps) + 1));
-	_timecode->SetLabel (time_to_timecode (_position, fps));
+	_frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_video_position.seconds() * fps) + 1));
+	_timecode->SetLabel (time_to_timecode (_video_position, fps));
 }
 
 void
@@ -423,9 +586,9 @@ FilmViewer::active_jobs_changed (optional<string> j)
 }
 
 DCPTime
-FilmViewer::nudge_amount (wxMouseEvent& ev)
+FilmViewer::nudge_amount (wxKeyboardState& ev)
 {
-	DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ());
+	DCPTime amount = one_video_frame ();
 
 	if (ev.ShiftDown() && !ev.ControlDown()) {
 		amount = DCPTime::from_seconds (1);
@@ -455,33 +618,73 @@ FilmViewer::go_to (DCPTime t)
 }
 
 void
-FilmViewer::back_clicked (wxMouseEvent& ev)
+FilmViewer::rewind_clicked (wxMouseEvent& ev)
+{
+	go_to(DCPTime());
+	ev.Skip();
+}
+
+void
+FilmViewer::back_frame ()
+{
+	if (!_film) {
+		return;
+	}
+
+	go_to (_video_position - one_video_frame());
+}
+
+void
+FilmViewer::forward_frame ()
+{
+	if (!_film) {
+		return;
+	}
+
+	go_to (_video_position + one_video_frame());
+}
+
+void
+FilmViewer::back_clicked (wxKeyboardState& ev)
 {
-	go_to (_position - nudge_amount (ev));
-	ev.Skip ();
+	go_to (_video_position - nudge_amount (ev));
 }
 
 void
-FilmViewer::forward_clicked (wxMouseEvent& ev)
+FilmViewer::forward_clicked (wxKeyboardState& ev)
 {
-	go_to (_position + nudge_amount (ev));
-	ev.Skip ();
+	go_to (_video_position + nudge_amount (ev));
 }
 
 void
-FilmViewer::player_changed (bool frequent)
+FilmViewer::player_changed (int property, bool frequent)
 {
 	if (frequent) {
 		return;
 	}
 
 	if (_coalesce_player_changes) {
-		_pending_player_change = true;
+		_pending_player_changes.push_back (property);
 		return;
 	}
 
 	calculate_sizes ();
-	refresh ();
+	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 ();
+	}
 	update_position_label ();
 	update_position_slider ();
 }
@@ -492,12 +695,18 @@ 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);
-	_outline_content->Enable (c);
+	if (_outline_content) {
+		_outline_content->Enable (c);
+	}
 	_frame_number->Enable (c);
 	_timecode->Enable (c);
+	if (_jump_to_selected) {
+		_jump_to_selected->Enable (c);
+	}
 
 	_left_eye->Enable (c && _film->three_d ());
 	_right_eye->Enable (c && _film->three_d ());
@@ -508,36 +717,62 @@ FilmViewer::film_changed (Film::Property p)
 {
 	if (p == Film::CONTENT || p == Film::THREE_D) {
 		setup_sensitivity ();
+	} else if (p == Film::AUDIO_CHANNELS) {
+		recreate_butler ();
 	}
 }
 
-/** Re-get the current frame */
+/** Re-get the current frame slowly by seeking */
 void
-FilmViewer::refresh ()
+FilmViewer::slow_refresh ()
 {
-	seek (_position, _last_seek_accurate);
+	seek (_video_position, true);
+}
+
+/** 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 (!_player_video.first) {
+		return false;
+	}
+
+	if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+		return false;
+	}
+
+	display_player_video ();
+	return true;
 }
 
 void
 FilmViewer::set_position (DCPTime p)
 {
-	_position = p;
+	_video_position = p;
 	seek (p, true);
 	update_position_label ();
 	update_position_slider ();
 }
 
+void
+FilmViewer::set_position (shared_ptr<Content> content, ContentTime t)
+{
+	set_position (_player->content_time_to_dcp (content, t));
+}
+
 void
 FilmViewer::set_coalesce_player_changes (bool c)
 {
 	_coalesce_player_changes = c;
 
-	if (c) {
-		_pending_player_change = false;
-	} else {
-		if (_pending_player_change) {
-			player_changed (false);
+	if (!c) {
+		BOOST_FOREACH (int i, _pending_player_changes) {
+			player_changed (i, false);
 		}
+		_pending_player_changes.clear ();
 	}
 }
 
@@ -570,7 +805,133 @@ FilmViewer::jump_to_selected_clicked ()
 void
 FilmViewer::seek (DCPTime t, bool accurate)
 {
-	_player->seek (t, accurate);
-	_last_seek_accurate = accurate;
+	if (!_butler) {
+		return;
+	}
+
+	bool const was_running = stop ();
+
+	_butler->seek (t, accurate);
 	get ();
+
+	if (was_running) {
+		start ();
+	}
+}
+
+void
+FilmViewer::config_changed (Config::Property p)
+{
+	if (p != Config::SOUND && p != Config::SOUND_OUTPUT) {
+		return;
+	}
+
+	if (_audio.isStreamOpen ()) {
+		_audio.closeStream ();
+	}
+
+	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 (
+				this,
+				_("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 ();
+	}
+}
+
+DCPTime
+FilmViewer::time () const
+{
+	if (_audio.isStreamRunning ()) {
+		return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
+			DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
+	}
+
+	return _video_position;
+}
+
+int
+FilmViewer::audio_callback (void* out_p, unsigned int frames)
+{
+	_butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+
+        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::set_dcp_decode_reduction (optional<int> reduction)
+{
+	_dcp_decode_reduction = reduction;
+	if (_player) {
+		_player->set_dcp_decode_reduction (reduction);
+	}
+}
+
+optional<int>
+FilmViewer::dcp_decode_reduction () const
+{
+	return _dcp_decode_reduction;
+}
+
+DCPTime
+FilmViewer::one_video_frame () const
+{
+	return DCPTime::from_frames (1, _film->video_frame_rate());
 }