projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
video_waveform_plot.cc
diff --git
a/src/wx/video_waveform_plot.cc
b/src/wx/video_waveform_plot.cc
index f45a5662e9fee87c072952e8864fcad362c5b382..8e3284682485833dc7395c65b75e1c1edeb3be14 100644
(file)
--- a/
src/wx/video_waveform_plot.cc
+++ b/
src/wx/video_waveform_plot.cc
@@
-26,18
+26,16
@@
#include "lib/film.h"
#include "lib/image.h"
#include "lib/player_video.h"
#include "lib/film.h"
#include "lib/image.h"
#include "lib/player_video.h"
-#include "lib/warnings.h"
#include <dcp/locale_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/locale_convert.h>
#include <dcp/openjpeg_image.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/rawbmp.h>
#include <wx/graphics.h>
#include <wx/rawbmp.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <boost/bind/bind.hpp>
-#include <iostream>
-using std::cout;
using std::make_shared;
using std::max;
using std::min;
using std::make_shared;
using std::max;
using std::min;