projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
decoder_part.h
diff --git
a/src/lib/decoder_part.h
b/src/lib/decoder_part.h
index 0b8b6a43bfdedc89d416aa21df3b60800649b741..57ddee781968556087e6d307043ddad6850a260e 100644
(file)
--- a/
src/lib/decoder_part.h
+++ b/
src/lib/decoder_part.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
16
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,22
+18,27
@@
*/
*/
+
#ifndef DCPOMATIC_DECODER_PART_H
#define DCPOMATIC_DECODER_PART_H
#ifndef DCPOMATIC_DECODER_PART_H
#define DCPOMATIC_DECODER_PART_H
+
#include "dcpomatic_time.h"
#include <boost/optional.hpp>
#include "dcpomatic_time.h"
#include <boost/optional.hpp>
+
class Decoder;
class Log;
class Decoder;
class Log;
+class Film;
+
class DecoderPart
{
public:
class DecoderPart
{
public:
- DecoderPart (Decoder* parent
, boost::shared_ptr<Log> log
);
+ DecoderPart (Decoder* parent);
virtual ~DecoderPart () {}
virtual ~DecoderPart () {}
- virtual
ContentTime position (
) const = 0;
+ virtual
boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film
) const = 0;
virtual void seek () = 0;
void set_ignore (bool i) {
virtual void seek () = 0;
void set_ignore (bool i) {
@@
-46,10
+51,10
@@
public:
protected:
Decoder* _parent;
protected:
Decoder* _parent;
- boost::shared_ptr<Log> _log;
private:
bool _ignore;
};
private:
bool _ignore;
};
+
#endif
#endif