From f67bc45820b4e56f90eecb97ba3b7762c119f9b5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 21 Nov 2018 12:15:26 +0000
Subject: Add and use new FrameRateChange constructors.

---
 src/tools/dcpomatic.cc        | 10 +++++-----
 src/tools/dcpomatic_cli.cc    |  4 ++--
 src/tools/dcpomatic_create.cc |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3d74859dc..15c4363ee 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -595,7 +595,7 @@ private:
 	{
 		ContentList const sel = _film_editor->content_panel()->selected();
 		DCPOMATIC_ASSERT (sel.size() == 1);
-		_clipboard = sel.front()->clone();
+		_clipboard = sel.front()->clone(_film);
 	}
 
 	void edit_paste ()
@@ -873,7 +873,7 @@ private:
 	{
 		ContentList vc = _film_editor->content_panel()->selected_video ();
 		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_width ();
+			(*i)->video->scale_and_crop_to_fit_width (_film);
 		}
 	}
 
@@ -881,7 +881,7 @@ private:
 	{
 		ContentList vc = _film_editor->content_panel()->selected_video ();
 		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_height ();
+			(*i)->video->scale_and_crop_to_fit_height (_film);
 		}
 	}
 
@@ -1445,12 +1445,12 @@ private:
 		if (!_film_to_create.empty ()) {
 			_frame->new_film (_film_to_create, optional<string> ());
 			if (!_content_to_add.empty ()) {
-				BOOST_FOREACH (shared_ptr<Content> i, content_factory (_frame->film(), _content_to_add)) {
+				BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
 					_frame->film()->examine_and_add_content (i);
 				}
 			}
 			if (!_dcp_to_add.empty ()) {
-				_frame->film()->examine_and_add_content (shared_ptr<DCPContent> (new DCPContent (_frame->film(), _dcp_to_add)));
+				_frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
 			}
 		}
 
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 7fc5ed55d..779e0ad26 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -84,13 +84,13 @@ print_dump (shared_ptr<Film> film)
 		cout << "\n"
 		     << c->path(0) << "\n"
 		     << "\tat " << c->position().seconds ()
-		     << " length " << c->full_length().seconds ()
+		     << " length " << c->full_length(film).seconds ()
 		     << " start trim " << c->trim_start().seconds ()
 		     << " end trim " << c->trim_end().seconds () << "\n";
 
 		if (c->video) {
 			cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
-			     << "\t" << c->active_video_frame_rate() << "fps\n"
+			     << "\t" << c->active_video_frame_rate(film) << "fps\n"
 			     << "\tcrop left " << c->video->left_crop()
 			     << " right " << c->video->right_crop()
 			     << " top " << c->video->top_crop()
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index da2ce0b72..af3a68b61 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -251,10 +251,10 @@ main (int argc, char* argv[])
 			list<shared_ptr<Content> > content;
 
 			if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
-				content.push_back (shared_ptr<DCPContent> (new DCPContent (film, can)));
+				content.push_back (shared_ptr<DCPContent>(new DCPContent(can)));
 			} else {
 				/* I guess it's not a DCP */
-				content = content_factory (film, can);
+				content = content_factory (can);
 			}
 
 			BOOST_FOREACH (shared_ptr<Content> j, content) {
-- 
cgit v1.2.3