Update for TableDialog constructor change.

[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 e47c944d0c5e108e06b86fb6621ccf3721e883dc..aac452355fc676042491f365846abe8f6447bed4 100644 (file)
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,17 +17,18 @@
 
 */
 
+#include "isdcf_metadata_dialog.h"
+#include "wx_util.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 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));
@@ -37,7 +38,7 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
 
        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,9 +51,6 @@ 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")));
        add_spacer ();
 
@@ -68,9 +66,13 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
        _two_d_version_of_three_d = add (new wxCheckBox (this, wxID_ANY, _("2D version of content available in 3D")));
        add_spacer ();
 
-       add (_("Mastered luminance (e.g. 4fl)"), true);
+       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));
-       
+
        _content_version->SetRange (1, 1024);
 
        _content_version->SetValue (dm.content_version);
@@ -80,7 +82,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
        _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);
@@ -103,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 ();