From 7c27dff5817715965e86798108c596f9a1675394 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 6 Dec 2020 21:06:19 +0100
Subject: [PATCH] Remove a pointless parameter that the callee can calculate.

---
 src/lib/reel_writer.cc   | 4 ++--
 src/lib/reel_writer.h    | 3 +--
 src/lib/writer.cc        | 2 +-
 test/reel_writer_test.cc | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 3c516f54c..ab06819b1 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -93,13 +93,13 @@ mxf_metadata ()
 
 /** @param job Related job, or 0 */
 ReelWriter::ReelWriter (
-	shared_ptr<const Film> film, DCPTimePeriod period, shared_ptr<Job> job, int reel_index, int reel_count, optional<string> content_summary
+	shared_ptr<const Film> film, DCPTimePeriod period, shared_ptr<Job> job, int reel_index, int reel_count
 	)
 	: _film (film)
 	, _period (period)
 	, _reel_index (reel_index)
 	, _reel_count (reel_count)
-	, _content_summary (content_summary)
+	, _content_summary (film->content_summary(period))
 	, _job (job)
 {
 	/* Create or find our picture asset in a subdirectory, named
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 09c29adae..fd11d17aa 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -62,8 +62,7 @@ public:
 		dcpomatic::DCPTimePeriod period,
 		boost::shared_ptr<Job> job,
 		int reel_index,
-		int reel_count,
-		boost::optional<std::string> content_summary
+		int reel_count
 		);
 
 	void write (boost::shared_ptr<const dcp::Data> encoded, Frame frame, Eyes eyes);
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5198cfb31..69ee9055d 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -89,7 +89,7 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 	int reel_index = 0;
 	list<DCPTimePeriod> const reels = _film->reels ();
 	BOOST_FOREACH (DCPTimePeriod p, reels) {
-		_reels.push_back (ReelWriter (film, p, job, reel_index++, reels.size(), _film->content_summary(p)));
+		_reels.push_back (ReelWriter(film, p, job, reel_index++, reels.size()));
 	}
 
 	_last_written.resize (reels.size());
diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index 51c820ba3..21e924380 100644
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (write_frame_info_test)
 {
 	shared_ptr<Film> film = new_test_film2 ("write_frame_info_test");
 	dcpomatic::DCPTimePeriod const period (dcpomatic::DCPTime(0), dcpomatic::DCPTime(96000));
-	ReelWriter writer (film, period, shared_ptr<Job>(), 0, 1, optional<string>());
+	ReelWriter writer (film, period, shared_ptr<Job>(), 0, 1);
 
 	/* Write the first one */
 
-- 
2.30.2