Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 741fc8283b00ad67a1e33ef4bb2c3f060ba9048e..3bdaf259110bf0e0fdf9b204c5059f86ace3d54d 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -41,6 +41,7 @@ enum {
        ID_repeat = 1,
        ID_join,
        ID_find_missing,
+       ID_re_examine,
        ID_kdm,
        ID_remove
 };
@@ -52,6 +53,7 @@ ContentMenu::ContentMenu (wxWindow* p)
        _repeat = _menu->Append (ID_repeat, _("Repeat..."));
        _join = _menu->Append (ID_join, _("Join"));
        _find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
+       _re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
        _kdm = _menu->Append (ID_kdm, _("Add KDM..."));
        _menu->AppendSeparator ();
        _remove = _menu->Append (ID_remove, _("Remove"));
@@ -59,6 +61,7 @@ ContentMenu::ContentMenu (wxWindow* p)
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::repeat, this), ID_repeat);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::join, this), ID_join);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
+       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove);
 }
@@ -85,6 +88,7 @@ ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
        _join->Enable (n > 1);
        
        _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
+       _re_examine->Enable (!_content.empty ());
 
        if (_content.size() == 1) {
                shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
@@ -132,7 +136,7 @@ ContentMenu::join ()
                }
        }
 
-       assert (fc.size() > 1);
+       DCPOMATIC_ASSERT (fc.size() > 1);
 
        shared_ptr<Film> film = _film.lock ();
        if (!film) {
@@ -218,6 +222,19 @@ ContentMenu::find_missing ()
        JobManager::instance()->add (j);
 }
 
+void
+ContentMenu::re_examine ()
+{
+       shared_ptr<Film> film = _film.lock ();
+       if (!film) {
+               return;
+       }
+
+       for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+               film->examine_content (*i);
+       }
+}
+
 void
 ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_ptr<Content> nc)
 {
@@ -228,8 +245,8 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 
        shared_ptr<Content> old_content = oc.lock ();
        shared_ptr<Content> 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."));
@@ -242,16 +259,16 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 void
 ContentMenu::kdm ()
 {
-       assert (!_content.empty ());
+       DCPOMATIC_ASSERT (!_content.empty ());
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_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 = _film.lock ();
-               assert (film);
+               DCPOMATIC_ASSERT (film);
                film->examine_content (dcp);
        }