diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-20 11:19:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-20 11:19:21 +0000 |
| commit | 95d1bfda7b310c70da7f8ce467b7d1eb7d02469c (patch) | |
| tree | 9e0af8348a2e6969d8e06d13f885768dcc815d2e | |
| parent | 5fdaf6d2cf0377d7a326063065c6af5adbf68a92 (diff) | |
Include trimming.
| -rw-r--r-- | src/cpl.cc | 1 | ||||
| -rw-r--r-- | src/subtitle_asset.cc | 1 | ||||
| -rw-r--r-- | src/subtitle_asset.h | 11 | ||||
| -rw-r--r-- | src/wscript | 1 | ||||
| -rw-r--r-- | test/rewrite_subs.cc | 1 |
5 files changed, 12 insertions, 3 deletions
@@ -27,6 +27,7 @@ #include "parse/asset_map.h" #include "reel.h" #include "metadata.h" +#include "exceptions.h" using std::string; using std::stringstream; diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index ca91e2c7..2a244a27 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -21,6 +21,7 @@ #include <boost/lexical_cast.hpp> #include <boost/algorithm/string.hpp> #include "subtitle_asset.h" +#include "parse/subtitle.h" #include "util.h" #include "xml.h" diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index 2da1ce7b..a76a3076 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -17,14 +17,21 @@ */ +#include <libcxml/cxml.h> #include "asset.h" -#include "xml.h" #include "dcp_time.h" -#include "parse/subtitle.h" namespace libdcp { +namespace parse +{ + class Font; + class Text; + class Subtitle; + class LoadFont; +} + class Subtitle { public: diff --git a/src/wscript b/src/wscript index 67fc2539..37151e51 100644 --- a/src/wscript +++ b/src/wscript @@ -51,7 +51,6 @@ def build(bld): types.h util.h version.h - xml.h """ bld.install_files('${PREFIX}/include/libdcp', headers) diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index adb9f6b4..8c055d9e 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -3,6 +3,7 @@ #include "cpl.h" #include "reel.h" #include "subtitle_asset.h" +#include "exceptions.h" using std::cout; using std::cerr; |