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

4 files changed, 14 insertions, 25 deletions

diff --git a/src/wx/dci_name_dialog.cc b/src/wx/dci_metadata_dialog.cc
index 41d93576f..c5682e19e 100644
--- a/src/wx/dci_name_dialog.cc
+++ b/src/wx/dci_metadata_dialog.cc
@@ -18,15 +18,14 @@
 */
 
 #include <wx/sizer.h>
-#include "dci_name_dialog.h"
+#include "dci_metadata_dialog.h"
 #include "wx_util.h"
 #include "film.h"
 
 using boost::shared_ptr;
 
-DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film)
+DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
 	: 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);
@@ -59,8 +58,6 @@ DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film)
 	_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));
@@ -68,14 +65,6 @@ DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film)
 	_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);
@@ -90,8 +79,8 @@ DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film)
 	overall_sizer->SetSizeHints (this);
 }
 
-void
-DCINameDialog::changed (wxCommandEvent &)
+DCIMetadata
+DCIMetadataDialog::dci_metadata () const
 {
 	DCIMetadata dm;
 
@@ -103,5 +92,5 @@ DCINameDialog::changed (wxCommandEvent &)
 	dm.facility = wx_to_std (_facility->GetValue ());
 	dm.package_type = wx_to_std (_package_type->GetValue ());
 
-	_film->set_dci_metadata (dm);
+	return dm;
 }
diff --git a/src/wx/dci_name_dialog.h b/src/wx/dci_metadata_dialog.h
index dc96deed6..fbc5e3b86 100644
--- a/src/wx/dci_name_dialog.h
+++ b/src/wx/dci_metadata_dialog.h
@@ -20,17 +20,18 @@
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
 #include <boost/shared_ptr.hpp>
+#include "dci_metadata.h"
 
 class Film;
 
-class DCINameDialog : public wxDialog
+class DCIMetadataDialog : public wxDialog
 {
 public:
-	DCINameDialog (wxWindow *, boost::shared_ptr<Film>);
+	DCIMetadataDialog (wxWindow *, DCIMetadata);
+
+	DCIMetadata dci_metadata () const;
 
 private:
-	void changed (wxCommandEvent &);
-	
 	wxTextCtrl* _audio_language;
 	wxTextCtrl* _subtitle_language;
 	wxTextCtrl* _territory;
@@ -38,6 +39,4 @@ private:
 	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 72f2d4807..aa32585df 100644
--- 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 4dbb04eea..47272f697 100644
--- 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