summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/dcp_decoder.cc6
-rw-r--r--src/lib/dcp_decoder.h2
-rw-r--r--src/lib/decoder.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 7bd7ddf68..7af89e84d 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -415,3 +415,9 @@ DCPDecoder::set_forced_reduction (optional<int> reduction)
{
_forced_reduction = reduction;
}
+
+ContentTime
+DCPDecoder::position () const
+{
+ return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
+}
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 4068696ea..7beb7f7b1 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -52,6 +52,8 @@ public:
bool pass ();
void seek (ContentTime t, bool accurate);
+ ContentTime position () const;
+
private:
friend struct dcp_subtitle_within_dcp_test;
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d610f8727..93c212b34 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -57,7 +57,7 @@ public:
virtual bool pass () = 0;
virtual void seek (ContentTime time, bool accurate);
- ContentTime position () const;
+ virtual ContentTime position () const;
protected:
boost::shared_ptr<const Film> film () const;