projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update xml_subtitle_test result now that subtitles are being compared; improve placem...
[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 e5466e1398936c1e4917efe11e95fa1cf5b12472..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"
@@
-80,7
+81,7
@@
DCPContentType::from_isdcf_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];
}