From: Carl Hetherington <cth@carlh.net>
Date: Tue, 22 Jul 2014 12:50:57 +0000 (+0100)
Subject: Some include trimming,.
X-Git-Tag: v1.1.0~173
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=da1cb49ee9fd13322aa643d6d062b79413be6473;p=libdcp.git

Some include trimming,.
---

diff --git a/src/cpl.cc b/src/cpl.cc
index 3599231d..d7f3a79a 100644
--- 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 397bdac0..58b6c66f 100644
--- 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 0f0cf5fa..f0537cb5 100644
--- 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 {