projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up test film naming.
[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 aba3054490ad89aaf1ebc9e27a82c9bf5fcdab3c..b703970a3c7fb6811a3a31f3a051e0296398d51d 100644
(file)
--- a/
src/lib/dcp_content_type.h
+++ b/
src/lib/dcp_content_type.h
@@
-23,6
+23,7
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
+#include <libdcp/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.)
@@
-30,16
+31,19
@@
class DCPContentType
{
public:
class DCPContentType
{
public:
- DCPContentType (std::string, std::string);
+ DCPContentType (std::string,
libdcp::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;
}
- /** @return name as written to a DCP */
- std::string dcp_name () const {
- return _dcp_name;
+ libdcp::ContentKind libdcp_kind () const {
+ return _libdcp_kind;
+ }
+
+ std::string dci_name () const {
+ return _dci_name;
}
static DCPContentType const * from_pretty_name (std::string);
}
static DCPContentType const * from_pretty_name (std::string);
@@
-50,7
+54,8
@@
public:
private:
std::string _pretty_name;
private:
std::string _pretty_name;
- std::string _dcp_name;
+ libdcp::ContentKind _libdcp_kind;
+ std::string _dci_name;
/** All available DCP content types */
static std::vector<DCPContentType const *> _dcp_content_types;
/** All available DCP content types */
static std::vector<DCPContentType const *> _dcp_content_types;