projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
shuffler.h
diff --git
a/src/lib/shuffler.h
b/src/lib/shuffler.h
index 7ac300b478335a9c8e3d24c6708c650944e0626a..476f571b4571d88fef4d14eba5e5aaf56afef15d 100644
(file)
--- a/
src/lib/shuffler.h
+++ b/
src/lib/shuffler.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,25
+18,40
@@
*/
*/
-#include "types.h"
+
+#ifndef DCPOMATIC_SHUFFLER_H
+#define DCPOMATIC_SHUFFLER_H
+
+
#include "content_video.h"
#include "content_video.h"
+#include "types.h"
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
+struct shuffler_test5;
+
class Piece;
class Piece;
+
class Shuffler
{
public:
void clear ();
void flush ();
class Shuffler
{
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;
static int const _max_size;
};
std::list<Store> _store;
boost::optional<ContentVideo> _last;
static int const _max_size;
};
+
+
+#endif
+