C++11 tidying.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 10bb4531032e4d0068340b14c985d9b401ac2fb5..a672e8a10de0c090b8cf9fa520a007d46fe38a37 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,64 +1,80 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @file  src/decoder.h
  *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include "types.h"
+
 #include "dcpomatic_time.h"
+#include "film.h"
+#include "font_data.h"
+#include "types.h"
+#include "weak_film.h"
 #include <boost/utility.hpp>
 
+
+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
+class Decoder : public WeakConstFilm
 {
 public:
+       Decoder (std::weak_ptr<const Film> film);
        virtual ~Decoder () {}
 
-protected:
-       friend class AudioDecoderStream;
+       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;
 
-       /** Seek so that the next pass() will yield the next thing
-        *  (video/sound frame, subtitle etc.) at or after the requested
-        *  time.  Pass accurate = true to try harder to ensure that, at worst,
-        *  the next thing we yield comes before `time'.  This may entail
-        *  seeking some way before `time' to be on the safe side.
-        *  Alternatively, if seeking is 100% accurate for this decoder,
-        *  it may seek to just the right spot.
+       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 void seek (ContentTime time, bool accurate) = 0;
+       virtual bool pass () = 0;
+       virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
-       enum PassReason {
-               PASS_REASON_VIDEO,
-               PASS_REASON_AUDIO,
-               PASS_REASON_SUBTITLE
-       };
+       virtual dcpomatic::ContentTime position () const;
 
-       /** @return true if this decoder has already returned all its data and will give no more */
-       virtual bool pass (PassReason, bool accurate) = 0;
+       virtual std::vector<dcpomatic::FontData> fonts () const {
+               return {};
+       }
 };
 
+
 #endif