diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
| commit | 938f413bb4ebecd51c805027e331cb7eb0ca9502 (patch) | |
| tree | 27fa1618657055b7421d4987b25987b48958b764 /src/subtitle_asset.h | |
| parent | c2bac22380bea453665a24c6f39200a977771daf (diff) | |
| parent | f51e1ec6f5cacd05196ce7625709c18f6b38f63e (diff) | |
Merge master; at least partially.
Diffstat (limited to 'src/subtitle_asset.h')
| -rw-r--r-- | src/subtitle_asset.h | 11 |
1 files changed, 9 insertions, 2 deletions
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: |