Take Film pointer out of Content.

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 6da219f0f3dfeb16177c594dfc292f5f10bae7bf..017d2c659ba97abac31a9b70a9b4b46facb63c7d 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -35,6 +35,7 @@
 #include "lib/dcp_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/config.h"
 #include <dcp/cpl.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
@@ -131,7 +132,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                                /* We can't have 0 as a menu item ID on OS X */
                                int id = 1;
                                BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-                                       wxMenuItem* item = _cpl_menu->AppendCheckItem (
+                                       wxMenuItem* item = _cpl_menu->AppendRadioItem (
                                                id++,
                                                wxString::Format (
                                                        "%s (%s)",
@@ -143,6 +144,10 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                                }
                        } catch (dcp::DCPReadError) {
                                /* The DCP is probably missing */
+                       } catch (dcp::KDMDecryptionError) {
+                               /* We have an incorrect KDM */
+                       } catch (KDMError) {
+                               /* We have an incorrect KDM */
                        }
                } else {
                        _kdm->Enable (false);
@@ -204,7 +209,7 @@ ContentMenu::join ()
        }
 
        try {
-               shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+               shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
                film->remove_content (_content);
                film->examine_and_add_content (joined);
        } catch (JoinError& e) {
@@ -278,8 +283,6 @@ ContentMenu::find_missing ()
                return;
        }
 
-       shared_ptr<Content> content;
-
        /* XXX: a bit nasty */
        shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ());
        shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (_content.front ());
@@ -299,27 +302,35 @@ ContentMenu::find_missing ()
                d->Destroy ();
        }
 
+       list<shared_ptr<Content> > content;
+
        if (r == wxID_OK) {
-               content = content_factory (film, path);
+               if (dc) {
+                       content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
+               } else {
+                       content = content_factory (path);
+               }
        }
 
-       if (!content) {
+       if (content.empty ()) {
                return;
        }
 
-       shared_ptr<Job> j (new ExamineContentJob (film, content));
+       BOOST_FOREACH (shared_ptr<Content> i, content) {
+               shared_ptr<Job> j (new ExamineContentJob (film, i));
 
-       j->Finished.connect (
-               bind (
-                       &ContentMenu::maybe_found_missing,
-                       this,
-                       boost::weak_ptr<Job> (j),
-                       boost::weak_ptr<Content> (_content.front ()),
-                       boost::weak_ptr<Content> (content)
-                       )
-               );
+               j->Finished.connect (
+                       bind (
+                               &ContentMenu::maybe_found_missing,
+                               this,
+                               boost::weak_ptr<Job> (j),
+                               boost::weak_ptr<Content> (_content.front ()),
+                               boost::weak_ptr<Content> (i)
+                               )
+                       );
 
-       JobManager::instance()->add (j);
+               JobManager::instance()->add (j);
+       }
 }
 
 void
@@ -353,7 +364,7 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
                return;
        }
 
-       old_content->set_path (new_content->path (0));
+       old_content->set_paths (new_content->paths());
 }
 
 void
@@ -367,9 +378,9 @@ ContentMenu::kdm ()
 
        if (d->ShowModal() == wxID_OK) {
                try {
-                       dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+                       dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
                } catch (exception& e) {
-                       error_dialog (_parent, wxString::Format (_("Could not load KDM (%s)"), e.what ()));
+                       error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
                        d->Destroy ();
                        return;
                }