projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dubious _buffers_mutex and maintain a lock on _mutex for
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index f5fb6c9ac747320c03b610b4d76b2417c3a02069..37223c45788eef070d5ab5780a761e40f763f663 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-39,6
+39,7
@@
class Content;
class VideoContentProperty
{
public:
class VideoContentProperty
{
public:
+ static int const USE;
static int const SIZE;
static int const FRAME_TYPE;
static int const CROP;
static int const SIZE;
static int const FRAME_TYPE;
static int const CROP;
@@
-94,6
+95,7
@@
public:
void set_fade_out (Frame);
void set_range (VideoRange);
void set_fade_out (Frame);
void set_range (VideoRange);
+ void set_use (bool);
VideoFrameType frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
VideoFrameType frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-161,6
+163,11
@@
public:
return _range;
}
return _range;
}
+ bool use () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _use;
+ }
+
dcp::Size size_after_3d_split () const;
dcp::Size size_after_crop () const;
dcp::Size size_after_3d_split () const;
dcp::Size size_after_crop () const;
@@
-191,6
+198,7
@@
private:
VideoContent (Content* parent, cxml::ConstNodePtr, int);
void setup_default_colour_conversion ();
VideoContent (Content* parent, cxml::ConstNodePtr, int);
void setup_default_colour_conversion ();
+ bool _use;
Frame _length;
boost::optional<ColourConversion> _colour_conversion;
dcp::Size _size;
Frame _length;
boost::optional<ColourConversion> _colour_conversion;
dcp::Size _size;
@@
-200,7
+208,9
@@
private:
/** Sample aspect ratio obtained from the content file's header, if there is one */
boost::optional<double> _sample_aspect_ratio;
bool _yuv;
/** Sample aspect ratio obtained from the content file's header, if there is one */
boost::optional<double> _sample_aspect_ratio;
bool _yuv;
+ /** fade in time in content frames */
Frame _fade_in;
Frame _fade_in;
+ /** fade out time in content frames */
Frame _fade_out;
VideoRange _range;
};
Frame _fade_out;
VideoRange _range;
};