diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
| commit | 3c29aa6531a4046a8db72dcac81189eb8893233c (patch) | |
| tree | ce2a134dab63df1711a135ae5732839ff293d958 /src/wx/timing_panel.cc | |
| parent | 92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff) | |
Use libdcp's warnings.h
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 31b160542..494d415ec 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -18,35 +18,35 @@ */ -#include "timing_panel.h" -#include "wx_util.h" -#include "film_viewer.h" -#include "timecode.h" + #include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" #include "move_to_dialog.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "timecode.h" +#include "timing_panel.h" +#include "wx_util.h" +#include "lib/audio_content.h" #include "lib/content.h" -#include "lib/image_content.h" -#include "lib/text_content.h" +#include "lib/dcp_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/audio_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/image_content.h" #include "lib/string_text_file_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" -#include "lib/dcp_content.h" -#include "lib/ffmpeg_content.h" #include <dcp/locale_convert.h> -#include "lib/warnings.h" +#include <dcp/warnings.h> #if defined(__WXGTK20__) && !defined(__WXGTK3__) #define TIMING_PANEL_ALIGNMENT_HACK 1 -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include <gtk/gtk.h> -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif #include <set> -#include <iostream> -using std::cout; + using std::string; using std::set; using std::shared_ptr; @@ -59,6 +59,7 @@ using namespace boost::placeholders; using dcp::locale_convert; using namespace dcpomatic; + TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix |