projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
dcp_content_type.cc
diff --git
a/src/lib/dcp_content_type.cc
b/src/lib/dcp_content_type.cc
index b3a45e40e410e156d5e4b94ff6032ee2e0011d77..b7bf8d81ad14f6b48c8165aff7163854e19b3def 100644
(file)
--- a/
src/lib/dcp_content_type.cc
+++ b/
src/lib/dcp_content_type.cc
@@
-21,8
+21,9
@@
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
-#include <cassert>
#include "dcp_content_type.h"
#include "dcp_content_type.h"
+#include "dcpomatic_assert.h"
+#include <cassert>
#include "i18n.h"
#include "i18n.h"
@@
-33,7
+34,7
@@
vector<DCPContentType const *> DCPContentType::_dcp_content_types;
DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
: _pretty_name (p)
, _libdcp_kind (k)
DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
: _pretty_name (p)
, _libdcp_kind (k)
- , _
dci
_name (d)
+ , _
isdcf
_name (d)
{
}
{
}
@@
-66,10
+67,10
@@
DCPContentType::from_pretty_name (string n)
}
DCPContentType const *
}
DCPContentType const *
-DCPContentType::from_
dci
_name (string n)
+DCPContentType::from_
isdcf
_name (string n)
{
for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
{
for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
- if ((*i)->
dci
_name() == n) {
+ if ((*i)->
isdcf
_name() == n) {
return *i;
}
}
return *i;
}
}
@@
-80,7
+81,7
@@
DCPContentType::from_dci_name (string n)
DCPContentType const *
DCPContentType::from_index (int n)
{
DCPContentType const *
DCPContentType::from_index (int n)
{
-
assert
(n >= 0 && n < int (_dcp_content_types.size ()));
+
DCPOMATIC_ASSERT
(n >= 0 && n < int (_dcp_content_types.size ()));
return _dcp_content_types[n];
}
return _dcp_content_types[n];
}