diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-25 13:34:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-25 13:34:52 +0100 |
| commit | 5384418af0299194ecf3e27fd2e443e7d882a713 (patch) | |
| tree | f98eb2909e4601d56774d1c23119b23aa91ecdb6 | |
| parent | b3e7a9625f860e7d83c4077b24fe811eb9941456 (diff) | |
Tidy up interop API.
| -rw-r--r-- | examples/make_dcp.cc | 2 | ||||
| -rw-r--r-- | src/dcp.cc | 2 | ||||
| -rw-r--r-- | src/dcp.h | 2 | ||||
| -rw-r--r-- | test/dcp_test.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc index 14b0da36..6da9cf20 100644 --- a/examples/make_dcp.cc +++ b/examples/make_dcp.cc @@ -109,7 +109,7 @@ main () is ready to ingest and play. */ libdcp::XMLMetadata metadata; - dcp.write_xml (metadata); + dcp.write_xml (false, metadata); return 0; } @@ -64,7 +64,7 @@ DCP::DCP (string directory) } void -DCP::write_xml (XMLMetadata const & metadata, bool interop, shared_ptr<Encryption> crypt) const +DCP::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr<Encryption> crypt) const { for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { (*i)->write_xml (interop, metadata, crypt); @@ -78,7 +78,7 @@ public: /** Write the required XML files to the directory that was * passed into the constructor. */ - void write_xml (XMLMetadata const &, bool interop = false, boost::shared_ptr<Encryption> crypt = boost::shared_ptr<Encryption> ()) const; + void write_xml (bool interop, XMLMetadata const &, boost::shared_ptr<Encryption> crypt = boost::shared_ptr<Encryption> ()) const; /** Compare this DCP with another, according to various options. * @param other DCP to compare this one to. diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 970ca9dd..1b943694 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (dcp_test) cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ()))); d.add_cpl (cpl); - d.write_xml (xml_meta); + d.write_xml (false, xml_meta); /* build/test/foo is checked against test/ref/DCP/foo by run-tests.sh */ } |
