projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get ccaps by asking the Player, rather than by listening to its emissions,
[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 ca19cc95ad97b0205c3955502a24dded4f5cdf1f..a599bc7036f8d048bb421a64fe30a9e974a506d8 100644
(file)
--- a/
src/wx/closed_captions_dialog.h
+++ b/
src/wx/closed_captions_dialog.h
@@
-19,24
+19,25
@@
*/
#include "lib/dcpomatic_time.h"
*/
#include "lib/dcpomatic_time.h"
-#include "lib/player
_caption
.h"
+#include "lib/player.h"
#include <wx/wx.h>
#include <wx/wx.h>
-class ClosedCaptionsView : public wxDialog
+class Player;
+
+class ClosedCaptionsDialog : public wxDialog
{
public:
{
public:
- ClosedCaptions
View
(wxWindow* parent);
+ ClosedCaptions
Dialog
(wxWindow* parent);
- void refresh (DCPTime);
- void caption (PlayerCaption, DCPTimePeriod);
+ void update (DCPTime);
void clear ();
void clear ();
+ void set_player (boost::weak_ptr<Player>);
private:
void paint ();
private:
void paint ();
- typedef std::pair<PlayerCaption, DCPTimePeriod> Caption;
- std::list<Caption> _captions;
std::vector<wxString> _lines;
std::vector<wxString> _lines;
+ boost::weak_ptr<Player> _player;
static int const _num_lines;
static int const _num_chars_per_line;
};
static int const _num_lines;
static int const _num_chars_per_line;
};