X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=ba069126877b95fae069125f1b46b0d3049ee333;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=29f4aeaa364e2416de48dda239f25e2ebbd8ee27;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 29f4aeaa3..ba0691268 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -19,41 +19,44 @@ */ +#include "check_box.h" +#include "content_view.h" #include "controls.h" +#include "dcpomatic_button.h" #include "film_viewer.h" -#include "wx_util.h" -#include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" -#include "content_view.h" +#include "playhead_to_timecode_dialog.h" #include "static_text.h" -#include "check_box.h" -#include "dcpomatic_button.h" -#include "lib/job_manager.h" -#include "lib/player_video.h" -#include "lib/dcp_content.h" -#include "lib/job.h" -#include "lib/examine_content_job.h" +#include "wx_util.h" #include "lib/content_factory.h" #include "lib/cross.h" -#include +#include "lib/dcp_content.h" +#include "lib/examine_content_job.h" +#include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/player_video.h" #include +#include #include #include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include #include +#include +#include +LIBDCP_ENABLE_WARNINGS -using std::string; -using std::list; using std::cout; -using std::make_pair; +using std::dynamic_pointer_cast; using std::exception; -using boost::optional; +using std::list; +using std::make_pair; using std::shared_ptr; +using std::string; using std::weak_ptr; -using std::dynamic_pointer_cast; +using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -249,12 +252,6 @@ Controls::slider_moved (bool page) } viewer->seek (t, accurate); update_position_label (); - - log ( - wxString::Format( - "playback-seeked %s", t.timecode(_film->video_frame_rate()).c_str() - ) - ); }