X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=ebdd99487bff709b9f58e2999e1c40ecfa143068;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=f64a84f7a15231e891871e5d71d7e86223bd6ed9;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f64a84f7a..ebdd99487 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,7 @@
 #include "timecode.h"
 #include "content_panel.h"
 #include "move_to_dialog.h"
+#include "static_text.h"
 #include "lib/content.h"
 #include "lib/image_content.h"
 #include "lib/text_content.h"
@@ -40,11 +41,12 @@ using std::cout;
 using std::string;
 using std::set;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::locale_convert;
 
-TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer)
+TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
 	/// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
 	: ContentSubPanel (p, S_("Timing|Timing"))
@@ -57,23 +59,23 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer)
 	}
 
 	//// TRANSLATORS: this is an abbreviation for "hours"
-	_h_label = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+	_h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
 #ifdef DCPOMATIC_LINUX
 	/* Hack to work around failure to centre text on GTK */
 	gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "minutes"
-	_m_label = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+	_m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
 #ifdef DCPOMATIC_LINUX
 	gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "seconds"
-	_s_label = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+	_s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
 #ifdef DCPOMATIC_LINUX
 	gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "frames"
-	_f_label = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+	_f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
 #ifdef DCPOMATIC_LINUX
 	gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
 #endif
@@ -115,7 +117,7 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer)
 		}
 	}
 
-	_tip = new wxStaticText (this, wxID_ANY, wxT (""));
+	_tip = new StaticText (this, wxT (""));
 	_tip->SetLabelMarkup (out);
 #ifdef DCPOMATIC_OSX
 	/* Hack to stop hidden text on some versions of OS X */
@@ -133,7 +135,9 @@ TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer)
 	_video_frame_rate->Bind       (wxEVT_TEXT, boost::bind (&TimingPanel::video_frame_rate_changed, this));
 	_set_video_frame_rate->Bind   (wxEVT_BUTTON, boost::bind (&TimingPanel::set_video_frame_rate, this));
 
-	_viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	DCPOMATIC_ASSERT (fv);
+	fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
 
 	setup_sensitivity ();
 	add_to_grid ();
@@ -224,11 +228,11 @@ TimingPanel::update_full_length ()
 {
 	set<DCPTime> check;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		check.insert (i->full_length ());
+		check.insert (i->full_length(_parent->film()));
 	}
 
 	if (check.size() == 1) {
-		_full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ());
+		_full_length->set (_parent->selected().front()->full_length(_parent->film()), _parent->film()->video_frame_rate());
 	} else {
 		_full_length->clear ();
 	}
@@ -239,11 +243,11 @@ TimingPanel::update_play_length ()
 {
 	set<DCPTime> check;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		check.insert (i->length_after_trim ());
+		check.insert (i->length_after_trim(_parent->film()));
 	}
 
 	if (check.size() == 1) {
-		_play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ());
+		_play_length->set (_parent->selected().front()->length_after_trim(_parent->film()), _parent->film()->video_frame_rate());
 	} else {
 		_play_length->clear ();
 	}
@@ -368,7 +372,7 @@ TimingPanel::position_changed ()
 {
 	DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		i->set_position (pos);
+		i->set_position (_parent->film(), pos);
 	}
 }
 
@@ -388,9 +392,14 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
-	DCPTime const ph = _viewer->position ();
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (!fv) {
+		return;
+	}
+
+	DCPTime const ph = fv->position ();
 
-	_viewer->set_coalesce_player_changes (true);
+	fv->set_coalesce_player_changes (true);
 
 	shared_ptr<Content> ref;
 	optional<FrameRateChange> ref_frc;
@@ -399,7 +408,7 @@ TimingPanel::trim_start_changed ()
 	ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
 
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() <= ph && ph < i->end()) {
+		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			/* The playhead is in i.  Use it as a reference to work out
 			   where to put the playhead post-trim; we're trying to keep the playhead
 			   at the same frame of content that we're looking at pre-trim.
@@ -413,16 +422,21 @@ TimingPanel::trim_start_changed ()
 	}
 
 	if (ref) {
-		_viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get())));
+		fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
 	}
 
-	_viewer->set_coalesce_player_changes (false);
+	fv->set_coalesce_player_changes (false);
 }
 
 void
 TimingPanel::trim_end_changed ()
 {
-	_viewer->set_coalesce_player_changes (true);
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (!fv) {
+		return;
+	}
+
+	fv->set_coalesce_player_changes (true);
 
 	ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
@@ -430,11 +444,11 @@ TimingPanel::trim_end_changed ()
 	}
 
 	/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
-	if (_viewer->position() >= _parent->film()->length()) {
-		_viewer->set_position (_parent->film()->length() - DCPTime::from_frames (1, _parent->film()->video_frame_rate()));
+	if (fv->position() >= _parent->film()->length()) {
+		fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
 	}
 
-	_viewer->set_coalesce_player_changes (true);
+	fv->set_coalesce_player_changes (true);
 }
 
 void
@@ -444,7 +458,7 @@ TimingPanel::play_length_changed ()
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
 		i->set_trim_end (
-			ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
+			ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
 			);
 	}
 }
@@ -497,36 +511,46 @@ TimingPanel::film_changed (Film::Property p)
 void
 TimingPanel::trim_start_to_playhead_clicked ()
 {
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (!fv) {
+		return;
+	}
+
 	shared_ptr<const Film> film = _parent->film ();
-	DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
+	DCPTime const ph = fv->position().floor (film->video_frame_rate ());
 	optional<DCPTime> new_ph;
 
-	_viewer->set_coalesce_player_changes (true);
+	fv->set_coalesce_player_changes (true);
 
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() < ph && ph < i->end ()) {
-			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
-			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
+		if (i->position() < ph && ph < i->end(film)) {
+			FrameRateChange const frc = film->active_frame_rate_change (i->position());
+			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc));
 			new_ph = i->position ();
 		}
 	}
 
 	if (new_ph) {
-		_viewer->set_position (new_ph.get());
+		fv->seek (new_ph.get(), true);
 	}
 
-	_viewer->set_coalesce_player_changes (false);
+	fv->set_coalesce_player_changes (false);
 }
 
 void
 TimingPanel::trim_end_to_playhead_clicked ()
 {
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	if (!fv) {
+		return;
+	}
+
 	shared_ptr<const Film> film = _parent->film ();
-	DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
+	DCPTime const ph = fv->position().floor (film->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() < ph && ph < i->end ()) {
+		if (i->position() < ph && ph < i->end(film)) {
 			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
-			i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
+			i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start());
 		}
 	}
 }
@@ -544,10 +568,12 @@ TimingPanel::setup_sensitivity ()
 	_play_length->Enable (e);
 	_video_frame_rate->Enable (e);
 
-	DCPTime const ph = _viewer->position ();
+	shared_ptr<FilmViewer> fv = _viewer.lock ();
+	DCPOMATIC_ASSERT (fv);
+	DCPTime const ph = fv->position ();
 	bool any_over_ph = false;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		if (i->position() <= ph && ph < i->end()) {
+		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			any_over_ph = true;
 		}
 	}
@@ -576,8 +602,8 @@ TimingPanel::move_to_start_of_reel_clicked ()
 	MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
 
 	if (d->ShowModal() == wxID_OK) {
-		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-			i->set_position (d->position ());
+		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+			i->set_position (_parent->film(), d->position());
 		}
 	}
 	d->Destroy ();