summaryrefslogtreecommitdiff
path: root/src/lib/writer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-08 23:56:32 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:55 +0100
commitf41818f14369f170475b7f2bde1a2dd856517b14 (patch)
tree2fd7d07fb63e46e8ad2964917cff5704d1893f85 /src/lib/writer.h
parentc4403784febdbdd42e9c32e67fadb147f11fe566 (diff)
Put Font and Screen into dcpomatic namespace.
Diffstat (limited to 'src/lib/writer.h')
-rw-r--r--src/lib/writer.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/writer.h b/src/lib/writer.h
index ce1d04ced..5fe96a3ac 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -36,10 +36,13 @@ namespace dcp {
class Data;
}
+namespace dcpomatic {
+ class Font;
+}
+
class Film;
class AudioBuffers;
class Job;
-class Font;
class ReferencedReelAsset;
class ReelWriter;
@@ -106,7 +109,7 @@ public:
void repeat (Frame, Eyes);
void write (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
- void write (std::list<boost::shared_ptr<Font> > fonts);
+ void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts);
void write (ReferencedReelAsset asset);
void finish ();
@@ -163,5 +166,5 @@ private:
std::list<ReferencedReelAsset> _reel_assets;
- std::list<boost::shared_ptr<Font> > _fonts;
+ std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
};