diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/cinema_kdms.cc | 13 | ||||
| -rw-r--r-- | src/lib/util.cc | 4 | ||||
| -rw-r--r-- | src/lib/verify_dcp_job.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 2 | ||||
| -rw-r--r-- | src/wx/verify_dcp_dialog.cc | 12 |
5 files changed, 14 insertions, 19 deletions
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; 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 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; } } 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; } diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index b1eea0fd2..aff4a92f0 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -53,13 +53,13 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, list<dcp::VerificationNote> 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_ERROR: _text->BeginSymbolBullet (N_("!"), 1, 50); break; } @@ -68,11 +68,11 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, list<dcp::VerificationNote> _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; } |