X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=0a38f734408ea1c06eef71c3196d6ff1a2671c6a;hb=f54283f3ad09b896e7b204b76c12e6061d0405e0;hp=5ebd0989d89801e4381011df6646955467060108;hpb=d9c2cf78e6c5e465e7f76020f78f7ed1e71c3bc0;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 5ebd0989d..0a38f7344 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.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.
 
@@ -28,6 +28,8 @@
 #include "static_text.h"
 #include "check_box.h"
 #include "dcpomatic_button.h"
+#include "markers_dialog.h"
+#include "metadata_dialog.h"
 #include "lib/ratio.h"
 #include "lib/config.h"
 #include "lib/dcp_content_type.h"
@@ -58,11 +60,15 @@ using std::max;
 using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using dcp::locale_convert;
 
-DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
+DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
 	: _audio_dialog (0)
+	, _markers_dialog (0)
+	, _metadata_dialog (0)
 	, _film (film)
+	, _viewer (viewer)
 	, _generally_sensitive (true)
 {
 	_panel = new wxPanel (n);
@@ -114,6 +120,9 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 
 	_upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made"));
 
+	_markers = new Button (_panel, _("Markers..."));
+	_metadata = new Button (_panel, _("Metadata..."));
+
 	_notebook = new wxNotebook (_panel, wxID_ANY);
 	_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
 
@@ -132,6 +141,8 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 	_reel_length->Bind           (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this));
 	_standard->Bind              (wxEVT_CHOICE,   boost::bind (&DCPPanel::standard_changed, this));
 	_upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this));
+	_markers->Bind               (wxEVT_BUTTON,   boost::bind (&DCPPanel::markers_clicked, this));
+	_metadata->Bind              (wxEVT_BUTTON,   boost::bind (&DCPPanel::metadata_clicked, this));
 
 	BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) {
 		_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
@@ -213,6 +224,8 @@ DCPPanel::add_to_grid ()
 	_standard_label->Show (full);
 	_standard->Show (full);
 	_upload_after_make_dcp->Show (full);
+	_markers->Show (full);
+	_metadata->Show (full);
 	_reencode_j2k->Show (full);
 	_encrypted->Show (full);
 
@@ -245,6 +258,12 @@ DCPPanel::add_to_grid ()
 
 		_grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
+
+		wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL);
+		extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+		extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+		_grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2));
+		++r;
 	}
 }
 
@@ -307,9 +326,10 @@ DCPPanel::frame_rate_choice_changed ()
 	}
 
 	_film->set_video_frame_rate (
-		boost::lexical_cast<int> (
-			wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ()))
-			)
+		boost::lexical_cast<int>(
+			wx_to_std(_frame_rate_choice->GetString(_frame_rate_choice->GetSelection()))
+			),
+		true
 		);
 }
 
@@ -364,6 +384,30 @@ DCPPanel::upload_after_make_dcp_changed ()
 	_film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ());
 }
 
+void
+DCPPanel::markers_clicked ()
+{
+	if (_markers_dialog) {
+		_markers_dialog->Destroy ();
+		_markers_dialog = 0;
+	}
+
+	_markers_dialog = new MarkersDialog (_panel, _film, _viewer);
+	_markers_dialog->Show();
+}
+
+void
+DCPPanel::metadata_clicked ()
+{
+	if (_metadata_dialog) {
+		_metadata_dialog->Destroy ();
+		_metadata_dialog = 0;
+	}
+
+	_metadata_dialog = new MetadataDialog (_panel, _film);
+	_metadata_dialog->Show ();
+}
+
 void
 DCPPanel::film_changed (int p)
 {
@@ -457,6 +501,7 @@ DCPPanel::film_changed (int p)
 	case Film::INTEROP:
 		checked_set (_standard, _film->interop() ? 1 : 0);
 		setup_dcp_name ();
+		_markers->Enable (!_film->interop());
 		break;
 	case Film::AUDIO_PROCESSOR:
 		if (_film->audio_processor ()) {
@@ -557,11 +602,19 @@ DCPPanel::dcp_content_type_changed ()
 void
 DCPPanel::set_film (shared_ptr<Film> film)
 {
-	/* We are changing film, so destroy any audio dialog for the old one */
+	/* We are changing film, so destroy any dialogs for the old one */
 	if (_audio_dialog) {
 		_audio_dialog->Destroy ();
 		_audio_dialog = 0;
 	}
+	if (_markers_dialog) {
+		_markers_dialog->Destroy ();
+		_markers_dialog = 0;
+	}
+	if (_metadata_dialog) {
+		_metadata_dialog->Destroy ();
+		_metadata_dialog = 0;
+	}
 
 	_film = film;
 
@@ -625,6 +678,8 @@ DCPPanel::setup_sensitivity ()
 	_reel_type->Enable              (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
 	_reel_length->Enable            (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH);
 	_upload_after_make_dcp->Enable  (_generally_sensitive);
+	_markers->Enable                (_generally_sensitive);
+	_metadata->Enable               (_generally_sensitive);
 	_frame_rate_choice->Enable      (_generally_sensitive && _film && !_film->references_dcp_video());
 	_frame_rate_spin->Enable        (_generally_sensitive && _film && !_film->references_dcp_video());
 	_audio_channels->Enable         (_generally_sensitive && _film && !_film->references_dcp_audio());