X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=3bdaf259110bf0e0fdf9b204c5059f86ace3d54d;hb=59e769023c392c332331567a1aea94660002c463;hp=3e3c462b2e6981267283186ae2ecc0566db72210;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 3e3c462b2..3bdaf2591 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -136,7 +136,7 @@ ContentMenu::join () } } - assert (fc.size() > 1); + DCPOMATIC_ASSERT (fc.size() > 1); shared_ptr film = _film.lock (); if (!film) { @@ -245,8 +245,8 @@ ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_pt shared_ptr old_content = oc.lock (); shared_ptr new_content = nc.lock (); - assert (old_content); - assert (new_content); + DCPOMATIC_ASSERT (old_content); + DCPOMATIC_ASSERT (new_content); if (new_content->digest() != old_content->digest()) { error_dialog (0, _("The content file(s) you specified are not the same as those that are missing. Either try again with the correct content file or remove the missing content.")); @@ -259,16 +259,16 @@ ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_pt void ContentMenu::kdm () { - assert (!_content.empty ()); + DCPOMATIC_ASSERT (!_content.empty ()); shared_ptr dcp = dynamic_pointer_cast (_content.front ()); - assert (dcp); + DCPOMATIC_ASSERT (dcp); wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM")); if (d->ShowModal() == wxID_OK) { dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ())))); shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); film->examine_content (dcp); }