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

3 files changed, 5 insertions, 7 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index a5105bad9..65bf908a7 100644
--- 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 65f3b53ff..a25a2b8df 100644
--- 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 db34a7fca..ef5eac40c 100644
--- 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;