X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=c4f0e886c3ff43f15a4d43aea7159bd24039e229;hb=a3c1ae7c2e46b65347341896b3d1a505ff92632b;hp=600d1c6b440531aaddfff8df315374283d834054;hpb=4e4968464eeef1956cb82392e1fc3b27a792ab89;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 600d1c6b4..c4f0e886c 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -47,6 +47,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/file_log.h"
 #include "lib/film.h"
+#include "lib/font_config.h"
 #include "lib/image.h"
 #include "lib/image_jpeg.h"
 #include "lib/image_png.h"
@@ -244,6 +245,8 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_timing, this), ID_tools_timing);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this), ID_tools_system_information);
 
+		Bind(wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1));
+
 		if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) {
 			auto pc = new PlaylistControls (_overall_panel, _viewer);
 			_controls = pc;
@@ -251,6 +254,7 @@ public:
 		} else {
 			_controls = new StandardControls (_overall_panel, _viewer, false);
 		}
+		_controls->set_film(_viewer.film());
 		_viewer.set_dcp_decode_reduction(Config::instance()->decode_reduction());
 		_viewer.set_optimise_for_j2k(true);
 		_viewer.PlaybackPermitted.connect(bind(&DOMFrame::playback_permitted, this));
@@ -313,6 +317,12 @@ public:
 		_viewer.stop();
 	}
 
+	void close(wxCloseEvent& ev)
+	{
+		FontConfig::drop();
+		ev.Skip();
+	}
+
 	void setup_main_sizer (Config::PlayerMode mode)
 	{
 		_main_sizer->Detach(_viewer.panel());
@@ -444,9 +454,9 @@ public:
 		_info->triggered_update ();
 	}
 
-	void film_changed (ChangeType type, Film::Property property)
+	void film_changed (ChangeType type, FilmProperty property)
 	{
-		if (type != ChangeType::DONE || property != Film::Property::CONTENT) {
+		if (type != ChangeType::DONE || property != FilmProperty::CONTENT) {
 			return;
 		}
 
@@ -711,7 +721,7 @@ private:
 
 	void file_save_frame ()
 	{
-		wxFileDialog dialog (this, _("Save frame to file"), "", "", "PNG files (*.png)|*.png|JPEG files (*.jpg,*.jpeg)|*.jpg,*.jpeg", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+		wxFileDialog dialog (this, _("Save frame to file"), "", "", "PNG files (*.png)|*.png|JPEG files (*.jpg;*.jpeg)|*.jpg;*.jpeg", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 		if (dialog.ShowModal() == wxID_CANCEL) {
 			return;
 		}
@@ -898,16 +908,14 @@ private:
 		DCPOMATIC_ASSERT (dcp);
 
 		auto job = make_shared<VerifyDCPJob>(dcp->directories());
-		auto progress = new VerifyDCPProgressDialog(this, _("DCP-o-matic Player"));
-		bool const completed = progress->run (job);
-		progress->Destroy ();
-		if (!completed) {
-			return;
-		}
+		VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player"));
+		bool const completed = progress.run(job);
+		progress.Close();
 
-		auto d = new VerifyDCPDialog (this, job);
-		d->ShowModal ();
-		d->Destroy ();
+		if (completed) {
+			VerifyDCPDialog dialog(this, job);
+			dialog.ShowModal();
+		}
 	}
 
 	void tools_check_for_updates ()
@@ -918,9 +926,8 @@ private:
 
 	void tools_timing ()
 	{
-		auto d = new TimerDisplay(this, _viewer.state_timer(), _viewer.gets());
+		auto d = make_wx<TimerDisplay>(this, _viewer.state_timer(), _viewer.gets());
 		d->ShowModal ();
-		d->Destroy ();
 	}
 
 	void tools_system_information ()
@@ -934,18 +941,16 @@ private:
 
 	void help_about ()
 	{
-		auto d = new AboutDialog (this);
+		auto d = make_wx<AboutDialog>(this);
 		d->ShowModal ();
-		d->Destroy ();
 	}
 
 	void help_report_a_problem ()
 	{
-		auto d = new ReportProblemDialog (this);
+		auto d = make_wx<ReportProblemDialog>(this);
 		if (d->ShowModal () == wxID_OK) {
 			d->report ();
 		}
-		d->Destroy ();
 	}
 
 	void update_checker_state_changed ()
@@ -964,9 +969,8 @@ private:
 		}
 
 		if (uc->state() == UpdateChecker::State::YES) {
-			auto dialog = new UpdateDialog (this, uc->stable (), uc->test ());
+			auto dialog = make_wx<UpdateDialog>(this, uc->stable (), uc->test ());
 			dialog->ShowModal ();
-			dialog->Destroy ();
 		} else if (uc->state() == UpdateChecker::State::FAILED) {
 			error_dialog (this, _("The DCP-o-matic download server could not be contacted."));
 		} else {
@@ -1168,7 +1172,7 @@ private:
 
 	bool OnInit () override
 	{
-		wxSplashScreen* splash = nullptr;
+		wxSplashScreen* splash;
 		try {
 			wxInitAllImageHandlers ();