Add code to copy the data and hook it up to a menu item.

diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc
new file mode 100644 (file)
index 0000000..a009735
--- /dev/null
+++ b/src/lib/copy_dcp_details_to_film.cc
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "copy_dcp_details_to_film.h"
+#include "dcp_content.h"
+#include "film.h"
+#include "types.h"
+#include "video_content.h"
+#include "audio_content.h"
+#include "ratio.h"
+#include "dcp_content_type.h"
+#include <boost/shared_ptr.hpp>
+#include <map>
+
+using std::map;
+using std::string;
+using boost::shared_ptr;
+
+void
+copy_dcp_details_to_film (shared_ptr<const DCPContent> dcp, shared_ptr<Film> film)
+{
+       string name = dcp->name ();
+       name = name.substr (0, name.find("_"));
+       film->set_name (name);
+       film->set_use_isdcf_name (true);
+       if (dcp->content_kind()) {
+               film->set_dcp_content_type (DCPContentType::from_libdcp_kind(dcp->content_kind().get()));
+       }
+       film->set_encrypted (dcp->encrypted());
+       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_interop (dcp->standard() == dcp::INTEROP);
+       film->set_three_d (dcp->three_d());
+
+       if (dcp->video) {
+               film->set_container (Ratio::nearest_from_ratio(dcp->video->size().ratio()));
+               film->set_resolution (dcp->resolution());
+               DCPOMATIC_ASSERT (dcp->video_frame_rate());
+               film->set_video_frame_rate (*dcp->video_frame_rate());
+       }
+
+       if (dcp->audio) {
+               film->set_audio_channels (dcp->audio->stream()->channels());
+       }
+
+       map<dcp::Marker, dcpomatic::ContentTime> dcp_markers;
+       map<dcp::Marker, dcpomatic::DCPTime> film_markers;
+       film->clear_markers ();
+       for (map<dcp::Marker, dcpomatic::ContentTime>::const_iterator i = dcp_markers.begin(); i != dcp_markers.end(); ++i) {
+               film->set_marker (i->first, dcpomatic::DCPTime(i->second.get()));
+       }
+
+       film->set_ratings (dcp->ratings());
+       film->set_content_version (dcp->content_version());
+}
+
+

diff --git a/src/lib/copy_dcp_details_to_film.h b/src/lib/copy_dcp_details_to_film.h
new file mode 100644 (file)
index 0000000..38eb7fc
--- /dev/null
+++ b/src/lib/copy_dcp_details_to_film.h
@@ -0,0 +1,26 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <boost/shared_ptr.hpp>
+
+class DCPContent;
+class Film;
+
+extern void copy_dcp_details_to_film (boost::shared_ptr<const DCPContent> dcp, boost::shared_ptr<Film> film);

diff --git a/src/lib/wscript b/src/lib/wscript
index 67bcf8d8b37a40cc59a6f74d3df65c468272cc81..17f96d61e11db22a7a69fea6be3732f8c182e39c 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -52,6 +52,7 @@ sources = """
           config.cc
           content.cc
           content_factory.cc
+          copy_dcp_details_to_film.cc
           create_cli.cc
           cross_common.cc
           crypto.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 7cb924a73882f45f64f5e61ebba07c2de8d2a970..d28253c6a1b88dfef97426534ecbf8e70ae1fa1f 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -36,6 +36,7 @@
 #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>
@@ -61,6 +62,7 @@ enum {
        ID_kdm,
        ID_ov,
        ID_choose_cpl,
+       ID_set_dcp_settings,
        ID_remove
 };
 
@@ -79,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"));
 
@@ -89,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);
 }
@@ -125,6 +129,7 @@ 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, true);
                                list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
@@ -153,9 +158,11 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                        _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 ());
@@ -165,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 ()
 {

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index a38109b0738e84914139a38ca0350c47b6c54604..fe8cbb56f0fc9a4b2161cb41902cf9d2887db549 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -46,6 +46,7 @@ private:
        void re_examine ();
        void kdm ();
        void ov ();
+       void set_dcp_settings ();
        void remove ();
        void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
        void cpl_selected (wxCommandEvent& ev);
@@ -66,6 +67,7 @@ private:
        wxMenuItem* _kdm;
        wxMenuItem* _ov;
        wxMenuItem* _choose_cpl;
+       wxMenuItem* _set_dcp_settings;
        wxMenuItem* _remove;
 };