projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
audio_panel.cc
diff --git
a/src/wx/audio_panel.cc
b/src/wx/audio_panel.cc
index cfea4f0264a5b8a55ea200e1b94de5ea11f9db89..f25af27f740f231fbbf36a961f05f422b5a198f8 100644
(file)
--- a/
src/wx/audio_panel.cc
+++ b/
src/wx/audio_panel.cc
@@
-36,14
+36,12
@@
#include "lib/ffmpeg_content.h"
#include "lib/job_manager.h"
#include "lib/maths_util.h"
#include "lib/ffmpeg_content.h"
#include "lib/job_manager.h"
#include "lib/maths_util.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
-using std::cout;
using std::dynamic_pointer_cast;
using std::list;
using std::make_shared;
using std::dynamic_pointer_cast;
using std::list;
using std::make_shared;