projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
dcp_content_type.h
diff --git
a/src/lib/dcp_content_type.h
b/src/lib/dcp_content_type.h
index 14204bd722b6d167e5234e09e88eb331b97362ef..05f30af5515d5c4ad1cd5713fb59d6200164a562 100644
(file)
--- a/
src/lib/dcp_content_type.h
+++ b/
src/lib/dcp_content_type.h
@@
-26,22
+26,22
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <
lib
dcp/dcp.h>
+#include <dcp/dcp.h>
/** @class DCPContentType
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
/** @class DCPContentType
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
-class DCPContentType
+class DCPContentType
: public boost::noncopyable
{
public:
{
public:
- DCPContentType (std::string,
lib
dcp::ContentKind, std::string);
+ DCPContentType (std::string, dcp::ContentKind, std::string);
/** @return user-visible `pretty' name */
std::string pretty_name () const {
return _pretty_name;
}
/** @return user-visible `pretty' name */
std::string pretty_name () const {
return _pretty_name;
}
-
lib
dcp::ContentKind libdcp_kind () const {
+ dcp::ContentKind libdcp_kind () const {
return _libdcp_kind;
}
return _libdcp_kind;
}
@@
-58,7
+58,7
@@
public:
private:
std::string _pretty_name;
private:
std::string _pretty_name;
-
lib
dcp::ContentKind _libdcp_kind;
+ dcp::ContentKind _libdcp_kind;
std::string _dci_name;
/** All available DCP content types */
std::string _dci_name;
/** All available DCP content types */