projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting tweaks to unmount dialogue.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index bb59122aaff0605f5c46b89625ffe607950b2f2c..bb483f0e235c98cace1283c627bf0957f893ad4c 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-164,7
+164,7
@@
FilmViewer::set_film (shared_ptr<Film> film)
}
try {
}
try {
- _player.reset (new Player(_film
, _film->playlist(), _film->length()
));
+ _player.reset (new Player(_film));
_player->set_fast ();
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
_player->set_fast ();
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
@@
-233,6
+233,15
@@
FilmViewer::set_outline_content (bool o)
_video_view->update ();
}
_video_view->update ();
}
+
+void
+FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double> > rect)
+{
+ _outline_subtitles = rect;
+ _video_view->update ();
+}
+
+
void
FilmViewer::set_eyes (Eyes e)
{
void
FilmViewer::set_eyes (Eyes e)
{
@@
-406,7
+415,6
@@
void
FilmViewer::film_length_change ()
{
_video_view->set_length (_film->length());
FilmViewer::film_length_change ()
{
_video_view->set_length (_film->length());
- _player->set_playback_length (_film->length());
}
/** Re-get the current frame slowly by seeking */
}
/** Re-get the current frame slowly by seeking */