X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=bd83821be0b783560b5c0f475c1ad46c04e3a26d;hb=7151de6910e6072754bd38d50efa5a36622bb5c6;hp=ce34b06b7122f56f2a12243c7cb448a3f333a6b9;hpb=54e6f206305d4275808cfce36987edcc61a6a779;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ce34b06b7..bd83821be 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -73,29 +73,18 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS
 	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 (0)
-	, _eye (0)
-	, _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")))
+FilmViewer::FilmViewer (wxWindow* p)
+	: _panel (new wxPanel (p))
 	, _coalesce_player_changes (false)
-	, _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)
-	, _closed_captions_dialog (new ClosedCaptionsDialog(GetParent()))
+	, _closed_captions_dialog (new ClosedCaptionsDialog(p))
+	, _outline_content (false)
+	, _eyes (EYES_LEFT)
 {
 #ifndef __WXOSX__
 	_panel->SetDoubleBuffered (true);
@@ -103,80 +92,12 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
 
 	_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
 
-	_v_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (_v_sizer);
-
-	_v_sizer->Add (_panel, 1, wxEXPAND);
-
-	wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
-	if (outline_content) {
-		_outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
-		view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	}
-
-	_eye = new wxChoice (this, wxID_ANY);
-	_eye->Append (_("Left"));
-	_eye->Append (_("Right"));
-	_eye->SetSelection (0);
-	view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 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 | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	}
-
-	_v_sizer->Add (view_options, 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);
-
-	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);
-	h_sizer->Add (_play_button, 0, wxEXPAND);
-	h_sizer->Add (_slider, 1, wxEXPAND);
-
-	_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));
-	if (_outline_content) {
-		_outline_content->Bind  (wxEVT_CHECKBOX,    boost::bind (&FilmViewer::refresh_panel,   this));
-	}
-	_eye->Bind              (wxEVT_CHOICE,              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));
-	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> ());
 
-	JobManager::instance()->ActiveJobsChanged.connect (
-		bind (&FilmViewer::active_jobs_changed, this, _2)
-		);
-
-	setup_sensitivity ();
-
 	_config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
 	config_changed (Config::SOUND_OUTPUT);
 }
@@ -195,15 +116,13 @@ FilmViewer::set_film (shared_ptr<Film> film)
 
 	_film = film;
 
+	FilmChanged ();
+
 	_frame.reset ();
 	_closed_captions_dialog->clear ();
 
-	update_position_slider ();
-	update_position_label ();
-
 	if (!_film) {
 		_player.reset ();
-		_closed_captions_dialog->set_player (_player);
 		recreate_butler ();
 		_frame.reset ();
 		refresh_panel ();
@@ -217,18 +136,16 @@ FilmViewer::set_film (shared_ptr<Film> film)
 			_player->set_dcp_decode_reduction (_dcp_decode_reduction);
 		}
 	} catch (bad_alloc) {
-		error_dialog (this, _("There is not enough free memory to do that."));
+		error_dialog (_panel, _("There is not enough free memory to do that."));
 		_film.reset ();
 		return;
 	}
 
-	_closed_captions_dialog->set_player (_player);
-
 	_player->set_always_burn_open_subtitles ();
 	_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));
+	_film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+	_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
 	/* Keep about 1 second's worth of history samples */
 	_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
@@ -237,8 +154,6 @@ FilmViewer::set_film (shared_ptr<Film> film)
 
 	calculate_sizes ();
 	slow_refresh ();
-
-	setup_sensitivity ();
 }
 
 void
@@ -277,6 +192,8 @@ FilmViewer::recreate_butler ()
 		_butler->disable_audio ();
 	}
 
+	_closed_captions_dialog->set_butler (_butler);
+
 	if (was_running) {
 		start ();
 	}
@@ -295,10 +212,16 @@ FilmViewer::get ()
 	DCPOMATIC_ASSERT (_butler);
 
 	do {
-		_player_video = _butler->get_video ();
+		Butler::Error e;
+		_player_video = _butler->get_video (&e);
+		if (!_player_video.first && e == Butler::AGAIN) {
+			signal_manager->when_idle (boost::bind(&FilmViewer::get, this));
+			return;
+		}
 	} while (
+		_player_video.first &&
 		_film->three_d() &&
-		((_eye->GetSelection() == 0 && _player_video.first->eyes() == EYES_RIGHT) || (_eye->GetSelection() == 1 && _player_video.first->eyes() == EYES_LEFT))
+		(_eyes != _player_video.first->eyes())
 		);
 
 	_butler->rethrow ();
