projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Font and Screen into dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
screen_kdm.h
diff --git
a/src/lib/screen_kdm.h
b/src/lib/screen_kdm.h
index 9ab73b8515ac69a3c3d23b54c5250bb9da2b6708..351c2f1c2617de141a79a097184fc59a2f088a8c 100644
(file)
--- a/
src/lib/screen_kdm.h
+++ b/
src/lib/screen_kdm.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-25,13
+25,15
@@
#include <dcp/name_format.h>
#include <boost/shared_ptr.hpp>
#include <dcp/name_format.h>
#include <boost/shared_ptr.hpp>
-class Screen;
+namespace dcpomatic {
+ class Screen;
+}
/** Simple class to collect a screen and an encrypted KDM */
class ScreenKDM
{
public:
/** Simple class to collect a screen and an encrypted KDM */
class ScreenKDM
{
public:
- ScreenKDM (boost::shared_ptr<Screen> s, dcp::EncryptedKDM k)
+ ScreenKDM (boost::shared_ptr<
dcpomatic::
Screen> s, dcp::EncryptedKDM k)
: screen (s)
, kdm (k)
{}
: screen (s)
, kdm (k)
{}
@@
-42,7
+44,7
@@
public:
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);
- boost::shared_ptr<Screen> screen;
+ boost::shared_ptr<
dcpomatic::
Screen> screen;
dcp::EncryptedKDM kdm;
};
dcp::EncryptedKDM kdm;
};