projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
And another missed warnings.h
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 64ac885e37bdcbe73b0637332c8a2007c28534be..2373af122bb387ccffc289111442c416fab0f470 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-25,27
+25,27
@@
#include "video_view.h"
#include "video_view.h"
-#include "lib/film.h"
#include "lib/config.h"
#include "lib/config.h"
+#include "lib/film.h"
#include "lib/player_text.h"
#include "lib/player_text.h"
-#include "lib/timer.h"
#include "lib/signaller.h"
#include "lib/signaller.h"
-#include "lib/warnings.h"
+#include "lib/timer.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <RtAudio.h>
#include <RtAudio.h>
-DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <vector>
#include <vector>
-class wxToggleButton;
+class Butler;
+class ClosedCaptionsDialog;
class FFmpegPlayer;
class Image;
class FFmpegPlayer;
class Image;
-class RGBPlusAlphaImage;
-class PlayerVideo;
class Player;
class Player;
-class Butler;
-class ClosedCaptionsDialog;
+class PlayerVideo;
+class RGBPlusAlphaImage;
+class wxToggleButton;
/** @class FilmViewer
/** @class FilmViewer