Set up OV/VF in name according to whether DCP content has been referenced.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index c89d96584a051c12451b8ead21e069d4929fe016..6514efde82f3b62cbe4d5bfea1af8abff3f486e4 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -48,6 +48,7 @@
 #include "video_content.h"
 #include "subtitle_content.h"
 #include "ffmpeg_content.h"
+#include "dcp_content.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -674,8 +675,18 @@ Film::isdcf_name (bool if_created_now) const
                d << "-3D";
        }
 
-       if (!dm.package_type.empty ()) {
-               d << "_" << dm.package_type;
+       bool vf = false;
+       BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+               shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
+               if (dc && (dc->reference_video() || dc->reference_audio() || dc->reference_subtitle())) {
+                       vf = true;
+               }
+       }
+
+       if (vf) {
+               d << "_VF";
+       } else {
+               d << "_OV";
        }
 
        return d.str ();

diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index f201844ca7210dcdbf922fc26cb6195aff1a2497..a6461727e3dd10a5fb8b362cd4819fa495442194 100644 (file)
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -36,7 +36,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
        , rating (node->string_child ("Rating"))
        , studio (node->string_child ("Studio"))
        , facility (node->string_child ("Facility"))
-       , package_type (node->string_child ("PackageType"))
        /* This stuff was added later */
        , temp_version (node->optional_bool_child ("TempVersion").get_value_or (false))
        , pre_release (node->optional_bool_child ("PreRelease").get_value_or (false))
@@ -58,7 +57,6 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
        root->add_child("Rating")->add_child_text (rating);
        root->add_child("Studio")->add_child_text (studio);
        root->add_child("Facility")->add_child_text (facility);
-       root->add_child("PackageType")->add_child_text (package_type);
        root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0");
        root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0");
        root->add_child("RedBand")->add_child_text (red_band ? "1" : "0");
@@ -77,7 +75,6 @@ operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
                a.rating == b.rating &&
                a.studio == b.studio &&
                a.facility == b.facility &&
-               a.package_type == b.package_type &&
                a.temp_version == b.temp_version &&
                a.pre_release == b.pre_release &&
                a.red_band == b.red_band &&

diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h
index cf4ad34bcf3d92e4ec7e9dcec6636ebaa9a4f837..d07cd86052430aad2503779ec33e800954ccae14 100644 (file)
--- a/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@ -50,7 +50,6 @@ public:
        std::string rating;
        std::string studio;
        std::string facility;
-       std::string package_type;
        /** true if this is a temporary version (without final picture or sound) */
        bool temp_version;
        /** true if this is a pre-release version (final picture and sound, but without accessibility features) */

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index a5105bad9d34a5f571e49659020e46e6f2b96be8..65bf908a799448be8f9521c46a7c4c7d75f56c9f 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -29,6 +29,7 @@
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_processor.h"
+#include "lib/dcp_content.h"
 #include <dcp/key.h>
 #include <dcp/raw_convert.h>
 #include <wx/wx.h>
@@ -372,7 +373,10 @@ DCPPanel::film_content_changed (int property)
 {
        if (property == AudioContentProperty::AUDIO_STREAMS ||
            property == SubtitleContentProperty::USE_SUBTITLES ||
-           property == VideoContentProperty::VIDEO_SCALE) {
+           property == VideoContentProperty::VIDEO_SCALE ||
+           property == DCPContentProperty::REFERENCE_VIDEO ||
+           property == DCPContentProperty::REFERENCE_AUDIO ||
+           property == DCPContentProperty::REFERENCE_SUBTITLE) {
                setup_dcp_name ();
        }
 }

diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index 65f3b53fff6f0517af4b6dc6ccd75ef202196256..a25a2b8dfdab523eb71a9d1240cad19d13bc0d12 100644 (file)
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -51,9 +51,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
        add (_("Facility (e.g. DLA)"), true);
        _facility = add (new wxTextCtrl (this, wxID_ANY));
 
-       add (_("Package Type (e.g. OV)"), true);
-       _package_type = add (new wxTextCtrl (this, wxID_ANY));
-
        _temp_version = add (new wxCheckBox (this, wxID_ANY, _("Temp version")));
        add_spacer ();
 
