projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump private git so that we use Liberation Sans rather than Arial for a subtitle...
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 1b73e8fc71740c698aac7374b6f264388801636f..17a9a9386006f70fefa024f95c564af37792eeb0 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-29,8
+29,10
@@
#include "content.h"
#include "content.h"
+#include "enum_indexed_vector.h"
#include "font.h"
#include <libcxml/cxml.h>
#include "font.h"
#include <libcxml/cxml.h>
+#include <dcp/content_kind.h>
#include <dcp/encrypted_kdm.h>
#include <dcp/rating.h>
#include <dcp/encrypted_kdm.h>
#include <dcp/rating.h>
@@
-122,7
+124,7
@@
public:
*/
bool reference_text (TextType type) const {
boost::mutex::scoped_lock lm (_mutex);
*/
bool reference_text (TextType type) const {
boost::mutex::scoped_lock lm (_mutex);
- return _reference_text[
static_cast<int>(type)
];
+ return _reference_text[
type
];
}
bool can_reference_text (std::shared_ptr<const Film> film, TextType type, std::string &) const;
}
bool can_reference_text (std::shared_ptr<const Film> film, TextType type, std::string &) const;
@@
-208,7
+210,7
@@
private:
* rather than by rewrapping. The types here are the original text types,
* not what they are being used for.
*/
* rather than by rewrapping. The types here are the original text types,
* not what they are being used for.
*/
-
bool _reference_text[static_cast<int>(TextType::COUNT)]
;
+
EnumIndexedVector<bool, TextType> _reference_text
;
boost::optional<dcp::Standard> _standard;
boost::optional<dcp::ContentKind> _content_kind;
boost::optional<dcp::Standard> _standard;
boost::optional<dcp::ContentKind> _content_kind;