Supporters update.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index da5be4af679ccbda8b7c2100e2af3e5ce52b82e6..7097db88d1b3cf134d35a0dd2725496de8ae4820 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,39 +18,44 @@
 
 */
 
+
 /** @file  src/decoder.h
  *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include "types.h"
-#include "film.h"
-#include "font_data.h"
+
 #include "dcpomatic_time.h"
 #include "weak_film.h"
 #include <boost/utility.hpp>
 
-class Decoded;
-class VideoDecoder;
-class AudioDecoder;
-class TextDecoder;
+
 class AtmosDecoder;
+class AudioDecoder;
+class Decoded;
 class DecoderPart;
+class TextDecoder;
+class VideoDecoder;
+
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder : public boost::noncopyable, public WeakConstFilm
+class Decoder : public WeakConstFilm
 {
 public:
        Decoder (std::weak_ptr<const Film> film);
        virtual ~Decoder () {}
 
+       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::list<std::shared_ptr<TextDecoder>> text;
        std::shared_ptr<AtmosDecoder> atmos;
 
        std::shared_ptr<TextDecoder> only_text () const;
@@ -62,10 +67,7 @@ public:
        virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
        virtual dcpomatic::ContentTime position () const;
-
-       virtual std::vector<dcpomatic::FontData> fonts () const {
-               return std::vector<dcpomatic::FontData>();
-       }
 };
 
+
 #endif