summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-13 10:23:20 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-13 10:23:20 +0000
commitda19eaac0dd80afed3dd282d61ea3298196a5090 (patch)
tree8b6caca26fc79aa943082965e7aac72ae6dcc521 /src/lib/player.h
parent097a1fb413bbbb89182161d4c1a31daa5419ec96 (diff)
Start of changing frame numbers to time.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 364d66249..0d6c8d8ba 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -49,8 +49,8 @@ public:
boost::shared_ptr<const Image> image;
Eyes eyes;
bool same;
- VideoContent::Frame frame;
- DCPTime extra;
+ ContentTime time;
+ ContentTime extra;
};
/** A wrapper for an Image which contains some pending operations; these may
@@ -118,8 +118,8 @@ private:
friend class PlayerWrapper;
friend class Piece;
- void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame, DCPTime);
- void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+ void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, ContentTime, ContentTime);
+ void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, ContentTime);
void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
void setup_pieces ();
void playlist_changed ();