X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=a78e3bdd4fe04f82bf027360cb13074b6777d48b;hb=60a864b0b9985f9e84db7028d5b9a523ecfde522;hp=c643d208044613a42d58d52a56fa587da4ba694a;hpb=4b91800c7de893ec1bbc5a00ab245fd6c01b8b25;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index c643d2080..a78e3bdd4 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -18,41 +18,40 @@
 
 */
 
-#include "timing_panel.h"
-#include "wx_util.h"
-#include "film_viewer.h"
-#include "timecode.h"
+
 #include "content_panel.h"
+#include "dcpomatic_button.h"
+#include "film_viewer.h"
 #include "move_to_dialog.h"
 #include "static_text.h"
-#include "dcpomatic_button.h"
+#include "timecode.h"
+#include "timing_panel.h"
+#include "wx_util.h"
+#include "lib/audio_content.h"
 #include "lib/content.h"
-#include "lib/image_content.h"
-#include "lib/text_content.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_subtitle_content.h"
-#include "lib/audio_content.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/image_content.h"
 #include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
 #if defined(__WXGTK20__) && !defined(__WXGTK3__)
 #define TIMING_PANEL_ALIGNMENT_HACK 1
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <gtk/gtk.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #endif
-#include <boost/foreach.hpp>
 #include <set>
-#include <iostream>
 
-using std::cout;
+
 using std::string;
 using std::set;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -60,12 +59,20 @@ using namespace boost::placeholders;
 using dcp::locale_convert;
 using namespace dcpomatic;
 
-TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
+
+TimingPanel::TimingPanel (ContentPanel* p, 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"))
 	, _viewer (viewer)
 	, _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1))
+{
+
+}
+
+
+void
+TimingPanel::create ()
 {
 	wxSize size = TimecodeBase::size (this);
 
@@ -118,19 +125,17 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 	_trim_end_to_playhead->Bind   (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this));
 	_play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this));
 
-	shared_ptr<FilmViewer> fv = _viewer.lock ();
-	DCPOMATIC_ASSERT (fv);
-	fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+	_viewer.ImageChanged.connect(boost::bind(&TimingPanel::setup_sensitivity, this));
 
 	setup_sensitivity ();
 	add_to_grid ();
+
+	_sizer->Layout ();
 }
 
 void
 TimingPanel::add_to_grid ()
 {
-	bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
 	int r = 0;
 
 	wxSizer* labels = new wxBoxSizer (wxHORIZONTAL);
@@ -148,20 +153,12 @@ TimingPanel::add_to_grid ()
 	_grid->Add (_position, wxGBPosition(r, 1));
 	++r;
 
-	_move_to_start_of_reel->Show (full);
-	_full_length_label->Show (full);
-	_full_length->Show (full);
-	_play_length_label->Show (full);
-	_play_length->Show (full);
-
-	if (full) {
-		_grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1));
-		++r;
+	_grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1));
+	++r;
 
-		add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
-		_grid->Add (_full_length, wxGBPosition(r, 1));
-		++r;
-	}
+	add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
+	_grid->Add (_full_length, wxGBPosition(r, 1));
+	++r;
 
 	add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
 	_grid->Add (_trim_start, wxGBPosition(r, 1));
@@ -177,11 +174,9 @@ TimingPanel::add_to_grid ()
 	_grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
 	++r;
 
-	if (full) {
-		add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
-		_grid->Add (_play_length, wxGBPosition(r, 1));
-		++r;
-	}
+	add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
+	_grid->Add (_play_length, wxGBPosition(r, 1));
+	++r;
 
 	/* Completely speculative fix for #891 */
 	_grid->Layout ();
@@ -191,7 +186,7 @@ void
 TimingPanel::update_full_length ()
 {
 	set<DCPTime> check;
-	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		check.insert (i->full_length(_parent->film()));
 	}
 
@@ -206,7 +201,7 @@ void
 TimingPanel::update_play_length ()
 {
 	set<DCPTime> check;
-	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		check.insert (i->length_after_trim(_parent->film()));
 	}
 
