projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accessor for ClosedCaptionsDialog.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index e42c37a8d4ffab33c7f06aacf165bea4aa44351d..c6fbd66e45a3c31bb3cb0f2c8fb2370f0097a767 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-92,9
+92,7
@@
public:
void slow_refresh ();
void slow_refresh ();
- int dropped () const {
- return _dropped;
- }
+ int dropped () const;
int audio_callback (void* out, unsigned int frames);
int audio_callback (void* out, unsigned int frames);
@@
-125,12
+123,6
@@
public:
dcp::Size out_size () const {
return _out_size;
}
dcp::Size out_size () const {
return _out_size;
}
- dcp::Size inter_size () const {
- return _inter_size;
- }
- Position<int> inter_position () const {
- return _inter_position;
- }
bool outline_content () const {
return _outline_content;
}
bool outline_content () const {
return _outline_content;
}
@@
-140,6
+132,9
@@
public:
boost::shared_ptr<Butler> butler () const {
return _butler;
}
boost::shared_ptr<Butler> butler () const {
return _butler;
}
+ ClosedCaptionsDialog* closed_captions_dialog () const {
+ return _closed_captions_dialog;
+ }
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
@@
-182,9
+177,6
@@
private:
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
- Position<int> _inter_position;
- dcp::Size _inter_size;
-
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
@@
-200,7
+192,6
@@
private:
mutable boost::mutex _latency_history_mutex;
int _latency_history_count;
mutable boost::mutex _latency_history_mutex;
int _latency_history_count;
- int _dropped;
boost::optional<int> _dcp_decode_reduction;
ClosedCaptionsDialog* _closed_captions_dialog;
boost::optional<int> _dcp_decode_reduction;
ClosedCaptionsDialog* _closed_captions_dialog;