X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=268573e6c35e5048699961279b59c87f806ee022;hb=62c03e3d3493df8a31361b3281c443cac35decb0;hp=c44321ac55c0a931b21b633e6a5894adc9b1f19f;hpb=5a8f1059efce6eeac2f1f3c01acc41424f3950d6;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index c44321ac5..268573e6c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -19,38 +19,39 @@ */ +#include "confirm_kdm_email_dialog.h" +#include "dcpomatic_button.h" +#include "kdm_cpl_panel.h" #include "kdm_dialog.h" -#include "wx_util.h" -#include "screens_panel.h" -#include "kdm_timing_panel.h" #include "kdm_output_panel.h" -#include "kdm_cpl_panel.h" -#include "confirm_kdm_email_dialog.h" +#include "kdm_timing_panel.h" +#include "screens_panel.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "wx_util.h" +#include "lib/cinema.h" +#include "lib/config.h" #include "lib/film.h" -#include "lib/screen.h" -#include "lib/kdm_with_metadata.h" #include "lib/job_manager.h" -#include "lib/config.h" -#include "lib/cinema.h" +#include "lib/kdm_with_metadata.h" +#include "lib/screen.h" #include #include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +LIBDCP_ENABLE_WARNINGS -using std::string; using std::exception; -using std::map; using std::list; -using std::pair; -using std::cout; -using std::vector; using std::make_pair; +using std::map; +using std::pair; using std::runtime_error; using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; using boost::optional; #if BOOST_VERSION >= 106100 @@ -108,7 +109,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) h = new StaticText (this, _("Output")); h->SetFont (subheading_font); right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - _output = new KDMOutputPanel (this, film->interop ()); + _output = new KDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); _make = new Button (this, _("Make KDMs"));