projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
text_ring_buffers.h
diff --git
a/src/lib/text_ring_buffers.h
b/src/lib/text_ring_buffers.h
index 289a38149146c2f27fae90f98f42e9980de41504..1f366fc0b946f0dcab848c23d68e9519331e6eb6 100644
(file)
--- a/
src/lib/text_ring_buffers.h
+++ b/
src/lib/text_ring_buffers.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,21
+18,25
@@
*/
*/
+
#ifndef DCPOMATIC_TEXT_RING_BUFFERS_H
#define DCPOMATIC_TEXT_RING_BUFFERS_H
#ifndef DCPOMATIC_TEXT_RING_BUFFERS_H
#define DCPOMATIC_TEXT_RING_BUFFERS_H
-#include "player_text.h"
+
#include "dcp_text_track.h"
#include "dcp_text_track.h"
+#include "dcpomatic_time.h"
+#include "player_text.h"
#include <boost/thread.hpp>
#include <utility>
#include <boost/thread.hpp>
#include <utility>
+
class TextRingBuffers
{
public:
class TextRingBuffers
{
public:
- void put (PlayerText text, DCPTextTrack track, DCPTimePeriod period);
+ void put (PlayerText text, DCPTextTrack track,
dcpomatic::
DCPTimePeriod period);
struct Data {
struct Data {
- Data (PlayerText text_, DCPTextTrack track_, DCPTimePeriod period_)
+ Data (PlayerText text_, DCPTextTrack track_,
dcpomatic::
DCPTimePeriod period_)
: text (text_)
, track (track_)
, period (period_)
: text (text_)
, track (track_)
, period (period_)
@@
-40,7
+44,7
@@
public:
PlayerText text;
DCPTextTrack track;
PlayerText text;
DCPTextTrack track;
- DCPTimePeriod period;
+
dcpomatic::
DCPTimePeriod period;
};
boost::optional<Data> get ();
};
boost::optional<Data> get ();
@@
-52,4
+56,5
@@
private:
std::list<Data> _data;
};
std::list<Data> _data;
};
+
#endif
#endif