Remove join function; the code is long and I don't think anybody

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index f332dbe910744c49a6dedbaa556467cb602c9c8e..07ccaded207c659f8d704e57ad94817d37c79c44 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>
@@ -53,7 +54,6 @@ using boost::dynamic_pointer_cast;
 enum {
        /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
        ID_repeat = 256,
-       ID_join,
        ID_find_missing,
        ID_properties,
        ID_re_examine,
@@ -66,9 +66,9 @@ enum {
 ContentMenu::ContentMenu (wxWindow* p)
        : _menu (new wxMenu)
        , _parent (p)
+       , _pop_up_open (false)
 {
        _repeat = _menu->Append (ID_repeat, _("Repeat..."));
-       _join = _menu->Append (ID_join, _("Join"));
        _find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
        _properties = _menu->Append (ID_properties, _("Properties..."));
        _re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
@@ -81,7 +81,6 @@ ContentMenu::ContentMenu (wxWindow* p)
        _remove = _menu->Append (ID_remove, _("Remove"));
 
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::repeat, this), ID_repeat);
-       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
@@ -112,8 +111,6 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                }
        }
 
-       _join->Enable (n > 1);
-
        _find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
        _properties->Enable (_content.size() == 1);
        _re_examine->Enable (!_content.empty ());
@@ -142,6 +139,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);
@@ -154,7 +155,9 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 
        _remove->Enable (!_content.empty ());
 
+       _pop_up_open = true;
        _parent->PopupMenu (_menu, p);
+       _pop_up_open = false;
 }
 
 void
@@ -182,33 +185,6 @@ ContentMenu::repeat ()
        _views.clear ();
 }
 
-void
-ContentMenu::join ()
-{
-       vector<shared_ptr<Content> > fc;
-       BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (i);
-               if (f) {
-                       fc.push_back (f);
-               }
-       }
-
-       DCPOMATIC_ASSERT (fc.size() > 1);
-
-       shared_ptr<Film> film = _film.lock ();
-       if (!film) {
-               return;
-       }
-
-       try {
-               shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
-               film->remove_content (_content);
-               film->examine_and_add_content (joined);
-       } catch (JoinError& e) {
-               error_dialog (_parent, std_to_wx (e.what ()));
-       }
-}
-
 void
 ContentMenu::remove ()
 {
@@ -275,8 +251,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 ());
@@ -296,27 +270,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 (film, path)));
+               } else {
+                       content = content_factory (film, 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
@@ -350,7 +332,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
@@ -364,9 +346,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;
                }
@@ -409,6 +391,10 @@ ContentMenu::properties ()
 void
 ContentMenu::cpl_selected (wxCommandEvent& ev)
 {
+       if (!_pop_up_open) {
+               return;
+       }
+
        DCPOMATIC_ASSERT (!_content.empty ());
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
        DCPOMATIC_ASSERT (dcp);