diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 13:22:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | cc76b517f6a74f813ae38137bdc88ff3bafa6dd9 (patch) | |
| tree | 34c2960763f897936efef689898a1f392fb38375 /src/lib/video_content.h | |
| parent | a3073b3059e8df6304d2936ab2c605e6908a7373 (diff) | |
Allow content parts to not be preset in XML.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 03ffb0fa8..ef54a6be4 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -51,7 +51,6 @@ class VideoContent : public ContentPart, public boost::enable_shared_from_this<V { public: VideoContent (Content* parent, boost::shared_ptr<const Film>); - VideoContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int); VideoContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >); void as_xml (xmlpp::Node *) const; @@ -167,6 +166,8 @@ public: void take_from_examiner (boost::shared_ptr<VideoExaminer>); void add_properties (std::list<UserProperty> &) const; + static boost::shared_ptr<VideoContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int); + private: friend struct ffmpeg_pts_offset_test; @@ -174,6 +175,7 @@ private: friend struct best_dcp_frame_rate_test_double; friend struct audio_sampling_rate_test; + VideoContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int); void setup_default_colour_conversion (); Frame _length; |