X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=7214d35e40d2994b5d525c0a9120cb39a96d1905;hb=d5c059a2ff9bab5c2973db6bc4860591679dd42b;hp=ce645bb41fd714c8c6ad5c0b1c734827bbbee9a6;hpb=70b72b53eab0f247eb4dc605a2d669d4adb4e469;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index ce645bb41..7214d35e4 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -60,7 +60,7 @@ class VideoContent : public ContentPart, public std::enable_shared_from_this>); void as_xml (xmlpp::Node *) const; @@ -89,6 +89,7 @@ public: void set_frame_type (VideoFrameType); + void set_crop (Crop crop); void set_left_crop (int); void set_right_crop (int); void set_top_crop (int); @@ -183,6 +184,11 @@ public: 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; @@ -211,7 +217,7 @@ public: void modify_position (std::shared_ptr film, dcpomatic::DCPTime& pos) const; void modify_trim_start (dcpomatic::ContentTime& pos) const; - static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint); private: