projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build on Centos 7.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index 9517a3bf479a2f31b8d9c7fdfbff955fa29e9509..b815afb7cc9da251283f21c3170fac3b0d53f1fc 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-28,16
+28,19
@@
#include "lib/signaller.h"
#include "lib/timer.h"
#include "lib/types.h"
#include "lib/signaller.h"
#include "lib/timer.h"
#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
-class Image;
-class wxWindow;
class FilmViewer;
class FilmViewer;
+class Image;
class Player;
class PlayerVideo;
class Player;
class PlayerVideo;
+class wxWindow;
class VideoView : public ExceptionStore, public Signaller
class VideoView : public ExceptionStore, public Signaller
@@
-127,6
+130,10
@@
public:
_three_d = t;
}
_three_d = t;
}
+ void set_optimise_for_j2k (bool o) {
+ _optimise_for_j2k = o;
+ }
+
protected:
NextFrameResult get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
protected:
NextFrameResult get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
@@
-142,6
+149,10
@@
protected:
return wxColour(0, 255, 0);
}
return wxColour(0, 255, 0);
}
+ wxColour crop_guess_colour () const {
+ return wxColour(0, 0, 255);
+ }
+
int video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
int video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
@@
-168,6
+179,8
@@
protected:
StateTimer _state_timer;
StateTimer _state_timer;
+ bool _optimise_for_j2k = false;
+
private:
/** Mutex protecting all the state in this class */
mutable boost::mutex _mutex;
private:
/** Mutex protecting all the state in this class */
mutable boost::mutex _mutex;