@@ -85,7 +82,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
        _rating->SetValue (std_to_wx (dm.rating));
        _studio->SetValue (std_to_wx (dm.studio));
        _facility->SetValue (std_to_wx (dm.facility));
-       _package_type->SetValue (std_to_wx (dm.package_type));
        _temp_version->SetValue (dm.temp_version);
        _pre_release->SetValue (dm.pre_release);
        _red_band->SetValue (dm.red_band);
@@ -108,7 +104,6 @@ ISDCFMetadataDialog::isdcf_metadata () const
        dm.rating = wx_to_std (_rating->GetValue ());
        dm.studio = wx_to_std (_studio->GetValue ());
        dm.facility = wx_to_std (_facility->GetValue ());
-       dm.package_type = wx_to_std (_package_type->GetValue ());
        dm.temp_version = _temp_version->GetValue ();
        dm.pre_release = _pre_release->GetValue ();
        dm.red_band = _red_band->GetValue ();

diff --git a/src/wx/isdcf_metadata_dialog.h b/src/wx/isdcf_metadata_dialog.h
index db34a7fcab1953d1387274fa4eb55edb8f7aa35a..ef5eac40cd1c490b1f47328f4a9ac5190f84d174 100644 (file)
--- a/src/wx/isdcf_metadata_dialog.h
+++ b/src/wx/isdcf_metadata_dialog.h
@@ -40,7 +40,6 @@ private:
        wxTextCtrl* _rating;
        wxTextCtrl* _studio;
        wxTextCtrl* _facility;
-       wxTextCtrl* _package_type;
        wxCheckBox* _temp_version;
        wxCheckBox* _pre_release;
        wxCheckBox* _red_band;

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index de69d6240b30f6d27735f3870fcb89dfe6e3b09e..9605f758ce82d0f84eff47947fbe6aeb7d6c1622 100644 (file)
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -47,7 +47,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        m.rating = "PG";
        m.studio = "ST";
        m.facility = "FA";
-       m.package_type = "OV";
        film->set_isdcf_metadata (m);
        film->set_interop (true);
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_2K_ST_20140704_FA_IOP_OV");
@@ -67,10 +66,9 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        m.rating = "R";
        m.studio = "DI";
        m.facility = "PP";
-       m.package_type = "VF";
        film->set_isdcf_metadata (m);
        film->set_interop (false);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* Test interior aspect ratio: shouldn't be shown with trailers */
 
@@ -79,17 +77,17 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        wait_for_jobs ();
        content->set_scale (VideoContentScale (Ratio::from_id ("133")));
        film->set_container (Ratio::from_id ("185"));
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* But should be shown for anything else */
 
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* Test 3D */
 
        film->set_three_d (true);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE-3D_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE-3D_OV");
 
        /* Test content type modifiers */
 
@@ -102,7 +100,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        m.mastered_luminance = "4fl";
        film->set_isdcf_metadata (m);
        film->set_video_frame_rate (48);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* Test a name which is already in camelCase */
 
@@ -116,12 +114,12 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->set_isdcf_metadata (m);
        film->set_video_frame_rate (24);
        film->set_name ("IKnowCamels");
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* And one in capitals */
 
        film->set_name ("LIKE SHOUTING");
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
        /* Test audio channel markup */
 
@@ -129,35 +127,35 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        shared_ptr<SndfileContent> sound (new SndfileContent (film, "test/data/sine_440.wav"));
        film->examine_and_add_content (sound);
        wait_for_jobs ();
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_OV");
 
        AudioMapping mapping = sound->audio_mapping ();
 
        mapping.set (0, dcp::LEFT, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_20_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_20_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::RIGHT, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_30_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_30_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::LFE, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_31_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_31_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::LS, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_41_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_41_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::RS, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_51_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_51_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::HI, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_51_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_51_4K_DI_20140704_PP_SMPTE_OV");
        film->set_audio_channels (8);
        mapping.set (0, dcp::HI, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_61_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_61_4K_DI_20140704_PP_SMPTE_OV");
        mapping.set (0, dcp::VI, 1.0);
        sound->set_audio_mapping (mapping);
-       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_71_4K_DI_20140704_PP_SMPTE_VF");
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-FR_US-R_71_4K_DI_20140704_PP_SMPTE_OV");
 }