projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing noncopyable.
[dcpomatic.git]
/
src
/
lib
/
empty.h
diff --git
a/src/lib/empty.h
b/src/lib/empty.h
index ee11714289eaa42fe729c20d0854f00e019a849c..2368c4491f10fbd401c415b4dde9896151485cae 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,6
+18,9
@@
*/
*/
+#ifndef DCPOMATIC_EMPTY_H
+#define DCPOMATIC_EMPTY_H
+
#include "playlist.h"
#include "dcpomatic_time.h"
#include "content_part.h"
#include "playlist.h"
#include "dcpomatic_time.h"
#include "content_part.h"
@@
-25,29
+28,33
@@
struct empty_test1;
struct empty_test2;
struct empty_test1;
struct empty_test2;
+struct empty_test3;
struct player_subframe_test;
class Empty
{
public:
Empty () {}
struct player_subframe_test;
class Empty
{
public:
Empty () {}
- Empty (boost::shared_ptr<const Film> film, boost::
function<boost::shared_ptr<ContentPart> (Content *)> part
);
+ Empty (boost::shared_ptr<const Film> film, boost::
shared_ptr<const Playlist> playlist, boost::function<bool (boost::shared_ptr<const Content>)> part, dcpomatic::DCPTime length
);
- DCPTime position () const {
+
dcpomatic::
DCPTime position () const {
return _position;
}
return _position;
}
- DCPTimePeriod period_at_position () const;
+
dcpomatic::
DCPTimePeriod period_at_position () const;
bool done () const;
bool done () const;
- void set_position (DCPTime amount);
+ void set_position (
dcpomatic::
DCPTime amount);
private:
friend struct ::empty_test1;
friend struct ::empty_test2;
private:
friend struct ::empty_test1;
friend struct ::empty_test2;
+ friend struct ::empty_test3;
friend struct ::player_subframe_test;
friend struct ::player_subframe_test;
- std::list<DCPTimePeriod> _periods;
- DCPTime _position;
+ std::list<
dcpomatic::
DCPTimePeriod> _periods;
+
dcpomatic::
DCPTime _position;
};
};
+
+#endif