#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"
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;
_viewer.stop();
}
+ void close(wxCloseEvent& ev)
+ {
+ FontConfig::drop();
+ ev.Skip();
+ }
+
void setup_main_sizer (Config::PlayerMode mode)
{
_main_sizer->Detach(_viewer.panel());
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;
}
DCPOMATIC_ASSERT (dcp);
auto job = make_shared<VerifyDCPJob>(dcp->directories());
- auto progress = make_wx<VerifyDCPProgressDialog>(this, _("DCP-o-matic Player"));
- bool const completed = progress->run (job);
- if (!completed) {
- return;
- }
+ VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player"));
+ bool const completed = progress.run(job);
+ progress.Close();
- auto d = make_wx<VerifyDCPDialog>(this, job);
- d->ShowModal ();
+ if (completed) {
+ VerifyDCPDialog dialog(this, job);
+ dialog.ShowModal();
+ }
}
void tools_check_for_updates ()
bool OnInit () override
{
- wx_ptr<wxSplashScreen> splash;
+ wxSplashScreen* splash;
try {
wxInitAllImageHandlers ();