From 2034a89f30e4a976e44eb8d0a6b4ad6e3100cd4b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Nov 2015 20:46:12 +0000 Subject: [PATCH] Add console to dcpomatic_kdm on Windows. Tweak layout a bit more. Remove unnecessary include from kdm_dialog.h. Unbind selection-changed signal in ScreensPanel destructor to stop it causing problems if it is called during ~ScreensPanel. Add -fno-omit-frame-pointer in case it helps with Dr. Mingw. --- cscript | 4 ++-- src/tools/dcpomatic_kdm.cc | 32 +++++++++++++++++++++----------- src/wx/kdm_dialog.h | 3 --- src/wx/screens_panel.cc | 10 ++++++++-- src/wx/screens_panel.h | 3 ++- wscript | 2 +- 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/cscript b/cscript index e4c04afb7..b46a024bb 100644 --- a/cscript +++ b/cscript @@ -259,8 +259,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options), - ('libdcp', '7c96eea'), - ('libsub', 'a2c4b2c')) + ('libdcp', 'c7cbd39'), + ('libsub', '72d5eb7')) def configure_options(target): opt = '' diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 29c32d0ff..6190f1416 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -69,6 +69,26 @@ public: , _config_dialog (0) , _job_view (0) { +#if defined(DCPOMATIC_WINDOWS) + if (Config::instance()->win32_console ()) { + AllocConsole(); + + HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); + int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); + FILE* hf_out = _fdopen(hCrt, "w"); + setvbuf(hf_out, NULL, _IONBF, 1); + *stdout = *hf_out; + + HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); + hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); + FILE* hf_in = _fdopen(hCrt, "r"); + setvbuf(hf_in, NULL, _IONBF, 128); + *stdin = *hf_in; + + std::cout << "DCP-o-matic KDM creator is starting." << "\n"; + } +#endif + wxMenuBar* bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -95,29 +115,19 @@ public: _screens = new ScreensPanel (overall_panel); vertical->Add (_screens, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); - h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing")); - h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); vertical->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); - h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - wxSizer* dkdm = new wxFlexGridSizer (4, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + wxSizer* dkdm = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (dkdm, overall_panel, _("DKDM file"), true); _dkdm = new FilePickerCtrl (overall_panel, _("Select a DKDM XML file..."), "*.xml"); dkdm->Add (_dkdm, 1, wxEXPAND); add_label_to_sizer (dkdm, overall_panel, _("Content title"), true); _content_title_text = new wxStaticText (overall_panel, wxID_ANY, wxT("")); dkdm->Add (_content_title_text, 1, wxEXPAND); - dkdm->AddSpacer (0); - dkdm->AddSpacer (0); add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true); _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT("")); dkdm->Add (_annotation_text, 1, wxEXPAND); - dkdm->AddSpacer (0); - dkdm->AddSpacer (0); add_label_to_sizer (dkdm, overall_panel, _("Issue date"), true); _issue_date = new wxStaticText (overall_panel, wxID_ANY, wxT("")); dkdm->Add (_issue_date, 1, wxEXPAND); diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index 6400ebb6c..a9edd121a 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -20,13 +20,10 @@ #include "wx_util.h" #include #include -#include #include #include #include -class wxTreeCtrl; - class Cinema; class Screen; class Film; diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index ce5f2555e..2130600e4 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -27,6 +27,7 @@ using std::list; using std::pair; +using std::cout; using std::map; using std::make_pair; using boost::shared_ptr; @@ -69,7 +70,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent) sizer->Add (targets, 1, wxEXPAND); - _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&ScreensPanel::selection_changed, this)); + _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this); _add_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this)); _edit_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_cinema_clicked, this)); @@ -82,6 +83,11 @@ ScreensPanel::ScreensPanel (wxWindow* parent) SetSizer (sizer); } +ScreensPanel::~ScreensPanel () +{ + _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this); +} + list > > ScreensPanel::selected_cinemas () const { @@ -299,7 +305,7 @@ ScreensPanel::screens () const } void -ScreensPanel::selection_changed () +ScreensPanel::selection_changed (wxTreeEvent &) { setup_sensitivity (); ScreensChanged (); diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index f7d81b961..6cfff0a60 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -30,6 +30,7 @@ class ScreensPanel : public wxPanel { public: ScreensPanel (wxWindow* parent); + ~ScreensPanel (); std::list > screens () const; void setup_sensitivity (); @@ -47,7 +48,7 @@ private: void remove_screen_clicked (); std::list > > selected_cinemas () const; std::list > > selected_screens () const; - void selection_changed (); + void selection_changed (wxTreeEvent &); wxTreeCtrl* _targets; wxButton* _add_cinema; diff --git a/wscript b/wscript index 106f6b1e2..e9e1a332a 100644 --- a/wscript +++ b/wscript @@ -83,7 +83,7 @@ def configure(conf): '-D_FILE_OFFSET_BITS=64']) if conf.options.enable_debug: - conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG']) + conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer']) else: conf.env.append_value('CXXFLAGS', '-O2') -- 2.30.2