projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More player debugging for butler video-full states.
[dcpomatic.git]
/
src
/
lib
/
empty.h
diff --git
a/src/lib/empty.h
b/src/lib/empty.h
index 3c676deeb6b2f4573537c2a45aea56fd6c203096..50f21fc4d5380edebda09c05fcfd58a15f8289f0 100644
(file)
--- a/
src/lib/empty.h
+++ b/
src/lib/empty.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 201
7
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,18
+18,24
@@
*/
*/
+#ifndef DCPOMATIC_EMPTY_H
+#define DCPOMATIC_EMPTY_H
+
#include "playlist.h"
#include "dcpomatic_time.h"
#include "content_part.h"
#include <list>
struct empty_test1;
#include "playlist.h"
#include "dcpomatic_time.h"
#include "content_part.h"
#include <list>
struct empty_test1;
+struct empty_test2;
+struct player_subframe_test;
+class Piece;
class Empty
{
public:
Empty () {}
class Empty
{
public:
Empty () {}
- Empty (boost::shared_ptr<const
Playlist> playlist, boost::function<boost::shared_ptr<ContentPart> (Content *
)> part);
+ Empty (boost::shared_ptr<const
Film> film, std::list<boost::shared_ptr<Piece> > pieces, boost::function<bool (boost::shared_ptr<Piece>
)> part);
DCPTime position () const {
return _position;
DCPTime position () const {
return _position;
@@
-43,7
+49,11
@@
public:
private:
friend struct ::empty_test1;
private:
friend struct ::empty_test1;
+ friend struct ::empty_test2;
+ friend struct ::player_subframe_test;
std::list<DCPTimePeriod> _periods;
DCPTime _position;
};
std::list<DCPTimePeriod> _periods;
DCPTime _position;
};
+
+#endif