Fix length of player output so it can be either the film's length or playlist's lengt...

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index 68531cfb377da8a5bbc7fb390f0108d06639aca9..5a1b08ecf74fef3d9abb4a0747d5191f986641f5 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -35,6 +35,7 @@
 #include "empty.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/atomic.hpp>
 #include <list>
 
 namespace dcp {
@@ -67,7 +68,7 @@ public:
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-       Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
+       Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist, dcpomatic::DCPTime playback_length);
        ~Player ();
 
        bool pass ();
@@ -206,8 +207,7 @@ private:
        ActiveText _active_texts[TEXT_COUNT];
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
-       /* Cached stuff */
-       boost::optional<dcpomatic::DCPTime> _film_length;
+       dcpomatic::DCPTime _playback_length;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _playlist_change_connection;