summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-15 16:36:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-15 16:36:49 +0100
commit1bb4bd728a445de0728c897211bf079c714d4f41 (patch)
treeb4d606dafac8a3fc99d8ce362238c0e14bc9459b /src/lib/player.h
parent49c7639efbd0c7e014e9ddf3380b6d7f1fed9285 (diff)
Add some player tests. Fix seek with content at non-DCP frame rate. A few other small fixes.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index b3eadd7c0..92a358043 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -75,6 +75,7 @@ public:
boost::signals2::signal<void ()> Changed;
private:
+ friend class PlayerWrapper;
void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, bool, VideoContent::Frame);
void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
@@ -126,6 +127,10 @@ private:
Time from;
Time to;
} _out_subtitle;
+
+#ifdef DCPOMATIC_DEBUG
+ boost::shared_ptr<Content> _last_video;
+#endif
};
#endif