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
/
piece.h
diff --git
a/src/lib/piece.h
b/src/lib/piece.h
index 711e292eed451bd7961b8d11d3fa5111a83bdb40..688242c064d5b54013217fb6c98a942540445817 100644
(file)
--- a/
src/lib/piece.h
+++ b/
src/lib/piece.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,28
+18,36
@@
*/
*/
+
#ifndef DCPOMATIC_PIECE_H
#define DCPOMATIC_PIECE_H
#ifndef DCPOMATIC_PIECE_H
#define DCPOMATIC_PIECE_H
+
+#include "dcpomatic_time.h"
+#include "frame_rate_change.h"
#include "types.h"
#include "types.h"
+
class Content;
class Decoder;
class Content;
class Decoder;
+
class Piece
{
public:
class Piece
{
public:
- Piece (
boost::shared_ptr<Content> c, boost
::shared_ptr<Decoder> d, FrameRateChange f)
+ Piece (
std::shared_ptr<Content> c, std
::shared_ptr<Decoder> d, FrameRateChange f)
: content (c)
, decoder (d)
, frc (f)
, done (false)
{}
: content (c)
, decoder (d)
, frc (f)
, done (false)
{}
- boost::shared_ptr<Content> content;
- boost::shared_ptr<Decoder> decoder;
+ std::shared_ptr<Content> content;
+ std::shared_ptr<Decoder> decoder;
+ boost::optional<dcpomatic::DCPTimePeriod> ignore_video;
FrameRateChange frc;
bool done;
};
FrameRateChange frc;
bool done;
};
+
#endif
#endif