projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated es_ES translation from Manuel AC.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index de151e1451d9f9583168a65a19687a045cc5a309..2adf941d97cc3cd4a26a5b0e0c13ca33abd95464 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-113,27
+113,29
@@
public:
return _frame_type;
}
return _frame_type;
}
- Crop crop () const {
+ Crop actual_crop () const;
+
+ Crop requested_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop;
}
- int left_crop () const {
+ int
requested_
left_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.left;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.left;
}
- int right_crop () const {
+ int r
equested_r
ight_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.right;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.right;
}
- int top_crop () const {
+ int
requested_
top_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.top;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.top;
}
- int bottom_crop () const {
+ int
requested_
bottom_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.bottom;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.bottom;
}
@@
-181,6
+183,11
@@
public:
return _range;
}
return _range;
}
+ PixelQuanta pixel_quanta () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _pixel_quanta;
+ }
+
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
return _use;
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
return _use;