X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=9b67720d361cc56931fa39867b20e70003bd08ae;hb=HEAD;hp=1403e75b2d4f7691d6da67c69d7472b24e96d94a;hpb=42cdfe79afa72a428b5ee851611079f84d237f63;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 1403e75b2..9b67720d3 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,16 @@
 
 */
 
+
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-#include "types.h"
+
+#include "player.h"
 #include "player_text.h"
 #include <boost/signals2.hpp>
 
+
 class Film;
 class Encoder;
 class Player;
@@ -32,6 +35,7 @@ class Job;
 class PlayerVideo;
 class AudioBuffers;
 
+
 /** @class Encoder
  *  @brief Parent class for something that can encode a film into some format
  */
@@ -48,7 +52,7 @@ public:
 
 	/** @return the current frame rate over the last short while */
 	virtual boost::optional<float> current_rate () const {
-		return boost::optional<float>();
+		return {};
 	}
 
 	/** @return the number of frames that are done */
@@ -58,7 +62,8 @@ public:
 protected:
 	std::shared_ptr<const Film> _film;
 	std::weak_ptr<Job> _job;
-	std::shared_ptr<Player> _player;
+	Player _player;
 };
 
+
 #endif