X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=45dcd9900c256bce1996e3b92f4ec4699dfe83bd;hb=704e1112538d809fd55bd7f25385eaa5d064966c;hp=894f74bfc760a5a8b0afb5fbfa62d314c5fca8e3;hpb=1a43dcc9b0d4c40cb8a19f2ff475c67ace4ef6a2;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 894f74bfc..45dcd9900 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -74,7 +74,7 @@ public:
 /** @class Player
  *  @brief A class which can play a Playlist.
  */
-class Player : public std::enable_shared_from_this<Player>
+class Player
 {
 public:
 	Player (std::shared_ptr<const Film>, Image::Alignment subtitle_alignment);
@@ -227,13 +227,12 @@ private:
 	public:
 		StreamState () {}
 
-		StreamState (std::shared_ptr<Piece> p, dcpomatic::DCPTime l)
+		explicit StreamState(std::shared_ptr<Piece> p)
 			: piece(p)
-			, last_push_end(l)
 		{}
 
 		std::shared_ptr<Piece> piece;
-		dcpomatic::DCPTime last_push_end;
+		boost::optional<dcpomatic::DCPTime> last_push_end;
 	};
 	std::map<AudioStreamPtr, StreamState> _stream_states;