Some include trimming,.

diff --git a/src/cpl.cc b/src/cpl.cc
index 3599231daad1420b1acb201568667f6237514623..d7f3a79a80cb8c5e44fc17c9b9d93bcb07f58ed7 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -17,23 +17,17 @@
 
 */
 
-#include "raw_convert.h"
 #include "cpl.h"
 #include "util.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
 #include "reel.h"
 #include "metadata.h"
 #include "signer.h"
-#include "exceptions.h"
 #include "xml.h"
-#include "compose.hpp"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
 #include "local_time.h"
+#include "compose.hpp"
 #include <libxml/parser.h>
 
 using std::string;

diff --git a/src/dcp.cc b/src/dcp.cc
index 397bdac0edbae0fc51370d88852547417e1b1be3..58b6c66fa709822b0ad6b196dff74fb03debbc0d 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -31,7 +31,6 @@
 #include "util.h"
 #include "metadata.h"
 #include "exceptions.h"
-#include "reel.h"
 #include "cpl.h"
 #include "signer.h"
 #include "compose.hpp"
@@ -43,15 +42,12 @@
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <iostream>
 
 using std::string;
 using std::list;
 using std::cout;
-using std::stringstream;
 using std::ostream;
 using std::make_pair;
 using std::map;
@@ -237,9 +233,7 @@ boost::filesystem::path
 DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const Signer> signer) const
 {
        boost::filesystem::path p = _directory;
-       stringstream s;
-       s << pkl_uuid << "_pkl.xml";
-       p /= s.str();
+       p /= String::compose ("%1_pkl.xml", pkl_uuid);
 
        xmlpp::Document doc;
        xmlpp::Element* pkl;

diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h
index 0f0cf5faccaca018b4995e21dd725880ee478e62..f0537cb5d38b42ca00c4e99d54983d0dde165e9b 100644 (file)
--- a/src/reel_subtitle_asset.h
+++ b/src/reel_subtitle_asset.h
@@ -25,6 +25,7 @@
 #define LIBDCP_REEL_SUBTITLE_ASSET_H
 
 #include "reel_asset.h"
+#include "subtitle_content.h"
 
 namespace dcp {