projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 0bd28a9e37de0d1ce51d5e4a7bdb7e9fc86fba1e..b455e7f7f63b7e4018fbc39600a1b9e78cd8de67 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-29,6
+29,7
@@
#include "compose.hpp"
#include "dcp_decoder.h"
#include "log.h"
#include "compose.hpp"
#include "dcp_decoder.h"
#include "log.h"
+#include "dcpomatic_log.h"
#include "text_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include "text_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
@@
-64,8
+65,6
@@
int const DCPContentProperty::NAME = 605;
int const DCPContentProperty::TEXTS = 606;
int const DCPContentProperty::CPL = 607;
int const DCPContentProperty::TEXTS = 606;
int const DCPContentProperty::CPL = 607;
-#define LOG_GENERAL(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
DCPContent::DCPContent (boost::filesystem::path p)
: _encrypted (false)
, _needs_assets (false)
DCPContent::DCPContent (boost::filesystem::path p)
: _encrypted (false)
, _needs_assets (false)
@@
-342,7
+341,7
@@
DCPContent::full_length (shared_ptr<const Film> film) const
if (!video) {
return DCPTime();
}
if (!video) {
return DCPTime();
}
- FrameRateChange const frc (
active_video_frame_rate(film), film->video_frame_rate
());
+ FrameRateChange const frc (
film, shared_from_this
());
return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
}
return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
}
@@
-612,7
+611,7
@@
DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
{
shared_ptr<DCPDecoder> decoder;
try {
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), false));
+ decoder.reset (new DCPDecoder (
film,
shared_from_this(), false));
} catch (dcp::DCPReadError) {
/* We couldn't read the DCP, so it's probably missing */
return false;
} catch (dcp::DCPReadError) {
/* We couldn't read the DCP, so it's probably missing */
return false;
@@
-647,8
+646,9
@@
DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
{
shared_ptr<DCPDecoder> decoder;
try {
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), false));
+ decoder.reset (new DCPDecoder (
film,
shared_from_this(), false));
} catch (dcp::DCPReadError) {
} catch (dcp::DCPReadError) {
+
/* We couldn't read the DCP, so it's probably missing */
return false;
} catch (dcp::KDMDecryptionError) {
/* We couldn't read the DCP, so it's probably missing */
return false;
} catch (dcp::KDMDecryptionError) {