X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=0324075a36d98a252013e29dad8df9a8cf6e0392;hb=b0fc1ec3b159b7a7fa917f2e338485921800374e;hp=ddea58aacbfc636c9c29d0264300155046c5378b;hpb=efc3486f2acf36bd0dc7b5528e7b3110ea8c4afe;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index ddea58aac..0324075a3 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,38 +18,49 @@
 
 */
 
+
 /** @file  src/decoder.h
  *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include "types.h"
-#include "film.h"
+
 #include "dcpomatic_time.h"
+#include "film.h"
+#include "types.h"
+#include "weak_film.h"
 #include <boost/utility.hpp>
 
-class Decoded;
-class VideoDecoder;
+
+class AtmosDecoder;
 class AudioDecoder;
-class TextDecoder;
+class Decoded;
 class DecoderPart;
+class TextDecoder;
+class VideoDecoder;
+
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder : public boost::noncopyable
+class Decoder : public WeakConstFilm
 {
 public:
-	Decoder (boost::weak_ptr<const Film> film);
+	Decoder (std::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
-	boost::shared_ptr<VideoDecoder> video;
-	boost::shared_ptr<AudioDecoder> audio;
-	std::list<boost::shared_ptr<TextDecoder> > text;
+	Decoder (Decoder const&) = delete;
+	Decoder& operator= (Decoder const&) = delete;
 
-	boost::shared_ptr<TextDecoder> only_text () const;
+	std::shared_ptr<VideoDecoder> video;
+	std::shared_ptr<AudioDecoder> audio;
+	std::list<std::shared_ptr<TextDecoder>> text;
+	std::shared_ptr<AtmosDecoder> atmos;
+
+	std::shared_ptr<TextDecoder> only_text () const;
 
 	/** Do some decoding and perhaps emit video, audio or subtitle data.
 	 *  @return true if this decoder will emit no more data unless a seek() happens.
@@ -58,12 +69,7 @@ public:
 	virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
 	virtual dcpomatic::ContentTime position () const;
-
-protected:
-	boost::shared_ptr<const Film> film () const;
-
-private:
-	boost::weak_ptr<const Film> _film;
 };
 
+
 #endif