projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index a5b5f37e13f967a9c4845d707000f19049c140cb..d1a65800155ec13559b071ee41f3332a782af08a 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-17,14
+17,14
@@
*/
*/
-#include <dcp/dcp.h>
-#include <dcp/exceptions.h>
#include "dcp_content.h"
#include "dcp_examiner.h"
#include "job.h"
#include "film.h"
#include "config.h"
#include "compose.hpp"
#include "dcp_content.h"
#include "dcp_examiner.h"
#include "job.h"
#include "film.h"
#include "config.h"
#include "compose.hpp"
+#include <dcp/dcp.h>
+#include <dcp/exceptions.h>
#include "i18n.h"
#include "i18n.h"
@@
-139,7
+139,7
@@
DCPTime
DCPContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
DCPContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
-
assert
(film);
+
DCPOMATIC_ASSERT
(film);
return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
}
return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
}