diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-26 01:21:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-26 17:04:31 +0100 |
| commit | 09a9ac376db005a40a351736bcff4077f098825d (patch) | |
| tree | 64ea69741155d15d114ad96daf0f90e24b3abe28 /src/lib/video_content.cc | |
| parent | 46cd0fe7b5b514f0d9456b25f670679cc584a218 (diff) | |
Another try at sorting out the thorny question of timing.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index f9de6aa21..3818fa792 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -22,6 +22,7 @@ #include "video_content.h" #include "video_examiner.h" #include "ratio.h" +#include "compose.hpp" #include "i18n.h" @@ -37,7 +38,7 @@ using boost::shared_ptr; using boost::lexical_cast; using boost::optional; -VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame len) +VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len) : Content (f, s) , _video_length (len) , _video_frame_rate (0) @@ -58,7 +59,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p) VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node) : Content (f, node) { - _video_length = node->number_child<ContentVideoFrame> ("VideoLength"); + _video_length = node->number_child<VideoContent::Frame> ("VideoLength"); _video_size.width = node->number_child<int> ("VideoWidth"); _video_size.height = node->number_child<int> ("VideoHeight"); _video_frame_rate = node->number_child<float> ("VideoFrameRate"); |
