Remove film-specifity of dci name dialog and rename its source file.

diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc
new file mode 100644 (file)
index 0000000..c5682e1
--- /dev/null
+++ b/src/wx/dci_metadata_dialog.cc
@@ -0,0 +1,96 @@
+/*
+    Copyright (C) 2012 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
+    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,
+    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.
+
+*/
+
+#include <wx/sizer.h>
+#include "dci_metadata_dialog.h"
+#include "wx_util.h"
+#include "film.h"
+
+using boost::shared_ptr;
+
+DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
+       : wxDialog (parent, wxID_ANY, _("DCI name"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       table->AddGrowableCol (1, 1);
+
+       add_label_to_sizer (table, this, "Audio Language (e.g. EN)");
+       _audio_language = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_audio_language, 1, wxEXPAND);
+
+       add_label_to_sizer (table, this, "Subtitle Language (e.g. FR)");
+       _subtitle_language = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_subtitle_language, 1, wxEXPAND);
+       
+       add_label_to_sizer (table, this, "Territory (e.g. UK)");
+       _territory = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_territory, 1, wxEXPAND);
+
+       add_label_to_sizer (table, this, "Rating (e.g. 15)");
+       _rating = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_rating, 1, wxEXPAND);
+
+       add_label_to_sizer (table, this, "Studio (e.g. TCF)");
+       _studio = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_studio, 1, wxEXPAND);
+
+       add_label_to_sizer (table, this, "Facility (e.g. DLA)");
+       _facility = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_facility, 1, wxEXPAND);
+
+       add_label_to_sizer (table, this, "Package Type (e.g. OV)");
+       _package_type = new wxTextCtrl (this, wxID_ANY);
+       table->Add (_package_type, 1, wxEXPAND);
+
+       _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));
+
+       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+       
+       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+       if (buttons) {
+               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+       }
+       
+       SetSizer (overall_sizer);
+       overall_sizer->Layout ();
+       overall_sizer->SetSizeHints (this);
+}
+
+DCIMetadata
+DCIMetadataDialog::dci_metadata () const
+{
+       DCIMetadata dm;
+
+       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 ());
+
+       return dm;
+}

diff --git a/src/wx/dci_metadata_dialog.h b/src/wx/dci_metadata_dialog.h
new file mode 100644 (file)
index 0000000..fbc5e3b
--- /dev/null
+++ b/src/wx/dci_metadata_dialog.h
@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2012 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
+    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,
+    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.
+
+*/
+
+#include <wx/dialog.h>
+#include <wx/textctrl.h>
+#include <boost/shared_ptr.hpp>
+#include "dci_metadata.h"
+
+class Film;
+
+class DCIMetadataDialog : public wxDialog
+{
+public:
+       DCIMetadataDialog (wxWindow *, DCIMetadata);
+
+       DCIMetadata dci_metadata () const;
+
+private:
+       wxTextCtrl* _audio_language;
+       wxTextCtrl* _subtitle_language;
+       wxTextCtrl* _territory;
+       wxTextCtrl* _rating;
+       wxTextCtrl* _studio;
+       wxTextCtrl* _facility;
+       wxTextCtrl* _package_type;
+};

diff --git a/src/wx/dci_name_dialog.cc b/src/wx/dci_name_dialog.cc
deleted file mode 100644 (file)
index 41d9357..0000000
--- a/src/wx/dci_name_dialog.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    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,
-    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.
-
-*/
-
-#include <wx/sizer.h>
-#include "dci_name_dialog.h"
-#include "wx_util.h"
-#include "film.h"
-
-using boost::shared_ptr;
-
-DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film)
-       : wxDialog (parent, wxID_ANY, _("DCI name"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
-       , _film (film)
-{
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
-       table->AddGrowableCol (1, 1);
-
-       add_label_to_sizer (table, this, "Audio Language (e.g. EN)");
-       _audio_language = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_audio_language, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Subtitle Language (e.g. FR)");
-       _subtitle_language = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_subtitle_language, 1, wxEXPAND);
-       
-       add_label_to_sizer (table, this, "Territory (e.g. UK)");
-       _territory = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_territory, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Rating (e.g. 15)");
-       _rating = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_rating, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Studio (e.g. TCF)");
-       _studio = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_studio, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Facility (e.g. DLA)");
-       _facility = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_facility, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, "Package Type (e.g. OV)");
-       _package_type = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_package_type, 1, wxEXPAND);
-
-       DCIMetadata dm = _film->dci_metadata ();
-
-       _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));
-       
-       _audio_language->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _subtitle_language->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _territory->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _rating->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _studio->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _facility->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-       _package_type->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (DCINameDialog::changed), 0, this);
-
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-       
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
-       
-       SetSizer (overall_sizer);
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
-}
-
-void
-DCINameDialog::changed (wxCommandEvent &)
-{
-       DCIMetadata dm;
-
-       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 ());
-
-       _film->set_dci_metadata (dm);
-}

diff --git a/src/wx/dci_name_dialog.h b/src/wx/dci_name_dialog.h
deleted file mode 100644 (file)
index dc96dee..0000000
--- a/src/wx/dci_name_dialog.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    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,
-    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.
-
-*/
-
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <boost/shared_ptr.hpp>
-
-class Film;
-
-class DCINameDialog : public wxDialog
-{
-public:
-       DCINameDialog (wxWindow *, boost::shared_ptr<Film>);
-
-private:
-       void changed (wxCommandEvent &);
-       
-       wxTextCtrl* _audio_language;
-       wxTextCtrl* _subtitle_language;
-       wxTextCtrl* _territory;
-       wxTextCtrl* _rating;
-       wxTextCtrl* _studio;
-       wxTextCtrl* _facility;
-       wxTextCtrl* _package_type;
-
-       boost::shared_ptr<Film> _film;
-};

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 72f2d48071316beeec6c7c2a0fc27d7974763642..aa32585df0591edce8a2d9b7aec553222814f515 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -43,7 +43,7 @@
 #include "film_editor.h"
 #include "gain_calculator_dialog.h"
 #include "sound_processor.h"
-#include "dci_name_dialog.h"
+#include "dci_metadata_dialog.h"
 #include "scaler.h"
 
 using std::string;
@@ -1056,8 +1056,9 @@ FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
                return;
        }
 
-       DCINameDialog* d = new DCINameDialog (this, _film);
+       DCIMetadataDialog* d = new DCIMetadataDialog (this, _film->dci_metadata ());
        d->ShowModal ();
+       _film->set_dci_metadata (d->dci_metadata ());
        d->Destroy ();
 }
 

diff --git a/src/wx/wscript b/src/wx/wscript
index 4dbb04eeacaa4cc0da3155f09e6243e5934b7dbb..47272f697e2b7819959dc1447a66127d6f83d8ec 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -14,7 +14,7 @@ def build(bld):
     obj.use = 'libdvdomatic'
     obj.source = """
                  config_dialog.cc
-                 dci_name_dialog.cc
+                 dci_metadata_dialog.cc
                  dir_picker_ctrl.cc
                  film_editor.cc
                  film_viewer.cc