Bump libdcp for new asdcplib version.

diff --git a/cscript b/cscript
index 970a82b15ea921e8e3cee26568c596e63ece6ad8..c1ed51d6ca8d60c6d5dd66afa66a7d0f63f95be7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -535,7 +535,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.9.3', {'c++17': target.platform == 'osx'}))
+    deps.append(('libdcp', 'v1.9.4', {'c++17': target.platform == 'osx'}))
     deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6498254e57155f151a88951234947ffe86eaba24..f53203264fe286b2ce9e5af49a14c753f4b022d7 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -141,8 +141,8 @@ function copy_libs {
     local dest="$1"
     copy_lib_root libcxml "$dest"
     copy_lib_root libdcp-1.0 "$dest"
-    copy_lib_root libasdcp-carl "$dest"
-    copy_lib_root libkumu-carl "$dest"
+    copy_lib_root libasdcp-dcpomatic "$dest"
+    copy_lib_root libkumu-dcpomatic "$dest"
     copy_lib_root libsub "$dest"
     copy_lib_root libopenjp2 "$dest"
     copy_lib_root libavdevice "$dest"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index adbd1b0efa41a7adcefcb843d5929d777698fd51..b208f94dd7294ff5987f5ba57b0bc7c00f906e88 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -188,8 +188,8 @@ File "%static_deps%/bin/libdl.dll"
 File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe"
 File /oname=dcpomatic2_kdm_inspect.exe "%cdist_deps%/bin/dcpkdm.exe"
 File "%cdist_deps%/bin/leqm_nrt.dll"
-File "%cdist_deps%/bin/asdcp-carl.dll"
-File "%cdist_deps%/bin/kumu-carl.dll"
+File "%cdist_deps%/bin/asdcp-dcpomatic.dll"
+File "%cdist_deps%/bin/kumu-dcpomatic.dll"
     """, file=f)
 
     if disk:

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 912a71c4d140da9ddd6b6a7f47191edcb4384132..c80ef224e922391c142014fe909f3e5b08732030 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -1085,7 +1085,7 @@ Config::write_config () const
        }
 
        if (_playlist_editor_restricted_menus) {
-               root->add_child("PlaylistEditorRestrictedMenus")->add_child_text("1");
+               cxml::add_text_child(root, "PlaylistEditorRestrictedMenus", "1");
        }
 
        /* [XML] ImageDisplay Screen number to put image on in dual-screen player mode. */

diff --git a/test/bv20_test.cc b/test/bv20_test.cc
index 5530a05d05f3b8d3a0869b57d0eed3946974e819..7f4e98aa736d11111ae75f9cca3730887fbc0c03 100644 (file)
--- a/test/bv20_test.cc
+++ b/test/bv20_test.cc
@@ -49,7 +49,8 @@ has_mxf_mca_subdescriptors(shared_ptr<const Film> film)
         * whether they exist.
         */
 
-       ASDCP::PCM::MXFReader reader;
+       Kumu::FileReaderFactory factory;
+       ASDCP::PCM::MXFReader reader(factory);
        auto r = reader.OpenRead(find_file(film->dir(film->dcp_name()), "pcm_").string());
        BOOST_REQUIRE(!ASDCP_FAILURE(r));
 

diff --git a/test/test.cc b/test/test.cc
index 9ab7fe4804b0a146880413707efa0c13373038ca..ff4a3c9c0cafd8f223796c35bd5d36df0ddd05d4 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -287,13 +287,14 @@ check_wav_file (boost::filesystem::path ref, boost::filesystem::path check)
 void
 check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
-       ASDCP::PCM::MXFReader ref_reader;
+       Kumu::FileReaderFactory factory;
+       ASDCP::PCM::MXFReader ref_reader(factory);
        BOOST_REQUIRE (!ASDCP_FAILURE (ref_reader.OpenRead (ref.string().c_str())));
 
        ASDCP::PCM::AudioDescriptor ref_desc;
        BOOST_REQUIRE (!ASDCP_FAILURE (ref_reader.FillAudioDescriptor (ref_desc)));
 
-       ASDCP::PCM::MXFReader check_reader;
+       ASDCP::PCM::MXFReader check_reader(factory);
        BOOST_REQUIRE (!ASDCP_FAILURE (check_reader.OpenRead (check.string().c_str())));
 
        ASDCP::PCM::AudioDescriptor check_desc;
@@ -316,13 +317,14 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 bool
 mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose)
 {
-       ASDCP::ATMOS::MXFReader ref_reader;
+       Kumu::FileReaderFactory factory;
+       ASDCP::ATMOS::MXFReader ref_reader(factory);
        BOOST_REQUIRE (!ASDCP_FAILURE(ref_reader.OpenRead(ref.string().c_str())));
 
        ASDCP::ATMOS::AtmosDescriptor ref_desc;
        BOOST_REQUIRE (!ASDCP_FAILURE(ref_reader.FillAtmosDescriptor(ref_desc)));
 
-       ASDCP::ATMOS::MXFReader check_reader;
+       ASDCP::ATMOS::MXFReader check_reader(factory);
        BOOST_REQUIRE (!ASDCP_FAILURE(check_reader.OpenRead(check.string().c_str())));
 
        ASDCP::ATMOS::AtmosDescriptor check_desc;

diff --git a/wscript b/wscript
index 96d3c030c9302808084324b81f0bfee462c21c81..fb2598dc9ae2acc9ab2baace71f6a1dcd216f402 100644 (file)
--- a/wscript
+++ b/wscript
@@ -377,7 +377,7 @@ def configure(conf):
     if conf.options.static_dcp:
         conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags' % libdcp_version, uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
         conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags --libs' % libdcp_version, uselib_store='DCP', mandatory=True)