summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-16 12:15:38 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-16 12:15:38 +0000
commit797648ddcfe72bb428d8355672da3a1b6fac54fc (patch)
tree2f0d7cf7f3aaee8b45b0dfa9e3363b082e57af31 /src
parent66d12a84fd513ad68692f7cb473472ad76aa495f (diff)
Move reel_split_points from VideoContent to Content.
Diffstat (limited to 'src')
-rw-r--r--src/lib/content.cc10
-rw-r--r--src/lib/content.h4
-rw-r--r--src/lib/video_content.cc9
-rw-r--r--src/lib/video_content.h5
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index af85e0ff0..2c89f7c34 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -295,3 +295,13 @@ Content::film () const
DCPOMATIC_ASSERT (film);
return film;
}
+
+/** @return DCP times of points within this content where a reel split could occur */
+list<DCPTime>
+Content::reel_split_points () const
+{
+ list<DCPTime> t;
+ /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */
+ t.push_back (position().round_up (film()->video_frame_rate()));
+ return t;
+}
diff --git a/src/lib/content.h b/src/lib/content.h
index b91b5778c..7301546eb 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -86,6 +86,10 @@ public:
virtual void as_xml (xmlpp::Node *) const;
virtual DCPTime full_length () const = 0;
virtual std::string identifier () const;
+ /** @return points at which to split this content when
+ * REELTYPE_BY_VIDEO_CONTENT is in use.
+ */
+ virtual std::list<DCPTime> reel_split_points () const;
std::list<std::pair<std::string, std::string> > properties () const;
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index fcf7e3229..514ecae2e 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -586,15 +586,6 @@ VideoContent::add_properties (list<pair<string, string> >& p) const
p.push_back (make_pair (_("Video frame rate"), raw_convert<string> (video_frame_rate()) + " " + _("frames per second")));
}
-list<DCPTime>
-VideoContent::reel_split_points () const
-{
- list<DCPTime> t;
- /* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */
- t.push_back (position().round_up (film()->video_frame_rate()));
- return t;
-}
-
double
VideoContent::video_frame_rate () const
{
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 689655131..0e58bd1b1 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -55,11 +55,6 @@ public:
virtual void set_default_colour_conversion ();
- /** @return points at which to split this content when
- * REELTYPE_BY_VIDEO_CONTENT is in use.
- */
- virtual std::list<DCPTime> reel_split_points () const;
-
Frame video_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_length;