Store subtitle language(s) in Film, and allow setup of those

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

diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index 47d159cb984a8a01a879bdeb0bdefe35b9f3d74a..652b85d4706ce1b2b3f21bd22c1aa4c5291e8e5c 100644 (file)
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -1,33 +1,39 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include "isdcf_metadata_dialog.h"
+#include "wx_util.h"
+#include "check_box.h"
+#include "lib/film.h"
 #include <wx/wx.h>
 #include <wx/sizer.h>
 #include <wx/spinctrl.h>
-#include "lib/film.h"
-#include "isdcf_metadata_dialog.h"
-#include "wx_util.h"
 
 using boost::shared_ptr;
 
-ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
-       : TableDialog (parent, _("ISDCF name"), 2, true)
+/** @param parent Parent window.
+ *  @param dm Initial ISDCF metadata.
+ *  @param threed true if the film is in 3D.
+ */
+ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bool threed)
+       : TableDialog (parent, _("ISDCF name"), 2, 1, true)
 {
        add (_("Content version"), true);
        _content_version = add (new wxSpinCtrl (this, wxID_ANY));
@@ -35,9 +41,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
        add (_("Audio Language (e.g. EN)"), true);
        _audio_language = add (new wxTextCtrl (this, wxID_ANY));
 
-       add (_("Subtitle Language (e.g. FR)"), true);
-       _subtitle_language = add (new wxTextCtrl (this, wxID_ANY));
-
        add (_("Territory (e.g. UK)"), true);
        _territory = add (new wxTextCtrl (this, wxID_ANY));
 
@@ -50,24 +53,25 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
        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")));
+       _temp_version = add (new CheckBox(this, _("Temp version")));
        add_spacer ();
 
-       _pre_release = add (new wxCheckBox (this, wxID_ANY, _("Pre-release")));
+       _pre_release = add (new CheckBox(this, _("Pre-release")));
        add_spacer ();
 
-       _red_band = add (new wxCheckBox (this, wxID_ANY, _("Red band")));
+       _red_band = add (new CheckBox(this, _("Red band")));
        add_spacer ();
 
        add (_("Chain"), true);
        _chain = add (new wxTextCtrl (this, wxID_ANY));
 
-       _two_d_version_of_three_d = add (new wxCheckBox (this, wxID_ANY, _("2D version of content available in 3D")));
+       _two_d_version_of_three_d = add (new CheckBox(this, _("2D version of content available in 3D")));
        add_spacer ();
 
+       if (threed) {
+               _two_d_version_of_three_d->Enable (false);
+       }
+
        add (_("Mastered luminance (e.g. 14fl)"), true);
        _mastered_luminance = add (new wxTextCtrl (this, wxID_ANY));
 
@@ -75,12 +79,10 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
 
        _content_version->SetValue (dm.content_version);
        _audio_language->SetValue (std_to_wx (dm.audio_language));
-       _subtitle_language->SetValue (std_to_wx (dm.subtitle_language));
        _territory->SetValue (std_to_wx (dm.territory));
        _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);
@@ -89,8 +91,11 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
        _mastered_luminance->SetValue (std_to_wx (dm.mastered_luminance));
 
        layout ();
+
+       _content_version->SetFocus ();
 }
 
+
 ISDCFMetadata
 ISDCFMetadataDialog::isdcf_metadata () const
 {
@@ -98,12 +103,10 @@ ISDCFMetadataDialog::isdcf_metadata () const
 
        dm.content_version = _content_version->GetValue ();
        dm.audio_language = wx_to_std (_audio_language->GetValue ());
-       dm.subtitle_language = wx_to_std (_subtitle_language->GetValue ());
        dm.territory = wx_to_std (_territory->GetValue ());
        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 ();