@@ -367,8 +290,7 @@ FilmViewer::timer ()
 	}
 
 	get ();
-	update_position_label ();
-	update_position_slider ();
+	PositionChanged ();
 	DCPTime const next = _video_position + one_video_frame();
 
 	if (next >= _film->length()) {
@@ -397,22 +319,22 @@ FilmViewer::paint_panel ()
 	dc.DrawBitmap (frame_bitmap, 0, 0);
 
 	if (_out_size.width < _panel_size.width) {
-		wxPen p (GetBackgroundColour ());
-		wxBrush b (GetBackgroundColour ());
+		wxPen p (_panel->GetParent()->GetBackgroundColour());
+		wxBrush b (_panel->GetParent()->GetBackgroundColour());
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
 	}
 
 	if (_out_size.height < _panel_size.height) {
-		wxPen p (GetBackgroundColour ());
-		wxBrush b (GetBackgroundColour ());
+		wxPen p (_panel->GetParent()->GetBackgroundColour());
+		wxBrush b (_panel->GetParent()->GetBackgroundColour());
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
 	}
 
-	if (_outline_content && _outline_content->GetValue ()) {
+	if (_outline_content) {
 		wxPen p (wxColour (255, 0, 0), 2);
 		dc.SetPen (p);
 		dc.SetBrush (*wxTRANSPARENT_BRUSH);
@@ -420,38 +342,18 @@ 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 page)
+FilmViewer::set_outline_content (bool o)
 {
-	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() - one_video_frame();
-	}
-	seek (t, false);
-	update_position_label ();
+	_outline_content = o;
+	refresh_panel ();
 }
 
 void
-FilmViewer::slider_released ()
+FilmViewer::set_eyes (Eyes e)
 {
-	if (_was_running_before_slider) {
-		/* Restart after a drag */
-		start ();
-	}
-	_slider_being_moved = false;
+	_eyes = e;
+	slow_refresh ();
 }
 
 void
@@ -464,8 +366,7 @@ FilmViewer::panel_sized (wxSizeEvent& ev)
 	if (!quick_refresh()) {
 		slow_refresh ();
 	}
-	update_position_label ();
-	update_position_slider ();
+	PositionChanged ();
 }
 
 void
@@ -497,26 +398,6 @@ FilmViewer::calculate_sizes ()
 	_player->set_video_container_size (_out_size);
 }
 
-void
-FilmViewer::play_clicked ()
-{
-	check_play_state ();
-}
-
-void
-FilmViewer::check_play_state ()
-{
-	if (!_film || _film->video_frame_rate() == 0) {
-		return;
-	}
-
-	if (_play_button->GetValue()) {
-		start ();
-	} else {
-		stop ();
-	}
-}
-
 void
 FilmViewer::start ()
 {
@@ -532,7 +413,7 @@ FilmViewer::start ()
 	_playing = true;
 	_dropped = 0;
 	timer ();
-	_play_button->SetValue (true);
+	Started ();
 }
 
 bool
@@ -548,127 +429,14 @@ FilmViewer::stop ()
 	}
 
 	_playing = false;
-	_play_button->SetValue (false);
+	Stopped ();
 	return true;
 }
 
 void
