projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try again to remove anything at audio_mxf_filename.
[dcpomatic.git]
/
src
/
lib
/
decoder.h
diff --git
a/src/lib/decoder.h
b/src/lib/decoder.h
index cfca6867f652d3fc9d2d5be7320d75128060cffe..d67592ed812544c644b8766bcb1b1be1c03e84de 100644
(file)
--- a/
src/lib/decoder.h
+++ b/
src/lib/decoder.h
@@
-24,24
+24,16
@@
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
-#include <vector>
-#include <string>
-#include <stdint.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/
signals2
.hpp>
-#include
"film.h"
+#include <boost/
weak_ptr
.hpp>
+#include
<boost/utility.hpp>
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Film;
/** @class Decoder.
* @brief Parent class for decoders of content.
*/
/** @class Decoder.
* @brief Parent class for decoders of content.
*/
-class Decoder
+class Decoder
: public boost::noncopyable
{
public:
Decoder (boost::shared_ptr<const Film>);
{
public:
Decoder (boost::shared_ptr<const Film>);
@@
-51,20
+43,14
@@
public:
* cause the object to emit some data.
*/
virtual void pass () = 0;
* cause the object to emit some data.
*/
virtual void pass () = 0;
-
virtual bool done () const = 0;
protected:
virtual bool done () const = 0;
protected:
+ virtual void flush () {};
+
/** The Film that we are decoding in */
boost::weak_ptr<const Film> _film;
/** 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;
};
#endif
};
#endif