projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
lib
/
shuffler.h
diff --git
a/src/lib/shuffler.h
b/src/lib/shuffler.h
index 7ac300b478335a9c8e3d24c6708c650944e0626a..80754a5e0b2854f7058e29aa8e7cf02bf5de3252 100644
(file)
--- a/
src/lib/shuffler.h
+++ b/
src/lib/shuffler.h
@@
-22,6
+22,8
@@
#include "content_video.h"
#include <boost/signals2.hpp>
#include "content_video.h"
#include <boost/signals2.hpp>
+struct shuffler_test5;
+
class Piece;
class Shuffler
class Piece;
class Shuffler
@@
-36,6
+38,8
@@
public:
typedef std::pair<boost::weak_ptr<Piece>, ContentVideo> Store;
private:
typedef std::pair<boost::weak_ptr<Piece>, ContentVideo> Store;
private:
+ friend struct ::shuffler_test5;
+
std::list<Store> _store;
boost::optional<ContentVideo> _last;
static int const _max_size;
std::list<Store> _store;
boost::optional<ContentVideo> _last;
static int const _max_size;