-FilmViewer::update_position_slider ()
-{
-	if (!_film) {
-		_slider->SetValue (0);
-		return;
-	}
-
-	DCPTime const len = _film->length ();
-
-	if (len.get ()) {
-		int const new_slider_position = 4096 * _video_position.get() / len.get();
-		if (new_slider_position != _slider->GetValue()) {
-			_slider->SetValue (new_slider_position);
-		}
-	}
-}
-
-void
-FilmViewer::update_position_label ()
+FilmViewer::player_change (ChangeType type, int property, bool frequent)
 {
-	if (!_film) {
-		_frame_number->SetLabel ("0");
-		_timecode->SetLabel ("0:0:0.0");
-		return;
-	}
-
-	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 (_video_position.seconds() * fps) + 1));
-	_timecode->SetLabel (time_to_timecode (_video_position, fps));
-}
-
-void
-FilmViewer::active_jobs_changed (optional<string> j)
-{
-	/* examine content is the only job which stops the viewer working */
-	bool const a = !j || *j != "examine_content";
-	_slider->Enable (a);
-	_play_button->Enable (a);
-}
-
-DCPTime
-FilmViewer::nudge_amount (wxKeyboardState& ev)
-{
-	DCPTime amount = one_video_frame ();
-
-	if (ev.ShiftDown() && !ev.ControlDown()) {
-		amount = DCPTime::from_seconds (1);
-	} else if (!ev.ShiftDown() && ev.ControlDown()) {
-		amount = DCPTime::from_seconds (10);
-	} else if (ev.ShiftDown() && ev.ControlDown()) {
-		amount = DCPTime::from_seconds (60);
-	}
-
-	return amount;
-}
-
-void
-FilmViewer::go_to (DCPTime t)
-{
-	if (t < DCPTime ()) {
-		t = DCPTime ();
-	}
-
-	if (t >= _film->length ()) {
-		t = _film->length ();
-	}
-
-	seek (t, true);
-	update_position_label ();
-	update_position_slider ();
-}
-
-void
-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 (_video_position - nudge_amount (ev));
-}
-
-void
-FilmViewer::forward_clicked (wxKeyboardState& ev)
-{
-	go_to (_video_position + nudge_amount (ev));
-}
-
-void
-FilmViewer::player_changed (int property, bool frequent)
-{
-	if (frequent) {
+	if (type != CHANGE_TYPE_DONE || frequent) {
 		return;
 	}
 
@@ -694,38 +462,13 @@ FilmViewer::player_changed (int property, bool frequent)
 	if (!refreshed) {
 		slow_refresh ();
 	}
-	update_position_label ();
-	update_position_slider ();
-}
-
-void
-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);
-	if (_outline_content) {
-		_outline_content->Enable (c);
-	}
-	_frame_number->Enable (c);
-	_timecode->Enable (c);
-	if (_jump_to_selected) {
-		_jump_to_selected->Enable (c);
-	}
-
-	_eye->Enable (c && _film->three_d ());
+	PositionChanged ();
 }
 
 void
-FilmViewer::film_changed (Film::Property p)
+FilmViewer::film_change (ChangeType type, Film::Property p)
 {
-	if (p == Film::CONTENT || p == Film::THREE_D) {
-		setup_sensitivity ();
-	} else if (p == Film::AUDIO_CHANNELS) {
+	if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
 		recreate_butler ();
 	}
 }
@@ -757,18 +500,12 @@ FilmViewer::quick_refresh ()
 }
 
 void
-FilmViewer::set_position (DCPTime p)
+FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
 {
-	_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));
+	optional<DCPTime> dt = _player->content_time_to_dcp (content, t);
+	if (dt) {
+		seek (*dt, accurate);
+	}
 }
 
 void
@@ -778,43 +515,25 @@ FilmViewer::set_coalesce_player_changes (bool c)
 
 	if (!c) {
 		BOOST_FOREACH (int i, _pending_player_changes) {
-			player_changed (i, false);
+			player_change (CHANGE_TYPE_DONE, i, false);
 		}
 		_pending_player_changes.clear ();
 	}
 }
 
 void
-FilmViewer::timecode_clicked ()
+FilmViewer::seek (DCPTime t, bool accurate)
 {
-	PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
-	if (dialog->ShowModal() == wxID_OK) {
-		go_to (dialog->get ());
+	if (!_butler) {
+		return;
 	}
-	dialog->Destroy ();
-}
 
-void
-FilmViewer::frame_number_clicked ()
-{
-	PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ());
-	if (dialog->ShowModal() == wxID_OK) {
-		go_to (dialog->get ());
+	if (t < DCPTime ()) {
+		t = DCPTime ();
 	}
-	dialog->Destroy ();
-}
-
-void
-FilmViewer::jump_to_selected_clicked ()
-{
-	Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ());
-}
 
-void
-FilmViewer::seek (DCPTime t, bool accurate)
-{
-	if (!_butler) {
-		return;
+	if (t >= _film->length ()) {
+		t = _film->length ();
 	}
 
 	bool const was_running = stop ();
@@ -826,6 +545,8 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	if (was_running) {
 		start ();
 	}
+
+	PositionChanged ();
 }
 
 void
@@ -869,7 +590,7 @@ FilmViewer::config_changed (Config::Property p)
 		} catch (RtAudioError& e) {
 #endif
 			error_dialog (
-				this,
+				_panel,
 				_("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(e.what())
 				);
 		}
@@ -962,8 +683,15 @@ FilmViewer::one_video_frame () const
 	return DCPTime::from_frames (1, _film->video_frame_rate());
 }
 
+/** Open a dialog box showing our film's closed captions */
 void
 FilmViewer::show_closed_captions ()
 {
 	_closed_captions_dialog->Show();
 }
+
+void
+FilmViewer::seek_by (DCPTime by, bool accurate)
+{
+	seek (_video_position + by, accurate);
+}