From c2e58126cfeab07cd5a4ba02df62b932b8243a8d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 16 Mar 2018 19:59:17 +0000 Subject: Another OS X signing-related fix. --- src/lib/util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/util.cc b/src/lib/util.cc index 68cded2a3..abfdd2767 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -346,11 +346,11 @@ dcpomatic_setup () avfilter_register_all (); #ifdef DCPOMATIC_OSX - /* Add our lib directory to the libltdl search path so that + /* Add our library directory to the libltdl search path so that xmlsec can find xmlsec1-openssl. */ boost::filesystem::path lib = app_contents (); - lib /= "lib"; + lib /= "Frameworks"; setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1); #endif -- cgit v1.2.3 From 8c0ca24cfddee9d1541fd2240ba62eaf52d18da5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 16 Mar 2018 19:59:29 +0000 Subject: KDM writing tweak from v2.12.x. --- src/lib/cinema_kdms.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index d4c1017bb..aaeb0d905 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -131,15 +131,14 @@ CinemaKDMs::write_directories ( int written = 0; - if (!boost::filesystem::exists (directory)) { - boost::filesystem::create_directories (directory); - } - BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; name_values['c'] = i.cinema->name; path /= container_name_format.get(name_values, ""); - ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite); + if (!boost::filesystem::exists (path) || confirm_overwrite (path)) { + boost::filesystem::create_directories (path); + ScreenKDM::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite); + } written += i.screen_kdms.size(); } @@ -162,10 +161,6 @@ CinemaKDMs::write_zip_files ( int written = 0; - if (!boost::filesystem::exists (directory)) { - boost::filesystem::create_directories (directory); - } - BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) { boost::filesystem::path path = directory; name_values['c'] = i.cinema->name; -- cgit v1.2.3 From 7b56088a731550ce0b07f9454c70fde39982a69a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 18 Mar 2018 23:43:49 +0000 Subject: Fix corrupted image (and probably crashes) when changing the player's window size; we request images of the new size with set_video_container_size but some old ones from the butler (I think) will arrive. Check that the images are the right size before we try to construct a wxBitmap with them. Should fix #1242. --- src/wx/film_viewer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index ade45d766..1103db159 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -373,7 +373,7 @@ FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_frame || !_film || !_out_size.width || !_out_size.height) { + if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) { dc.Clear (); return; } -- cgit v1.2.3 From b294c3a3d248e53af2c9b6ef02722cc1e12584d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Mar 2018 09:48:13 +0000 Subject: Fix build for newer libdcp. --- src/wx/verify_dcp_dialog.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index b1eea0fd2..00fb3bdd6 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -53,13 +53,13 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, list BOOST_FOREACH (dcp::VerificationNote i, notes) { switch (i.type()) { - case dcp::VerificationNote::NOTE: + case dcp::VerificationNote::VERIFY_NOTE: _text->BeginStandardBullet (N_("standard/circle"), 1, 50); break; - case dcp::VerificationNote::WARNING: + case dcp::VerificationNote::VERIFY_WARNING: _text->BeginStandardBullet (N_("standard/diamond"), 1, 50); break; - case dcp::VerificationNote::ERROR: + case dcp::VerificationNote::VERIFY_NOTE: _text->BeginSymbolBullet (N_("!"), 1, 50); break; } @@ -68,11 +68,11 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, list _text->Newline (); switch (i.type()) { - case dcp::VerificationNote::NOTE: - case dcp::VerificationNote::WARNING: + case dcp::VerificationNote::VERIFY_NOTE: + case dcp::VerificationNote::VERIFY_WARNING: _text->EndStandardBullet (); break; - case dcp::VerificationNote::ERROR: + case dcp::VerificationNote::VERIFY_ERROR: _text->EndSymbolBullet (); break; } -- cgit v1.2.3 From 37ec0528a9a8a7aa81f36e1aa081c0f9124b5e90 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Mar 2018 13:37:54 +0000 Subject: Typo in previous. --- src/wx/verify_dcp_dialog.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index 00fb3bdd6..aff4a92f0 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -59,7 +59,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, list case dcp::VerificationNote::VERIFY_WARNING: _text->BeginStandardBullet (N_("standard/diamond"), 1, 50); break; - case dcp::VerificationNote::VERIFY_NOTE: + case dcp::VerificationNote::VERIFY_ERROR: _text->BeginSymbolBullet (N_("!"), 1, 50); break; } -- cgit v1.2.3 From e8722ddec03cb18e8c23e604414f9d3a7cf2bae8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Mar 2018 13:39:21 +0000 Subject: Missing libdcp prefix. --- src/lib/verify_dcp_job.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc index 0a54cabd0..8ac41d2a4 100644 --- a/src/lib/verify_dcp_job.cc +++ b/src/lib/verify_dcp_job.cc @@ -53,7 +53,7 @@ VerifyDCPJob::run () bool failed = false; BOOST_FOREACH (dcp::VerificationNote i, _notes) { - if (i.type() == dcp::VerificationNote::ERROR) { + if (i.type() == dcp::VerificationNote::VERIFY_ERROR) { failed = true; } } -- cgit v1.2.3