summaryrefslogtreecommitdiff
path: root/src/lib/player.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/player.h
parentc4403784febdbdd42e9c32e67fadb147f11fe566 (diff)
Put Font and Screen into dcpomatic namespace.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 381aa80b7..9f3dc7e71 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -41,9 +41,12 @@ namespace dcp {
class ReelAsset;
}
+namespace dcpomatic {
+ class Font;
+}
+
class PlayerVideo;
class Playlist;
-class Font;
class AudioBuffers;
class ReferencedReelAsset;
class Shuffler;
@@ -70,7 +73,7 @@ public:
bool pass ();
void seek (dcpomatic::DCPTime time, bool accurate);
- std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
+ std::list<boost::shared_ptr<dcpomatic::Font> > get_subtitle_fonts ();
std::list<ReferencedReelAsset> get_reel_assets ();
dcp::Size video_container_size () const {
boost::mutex::scoped_lock lm (_mutex);