projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Socket::set_send_buffer_size().
[dcpomatic.git]
/
src
/
lib
/
decoder.h
diff --git
a/src/lib/decoder.h
b/src/lib/decoder.h
index 92082ca18b105a62f9dd9aec909625c12ac875c9..0324075a36d98a252013e29dad8df9a8cf6e0392 100644
(file)
--- a/
src/lib/decoder.h
+++ b/
src/lib/decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,38
+18,49
@@
*/
*/
+
/** @file src/decoder.h
* @brief Decoder class.
*/
/** @file src/decoder.h
* @brief Decoder class.
*/
+
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
-#include "types.h"
-#include "film.h"
+
#include "dcpomatic_time.h"
#include "dcpomatic_time.h"
+#include "film.h"
+#include "types.h"
+#include "weak_film.h"
#include <boost/utility.hpp>
#include <boost/utility.hpp>
-class Decoded;
-class
Video
Decoder;
+
+class
Atmos
Decoder;
class AudioDecoder;
class AudioDecoder;
-class
TextDecoder
;
+class
Decoded
;
class DecoderPart;
class DecoderPart;
+class TextDecoder;
+class VideoDecoder;
+
/** @class Decoder.
* @brief Parent class for decoders of content.
*/
/** @class Decoder.
* @brief Parent class for decoders of content.
*/
-class Decoder : public
boost::noncopyable
+class Decoder : public
WeakConstFilm
{
public:
{
public:
- Decoder (
boost
::weak_ptr<const Film> film);
+ Decoder (
std
::weak_ptr<const Film> film);
virtual ~Decoder () {}
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.
/** 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.
@@
-57,13
+68,8
@@
public:
virtual bool pass () = 0;
virtual void seek (dcpomatic::ContentTime time, bool accurate);
virtual bool pass () = 0;
virtual void seek (dcpomatic::ContentTime time, bool accurate);
- dcpomatic::ContentTime position () const;
-
-protected:
- boost::shared_ptr<const Film> film () const;
-
-private:
- boost::weak_ptr<const Film> _film;
+ virtual dcpomatic::ContentTime position () const;
};
};
+
#endif
#endif