@@ -233,7 +228,7 @@ TimingPanel::film_content_changed (int property)
 	if (property == ContentProperty::POSITION) {
 
 		set<DCPTime> check;
-		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		for (auto i: _parent->selected()) {
 			check.insert (i->position ());
 		}
 
@@ -254,7 +249,7 @@ TimingPanel::film_content_changed (int property)
 	} else if (property == ContentProperty::TRIM_START) {
 
 		set<ContentTime> check;
-		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		for (auto i: _parent->selected()) {
 			check.insert (i->trim_start ());
 		}
 
@@ -267,7 +262,7 @@ TimingPanel::film_content_changed (int property)
 	} else if (property == ContentProperty::TRIM_END) {
 
 		set<ContentTime> check;
-		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		for (auto i: _parent->selected()) {
 			check.insert (i->trim_end ());
 		}
 
@@ -294,7 +289,7 @@ TimingPanel::film_content_changed (int property)
 		shared_ptr<const Content> content;
 		int count_ac = 0;
 		int count_sc = 0;
-		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		for (auto i: _parent->selected()) {
 			if (i->video && i->video_frame_rate()) {
 				check_vc.insert (i->video_frame_rate().get());
 				content = i;
@@ -312,7 +307,7 @@ TimingPanel::film_content_changed (int property)
 	}
 
 	bool have_still = false;
-	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
 		if (ic && ic->still ()) {
 			have_still = true;
@@ -328,7 +323,7 @@ void
 TimingPanel::position_changed ()
 {
 	DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		i->set_position (_parent->film(), pos);
 	}
 }
@@ -338,7 +333,7 @@ TimingPanel::full_length_changed ()
 {
 	int const vfr = _parent->film()->video_frame_rate ();
 	Frame const len = _full_length->get (vfr).frames_round (vfr);
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
 		if (ic && ic->still ()) {
 			ic->video->set_length (len);
@@ -349,21 +344,16 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
-	shared_ptr<FilmViewer> fv = _viewer.lock ();
-	if (!fv) {
-		return;
-	}
-
-	DCPTime const ph = fv->position ();
+	DCPTime const ph = _viewer.position();
 
-	fv->set_coalesce_player_changes (true);
+	_viewer.set_coalesce_player_changes(true);
 
 	shared_ptr<Content> ref;
 	optional<FrameRateChange> ref_frc;
 	optional<DCPTime> ref_ph;
 
 	Suspender::Block bl = _film_content_changed_suspender.block ();
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		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
@@ -379,34 +369,29 @@ TimingPanel::trim_start_changed ()
 	}
 
 	if (ref) {
-		fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
+		_viewer.seek(max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
 	}
 
-	fv->set_coalesce_player_changes (false);
+	_viewer.set_coalesce_player_changes(false);
 }
 
 void
 TimingPanel::trim_end_changed ()
 {
-	shared_ptr<FilmViewer> fv = _viewer.lock ();
-	if (!fv) {
-		return;
-	}
-
-	fv->set_coalesce_player_changes (true);
+	_viewer.set_coalesce_player_changes(true);
 
 	Suspender::Block bl = _film_content_changed_suspender.block ();
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
 		i->set_trim_end (trim);
 	}
 
 	/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
-	if (fv->position() >= _parent->film()->length()) {
-		fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
+	if (_viewer.position() >= _parent->film()->length()) {
+		_viewer.seek(_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
 	}
 
-	fv->set_coalesce_player_changes (false);
+	_viewer.set_coalesce_player_changes(false);
 }
 
 void
@@ -414,11 +399,10 @@ TimingPanel::play_length_changed ()
 {
 	DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
 	Suspender::Block bl = _film_content_changed_suspender.block ();
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
-		i->set_trim_end (
-			ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
-			);
+		auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length);
+		i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start()));
 	}
 }
 
@@ -438,7 +422,7 @@ TimingPanel::content_selection_changed ()
 void
 TimingPanel::film_changed (Film::Property p)
 {
-	if (p == Film::VIDEO_FRAME_RATE) {
+	if (p == Film::Property::VIDEO_FRAME_RATE) {
 		update_full_length ();
 		update_play_length ();
 	}
@@ -447,18 +431,13 @@ 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 = fv->position().floor (film->video_frame_rate ());
+	auto film = _parent->film ();
+	DCPTime const ph = _viewer.position().floor(film->video_frame_rate());
 	optional<DCPTime> new_ph;
 
-	fv->set_coalesce_player_changes (true);
+	_viewer.set_coalesce_player_changes(true);
 
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		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));
@@ -466,24 +445,19 @@ TimingPanel::trim_start_to_playhead_clicked ()
 		}
 	}
 
-	fv->set_coalesce_player_changes (false);
+	_viewer.set_coalesce_player_changes(false);
 
 	if (new_ph) {
-		fv->seek (new_ph.get(), true);
+		_viewer.seek(new_ph.get(), true);
 	}
 }
 
 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 = fv->position().floor (film->video_frame_rate ());
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	auto film = _parent->film ();
+	auto const ph = _viewer.position().floor(film->video_frame_rate());
+	for (auto i: _parent->selected()) {
 		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(film) - ph, frc) - i->trim_start());
@@ -503,11 +477,9 @@ TimingPanel::setup_sensitivity ()
 	_trim_end->Enable (e);
 	_play_length->Enable (e);
 
-	shared_ptr<FilmViewer> fv = _viewer.lock ();
-	DCPOMATIC_ASSERT (fv);
-	DCPTime const ph = fv->position ();
+	auto const ph = _viewer.position();
 	bool any_over_ph = false;
-	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			any_over_ph = true;
 		}
@@ -523,7 +495,7 @@ TimingPanel::move_to_start_of_reel_clicked ()
 	/* Find common position of all selected content, if it exists */
 
 	optional<DCPTime> position;
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+	for (auto i: _parent->selected()) {
 		if (!position) {
 			position = i->position();
 		} else {
@@ -534,10 +506,10 @@ TimingPanel::move_to_start_of_reel_clicked ()
 		}
 	}
 
-	MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
+	auto d = new MoveToDialog(this, position, _parent->film());
 
 	if (d->ShowModal() == wxID_OK) {
-		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+		for (auto i: _parent->selected()) {
 			i->set_position (_parent->film(), d->position());
 		}
 	}