summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-02 23:43:54 +0000
committerCarl Hetherington <cth@carlh.net>2019-04-02 23:43:54 +0000
commit698e3ac8863d264237003b49750ae074d612f451 (patch)
treea6ef673ad68c1fb43844dd23482c7a97514b3918 /src/wx
parentd5c8fb9b826aaac2acab58f8a7b2eec4fcce99a6 (diff)
Extract subtitle language from text content rather than ISDCFMetadata (part of #1516).
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/isdcf_metadata_dialog.cc7
-rw-r--r--src/wx/isdcf_metadata_dialog.h3
2 files changed, 2 insertions, 8 deletions
diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index 297f54fa1..9226af8b9 100644
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -41,9 +41,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
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));
@@ -82,7 +79,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
_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));
@@ -104,7 +100,6 @@ 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 ());
diff --git a/src/wx/isdcf_metadata_dialog.h b/src/wx/isdcf_metadata_dialog.h
index f8ebdfd42..b1ecb5a36 100644
--- a/src/wx/isdcf_metadata_dialog.h
+++ b/src/wx/isdcf_metadata_dialog.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -36,7 +36,6 @@ public:
private:
wxSpinCtrl* _content_version;
wxTextCtrl* _audio_language;
- wxTextCtrl* _subtitle_language;
wxTextCtrl* _territory;
wxTextCtrl* _rating;
wxTextCtrl* _studio;