projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some friends from FilmViewer.
[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 a599bc7036f8d048bb421a64fe30a9e974a506d8..5c366ca7b0dbe2cc9d9f61e8eba4002b5e71c6ff 100644
(file)
--- a/
src/wx/closed_captions_dialog.h
+++ b/
src/wx/closed_captions_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2019
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,24
+20,33
@@
#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>
#include <wx/wx.h>
-class Player;
+class Butler;
+class FilmViewer;
class ClosedCaptionsDialog : public wxDialog
{
public:
class ClosedCaptionsDialog : public wxDialog
{
public:
-
ClosedCaptionsDialog (wxWindow* parent
);
+
explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
);
- void update (DCPTime);
void clear ();
void clear ();
- void set_
player (boost::weak_ptr<Play
er>);
+ void set_
film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butl
er>);
private:
private:
+ void shown (wxShowEvent);
+ void update ();
void paint ();
void paint ();
+ void track_selected ();
+ FilmViewer* _viewer;
+ wxPanel* _display;
+ wxChoice* _track;
+ boost::optional<TextRingBuffers::Data> _current;
+ bool _current_in_lines;
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
;
+
std::vector<DCPTextTrack> _tracks
;
+
boost::weak_ptr<Butler> _butler
;
+
wxTimer _timer
;
};
};