Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 741fc8283b00ad67a1e33ef4bb2c3f060ba9048e..c528447ac4721298fc0c39b2744ec0ec59e797ab 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 ());
@@ -203,7 +207,7 @@ ContentMenu::find_missing ()
                return;
        }
 
-       shared_ptr<Job> j (new ExamineContentJob (film, content));
+       shared_ptr<Job> j (new ExamineContentJob (film, content, true));
        
        j->Finished.connect (
                bind (
@@ -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, true);
+       }
+}
+
 void
 ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_ptr<Content> nc)
 {
@@ -252,7 +269,7 @@ ContentMenu::kdm ()
                dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
                shared_ptr<Film> film = _film.lock ();
                assert (film);
-               film->examine_content (dcp);
+               film->examine_content (dcp, true);
        }
        
        d->Destroy ();