From 5d8a1583a57ae30c4f8ffbe0a7877dd7ca20236b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Sep 2018 13:03:07 +0100 Subject: Silence warnings from asdcplib when testing a MXF file for validity. --- compile_commands.json | 1 - cscript | 4 ++-- src/smpte_subtitle_asset.cc | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 120000 compile_commands.json diff --git a/compile_commands.json b/compile_commands.json deleted file mode 120000 index 25eb4b2b..00000000 --- a/compile_commands.json +++ /dev/null @@ -1 +0,0 @@ -build/compile_commands.json \ No newline at end of file diff --git a/cscript b/cscript index f9083efa..e645b2b4 100644 --- a/cscript +++ b/cscript @@ -36,9 +36,9 @@ import shutil def dependencies(target, options): if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'): - return (('libcxml', 'a45e430'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', 'f3b0fb8')) + return (('libcxml', 'a45e430'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', 'b536bc0')) else: - return (('libcxml', 'a45e430'), ('openjpeg2-cdist', 'c40a3b8'), ('asdcplib-cth', 'f3b0fb8')) + return (('libcxml', 'a45e430'), ('openjpeg2-cdist', 'c40a3b8'), ('asdcplib-cth', 'b536bc0')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index b568139a..8408a57e 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -47,6 +47,7 @@ #include "subtitle_image.h" #include #include +#include #include #include #include @@ -268,7 +269,9 @@ bool SMPTESubtitleAsset::valid_mxf (boost::filesystem::path file) { ASDCP::TimedText::MXFReader reader; + Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL); Kumu::Result_t r = reader.OpenRead (file.string().c_str ()); + Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL); return !ASDCP_FAILURE (r); } -- cgit v1.2.3