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
/
player_stress_tester.cc
diff --git
a/src/wx/player_stress_tester.cc
b/src/wx/player_stress_tester.cc
index 6dd2dd67473451f5bdcbb45f1f2fd03c0ea4a076..2593757270a075f10f1c4b4788d23c9ec9705249 100644
(file)
--- a/
src/wx/player_stress_tester.cc
+++ b/
src/wx/player_stress_tester.cc
@@
-18,26
+18,33
@@
*/
*/
-#include "player_stress_tester.h"
+
#include "controls.h"
#include "controls.h"
+#include "player_stress_tester.h"
#include <dcp/raw_convert.h>
#include <dcp/util.h>
#include <dcp/raw_convert.h>
#include <dcp/util.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#include <boost/bind/bind.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind/bind.hpp>
+#include <iostream>
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <iostream>
+
+using std::cout;
using std::string;
using std::vector;
using std::string;
using std::vector;
-using std::cout;
using dcp::raw_convert;
using boost::optional;
using dcp::raw_convert;
using boost::optional;
+
/* Interval to check for things to do with the stress script (in milliseconds) */
#define CHECK_INTERVAL 20
/* Interval to check for things to do with the stress script (in milliseconds) */
#define CHECK_INTERVAL 20
+
Command::Command (string line)
: type (NONE)
, int_param (0)
Command::Command (string line)
: type (NONE)
, int_param (0)