projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
shuffler.h
diff --git
a/src/lib/shuffler.h
b/src/lib/shuffler.h
index 3eed3e4f005a1db2bfb92d80d91a07877a127c4d..b0a416b80f33edb9957919f6dc82d4cc1e6ef3eb 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
@@
-29,13
+31,16
@@
class Shuffler
public:
void clear ();
void flush ();
public:
void clear ();
void flush ();
- void video (
boost
::weak_ptr<Piece>, ContentVideo video);
+ void video (
std
::weak_ptr<Piece>, ContentVideo video);
- boost::signals2::signal<void (
boost
::weak_ptr<Piece>, ContentVideo)> Video;
+ boost::signals2::signal<void (
std
::weak_ptr<Piece>, ContentVideo)> Video;
- typedef std::pair<
boost
::weak_ptr<Piece>, ContentVideo> Store;
+ typedef std::pair<
std
::weak_ptr<Piece>, ContentVideo> Store;
private:
private:
+ friend struct ::shuffler_test5;
+
std::list<Store> _store;
boost::optional<ContentVideo> _last;
std::list<Store> _store;
boost::optional<ContentVideo> _last;
+ static int const _max_size;
};
};