Remove a pointless parameter that the callee can calculate.

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 3c516f54c1c753335b09d14e7af9d4bf55561028..ab06819b150307bde7d72efd8371d86425ae8891 100644 (file)
--- 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 09c29adae05a1e7efacdf22448ed81ac0e6ce31e..fd11d17aac2451707b8d2e5bd9916ed1d743c309 100644 (file)
--- 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 5198cfb319e6b1b148bdb51328d92c501d2c67e2..69ee9055debf49a7c2d6df577fdadd2249e4fc24 100644 (file)
--- 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 51c820ba31a1500210f2bf0a0561d2b121648c80..21e924380c66f7b938512c2862ab9c504ca31769 100644 (file)
--- 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 */