projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It doesn't seem necessary to use shared_ptr for the DCPVideo queue in J2KEncoder.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index d7d60c21da14b4e933af418a8ea79ad223fdc574..5353f213f8803e3e2a9865c6a0567610edf51fc9 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-28,6
+28,7
@@
#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 <wx/wx.h>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
@@
-126,11
+127,25
@@
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;
dcpomatic::DCPTime one_video_frame () const;
protected:
NextFrameResult get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
+ wxColour pad_colour () const;
+
+ wxColour outline_content_colour () const {
+ return wxColour(255, 0, 0);
+ }
+
+ wxColour outline_subtitles_colour () const {
+ return wxColour(0, 255, 0);
+ }
+
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;
@@
-157,6
+172,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;