projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
wx
/
closed_captions_dialog.h
diff --git
a/src/wx/closed_captions_dialog.h
b/src/wx/closed_captions_dialog.h
index 3da7f65225b7fc5330c928036c6bdbe9c8f387b3..3818e38124d9a583a6f7e51dc4ed73abd8b5557c 100644
(file)
--- a/
src/wx/closed_captions_dialog.h
+++ b/
src/wx/closed_captions_dialog.h
@@
-20,6
+20,7
@@
#include "lib/dcpomatic_time.h"
#include "lib/player.h"
#include "lib/dcpomatic_time.h"
#include "lib/player.h"
+#include "lib/text_ring_buffers.h"
#include <wx/wx.h>
class Butler;
#include <wx/wx.h>
class Butler;
@@
-36,7
+37,7
@@
public:
private:
void paint ();
private:
void paint ();
- boost::optional<
std::pair<PlayerText, DCPTimePeriod>
> _current;
+ boost::optional<
TextRingBuffers::Data
> _current;
bool _current_in_lines;
std::vector<wxString> _lines;
boost::weak_ptr<Butler> _butler;
bool _current_in_lines;
std::vector<wxString> _lines;
boost::weak_ptr<Butler> _butler;