C++11 tidying.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index b550bf5cbe55e990eadd13aa95baab47a7f3f010..a672e8a10de0c090b8cf9fa520a007d46fe38a37 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,90 +1,80 @@
 /*
-    Copyright (C) 2012-2013 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 Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "video_source.h"
-#include "audio_source.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 Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder
+class Decoder : public WeakConstFilm
 {
 public:
-       Decoder (boost::shared_ptr<const Film>);
+       Decoder (std::weak_ptr<const Film> film);
        virtual ~Decoder () {}
 
-       /** Perform one decode pass of the content, which may or may not
-        *  cause the object to emit some data.
-        */
-       virtual void pass () = 0;
-
-       /** Seek this decoder to as close as possible to some time,
-        *  expressed relative to our source's start.
-        *  @param t Time.
-        *  @param a true to try hard to be accurate, otherwise false.
-        */
-       virtual void seek (Time) = 0;
+       Decoder (Decoder const&) = delete;
+       Decoder& operator= (Decoder const&) = delete;
 
-       /** Seek back one video frame */
-       virtual void seek_back () = 0;
+       std::shared_ptr<VideoDecoder> video;
+       std::shared_ptr<AudioDecoder> audio;
+       std::list<std::shared_ptr<TextDecoder>> text;
+       std::shared_ptr<AtmosDecoder> atmos;
 
-       /** Seek forward one video frame */
-       virtual void seek_forward () = 0;
+       std::shared_ptr<TextDecoder> only_text () const;
 
-       /** @return Approximate time of the next content that we will emit,
-        *  expressed relative to the start of our source.
+       /** 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 Time next () const = 0;
-
-       virtual bool done () const = 0;
+       virtual bool pass () = 0;
+       virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
-protected:
+       virtual dcpomatic::ContentTime position () const;
 
-       /** The Film that we are decoding in */
-       boost::weak_ptr<const Film> _film;
-
-private:
-       /** This will be called when our Film emits Changed */
-       virtual void film_changed (Film::Property) {}
-
-       /** Connection to our Film */
-       boost::signals2::scoped_connection _film_connection;
+       virtual std::vector<dcpomatic::FontData> fonts () const {
+               return {};
+       }
 };
 
+
 #endif