Put current frame position in seek-by-frame dialogue when opening it (#1736).

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 174d625b8c1eea2fdee199f36b67203a83540cd7..d28253c6a1b88dfef97426534ecbf8e70ae1fa1f 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -35,6 +35,8 @@
 #include "lib/dcp_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/config.h"
+#include "lib/copy_dcp_details_to_film.h"
 #include <dcp/cpl.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
@@ -60,6 +62,7 @@ enum {
        ID_kdm,
        ID_ov,
        ID_choose_cpl,
+       ID_set_dcp_settings,
        ID_remove
 };
 
@@ -78,6 +81,7 @@ ContentMenu::ContentMenu (wxWindow* p)
        _ov = _menu->Append (ID_ov, _("Add OV..."));
        _cpl_menu = new wxMenu ();
        _choose_cpl = _menu->Append (ID_choose_cpl, _("Choose CPL..."), _cpl_menu);
+       _set_dcp_settings = _menu->Append (ID_set_dcp_settings, _("Set project DCP settings from this DCP"));
        _menu->AppendSeparator ();
        _remove = _menu->Append (ID_remove, _("Remove"));
 
@@ -88,6 +92,7 @@ ContentMenu::ContentMenu (wxWindow* p)
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::set_dcp_settings, this), ID_set_dcp_settings);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::remove, this), ID_remove);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1);
 }
@@ -124,14 +129,15 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                if (dcp) {
                        _kdm->Enable (dcp->encrypted ());
                        _ov->Enable (dcp->needs_assets ());
+                       _set_dcp_settings->Enable (static_cast<bool>(dcp));
                        try {
-                               DCPExaminer ex (dcp);
+                               DCPExaminer ex (dcp, true);
                                list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
                                _choose_cpl->Enable (cpls.size() > 1);
                                /* 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)",
@@ -141,16 +147,22 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                                                );
                                        item->Check (dcp->cpl() && dcp->cpl() == i->id());
                                }
-                       } catch (dcp::DCPReadError) {
+                       } catch (dcp::ReadError &) {
                                /* The DCP is probably missing */
+                       } catch (dcp::KDMDecryptionError &) {
+                               /* We have an incorrect KDM */
+                       } catch (KDMError &) {
+                               /* We have an incorrect KDM */
                        }
                } else {
                        _kdm->Enable (false);
                        _ov->Enable (false);
                        _choose_cpl->Enable (false);
+                       _set_dcp_settings->Enable (false);
                }
        } else {
                _kdm->Enable (false);
+               _set_dcp_settings->Enable (false);
        }
 
        _remove->Enable (!_content.empty ());
@@ -160,6 +172,22 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
        _pop_up_open = false;
 }
 
+
+void
+ContentMenu::set_dcp_settings ()
+{
+       shared_ptr<Film> film = _film.lock ();
+       if (!film) {
+               return;
+       }
+
+       DCPOMATIC_ASSERT (_content.size() == 1);
+       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_content.front());
+       DCPOMATIC_ASSERT (dcp);
+       copy_dcp_details_to_film (dcp, film);
+}
+
+
 void
 ContentMenu::repeat ()
 {
@@ -204,7 +232,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) {
@@ -301,9 +329,9 @@ ContentMenu::find_missing ()
 
        if (r == wxID_OK) {
                if (dc) {
-                       content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+                       content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
                } else {
-                       content = content_factory (film, path);
+                       content = content_factory (path);
                }
        }
 
@@ -375,7 +403,7 @@ ContentMenu::kdm ()
                try {
                        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;
                }
@@ -410,7 +438,9 @@ ContentMenu::ov ()
 void
 ContentMenu::properties ()
 {
-       ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+       shared_ptr<Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
        d->ShowModal ();
        d->Destroy ();
 }
@@ -426,7 +456,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
        DCPOMATIC_ASSERT (dcp);
 
-       DCPExaminer ex (dcp);
+       DCPExaminer ex (dcp, true);
        list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
        DCPOMATIC_ASSERT (ev.GetId() > 0);
        DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));