C++11 tidying.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d610f8727c902cd6bf889ab8cbc024ba3981f606..a672e8a10de0c090b8cf9fa520a007d46fe38a37 100644 (file)
--- 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,52 +18,63 @@
 
 */
 
+
 /** @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 "font_data.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;
+
+       std::shared_ptr<VideoDecoder> video;
+       std::shared_ptr<AudioDecoder> audio;
+       std::list<std::shared_ptr<TextDecoder>> text;
+       std::shared_ptr<AtmosDecoder> atmos;
 
-       boost::shared_ptr<TextDecoder> only_text () const;
+       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.
         */
        virtual bool pass () = 0;
-       virtual void seek (ContentTime time, bool accurate);
+       virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
-       ContentTime position () const;
+       virtual dcpomatic::ContentTime position () const;
 
-protected:
-       boost::shared_ptr<const Film> film () const;
-
-private:
-       boost::weak_ptr<const Film> _film;
+       virtual std::vector<dcpomatic::FontData> fonts () const {
+               return {};
+       }
 };
 
+
 #endif