diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 23:25:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 78664f8073256de51355c9162f61a4ae4fa560d7 (patch) | |
| tree | cd49f4377b123ea6bc0a3a4ca5973a76fae38b72 /src/lib/video_content.cc | |
| parent | 6f344b876689a1234a5eb75041882f06f5d9fe5c (diff) | |
Take some stuff out of VideoContent into ContentPart.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 708edee76..4059c29d1 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -65,8 +65,7 @@ using boost::optional; using boost::dynamic_pointer_cast; VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film) - : _parent (parent) - , _film (film) + : ContentPart (parent, film) , _video_length (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) @@ -78,8 +77,7 @@ VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film) } VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) - : _parent (parent) - , _film (film) + : ContentPart (parent, film) { _video_size.width = node->number_child<int> ("VideoWidth"); _video_size.height = node->number_child<int> ("VideoHeight"); @@ -117,8 +115,7 @@ VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, cxml:: } VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, vector<shared_ptr<Content> > c) - : _parent (parent) - , _film (film) + : ContentPart (parent, film) , _video_length (0) , _yuv (false) { |