projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use cxml::ConstNodePtr.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index fbba9c09da21ea8b015ad441c92e446e4bb9d499..8313c73eeb8a32b8d65a79e2caa6d22466966042 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-43,9
+43,9
@@
public:
VideoContentScale ();
VideoContentScale (Ratio const *);
VideoContentScale (bool);
VideoContentScale ();
VideoContentScale (Ratio const *);
VideoContentScale (bool);
- VideoContentScale (
boost::shared_ptr<cxml::Node>
);
+ VideoContentScale (
cxml::NodePtr
);
-
libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size, lib
dcp::Size) const;
+
dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size,
dcp::Size) const;
std::string id () const;
std::string name () const;
void as_xml (xmlpp::Node *) const;
std::string id () const;
std::string name () const;
void as_xml (xmlpp::Node *) const;
@@
-81,9
+81,9
@@
public:
typedef int Frame;
VideoContent (boost::shared_ptr<const Film>);
typedef int Frame;
VideoContent (boost::shared_ptr<const Film>);
- VideoContent (boost::shared_ptr<const Film>,
Time, VideoContent::Fra
me);
+ VideoContent (boost::shared_ptr<const Film>,
DCPTime, ContentTi
me);
VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
- VideoContent (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>
, int);
+ VideoContent (boost::shared_ptr<const Film>,
cxml::ConstNodePtr
, int);
VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
@@
-91,21
+91,21
@@
public:
virtual std::string information () const;
virtual std::string identifier () const;
virtual std::string information () const;
virtual std::string identifier () const;
-
VideoContent::Fra
me video_length () const {
+
ContentTi
me video_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_length;
}
boost::mutex::scoped_lock lm (_mutex);
return _video_length;
}
-
VideoContent::Fra
me video_length_after_3d_combine () const {
+
ContentTi
me video_length_after_3d_combine () const {
boost::mutex::scoped_lock lm (_mutex);
if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
boost::mutex::scoped_lock lm (_mutex);
if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
- return
_video_length / 2
;
+ return
ContentTime (_video_length.get() / 2)
;
}
return _video_length;
}
}
return _video_length;
}
-
lib
dcp::Size video_size () const {
+ dcp::Size video_size () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_size;
}
boost::mutex::scoped_lock lm (_mutex);
return _video_size;
}
@@
-166,15
+166,15
@@
public:
return _colour_conversion;
}
return _colour_conversion;
}
-
lib
dcp::Size video_size_after_3d_split () const;
-
lib
dcp::Size video_size_after_crop () const;
+ dcp::Size video_size_after_3d_split () const;
+ dcp::Size video_size_after_crop () const;
-
VideoContent::Frame time_to_content_video_frames (
Time) const;
+
ContentTime dcp_time_to_content_time (DCP
Time) const;
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
-
VideoContent::Fra
me _video_length;
+
ContentTi
me _video_length;
float _video_frame_rate;
private:
float _video_frame_rate;
private:
@@
-185,7
+185,7
@@
private:
void setup_default_colour_conversion ();
void setup_default_colour_conversion ();
-
lib
dcp::Size _video_size;
+ dcp::Size _video_size;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;