projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove player activity logging. Fixes #2122.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 8024bb1bfc16ff9020b5596e057c1dbd0b9fb3df..0291b660fa403ea0e57359dc286216d5143be7f0 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-62,7
+62,7
@@
public:
return _video_view->get();
}
return _video_view->get();
}
-
VideoView const *
video_view () const {
+
std::shared_ptr<const VideoView>
video_view () const {
return _video_view;
}
return _video_view;
}
@@
-95,9
+95,10
@@
public:
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
- void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>
>);
+ void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
void set_eyes (Eyes e);
void set_pad_black (bool p);
void set_eyes (Eyes e);
void set_pad_black (bool p);
+ void set_optimise_for_j2k (bool o);
void slow_refresh ();
void slow_refresh ();
@@
-115,13
+116,10
@@
public:
}
/* Some accessors and utility methods that VideoView classes need */
}
/* Some accessors and utility methods that VideoView classes need */
- dcp::Size out_size () const {
- return _out_size;
- }
bool outline_content () const {
return _outline_content;
}
bool outline_content () const {
return _outline_content;
}
- boost::optional<dcpomatic::Rect<double>
> outline_subtitles () const {
+ boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
return _outline_subtitles;
}
bool pad_black () const {
return _outline_subtitles;
}
bool pad_black () const {
@@
-141,10
+139,12
@@
public:
}
boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
}
boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
- boost::signals2::signal<void (
dcpomatic::DCPTime
)> Started;
- boost::signals2::signal<void (
dcpomatic::DCPTime
)> Stopped;
+ boost::signals2::signal<void ()> Started;
+ boost::signals2::signal<void ()> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
+ /** Emitted from the GUI thread when a lot of frames are being dropped */
+ boost::signals2::signal<void()> TooManyDropped;
boost::signals2::signal<bool ()> PlaybackPermitted;
boost::signals2::signal<bool ()> PlaybackPermitted;
@@
-170,38
+170,40
@@
private:
std::shared_ptr<Film> _film;
std::shared_ptr<Player> _player;
std::shared_ptr<Film> _film;
std::shared_ptr<Player> _player;
-
VideoView*
_video_view;
- bool _coalesce_player_changes;
+
std::shared_ptr<VideoView>
_video_view;
+ bool _coalesce_player_changes
= false
;
std::vector<int> _pending_player_changes;
std::vector<int> _pending_player_changes;
- /** Size of our output (including padding if we have any) */
- dcp::Size _out_size;
-
RtAudio _audio;
RtAudio _audio;
- int _audio_channels;
- unsigned int _audio_block_size;
- bool _playing;
- int _suspended;
+ int _audio_channels
= 0
;
+ unsigned int _audio_block_size
= 1024
;
+ bool _playing
= false
;
+ int _suspended
= 0
;
std::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
mutable boost::mutex _latency_history_mutex;
std::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
mutable boost::mutex _latency_history_mutex;
- int _latency_history_count;
+ int _latency_history_count
= 0
;
boost::optional<int> _dcp_decode_reduction;
boost::optional<int> _dcp_decode_reduction;
- ClosedCaptionsDialog* _closed_captions_dialog;
+ /** true to assume that this viewer is only being used for JPEG2000 sources
+ * so it can optimise accordingly.
+ */
+ bool _optimise_for_j2k = false;
+
+ ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
- bool _outline_content;
- boost::optional<dcpomatic::Rect<double>
> _outline_subtitles;
+ bool _outline_content
= false
;
+ boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
- bool _pad_black;
+ bool _pad_black
= false
;
/** true if an get() is required next time we are idle */
/** true if an get() is required next time we are idle */
- bool _idle_get;
+ bool _idle_get
= false
;
boost::signals2::scoped_connection _config_changed_connection;
};
boost::signals2::scoped_connection _config_changed_connection;
};