summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-12-05 21:36:53 +0100
committerCarl Hetherington <cth@carlh.net>2025-12-05 21:36:53 +0100
commit59e358ae25f84314afc6d8235aecaec124822f3f (patch)
tree86a353b49bcc8b0cd5d3a9a4db4ca13e4f5f20f0 /src/lib/dcp_examiner.cc
parent15add8826db680f0e1ad13246e0411d5f83f5296 (diff)
Cleanup: can now remove the _NC log variants.
Diffstat (limited to 'src/lib/dcp_examiner.cc')
-rw-r--r--src/lib/dcp_examiner.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index b94d88486..f2e9c5643 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -332,7 +332,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
_kdm_valid = true;
- LOG_GENERAL_NC("Check that everything encrypted has a key");
+ LOG_GENERAL("Check that everything encrypted has a key");
/* Check first that anything encrypted has a key. We must do this, as if we try to
* read encrypted data with asdcplib without even offering a key it will just return
@@ -346,7 +346,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
auto pic = i->main_picture()->asset();
if (pic->encrypted() && !pic->key()) {
_kdm_valid = false;
- LOG_GENERAL_NC("Picture has no key");
+ LOG_GENERAL("Picture has no key");
break;
}
auto j2k_mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(pic);
@@ -376,7 +376,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
auto sound = i->main_sound()->asset();
if (sound->encrypted() && !sound->key()) {
_kdm_valid = false;
- LOG_GENERAL_NC("Sound has no key");
+ LOG_GENERAL("Sound has no key");
break;
}
auto reader = sound->start_read();
@@ -389,7 +389,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
_kdm_valid = false;
- LOG_GENERAL_NC("Subtitle has no key");
+ LOG_GENERAL("Subtitle has no key");
break;
}
sub->texts();
@@ -400,7 +400,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
auto mxf_cap = dynamic_pointer_cast<dcp::MXF>(cap);
if (mxf_cap && mxf_cap->encrypted() && !mxf_cap->key()) {
_kdm_valid = false;
- LOG_GENERAL_NC("Caption has no key");
+ LOG_GENERAL("Caption has no key");
break;
}
cap->texts();
@@ -410,7 +410,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
if (auto atmos = i->atmos()->asset()) {
if (atmos->encrypted() && !atmos->key()) {
_kdm_valid = false;
- LOG_GENERAL_NC("ATMOS sound has no key");
+ LOG_GENERAL("ATMOS sound has no key");
break;
}
auto reader = atmos->start_read();