projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2095bd0
)
Display subtitles in player.
author
Carl Hetherington
<cth@carlh.net>
Mon, 21 Aug 2017 21:58:38 +0000
(22:58 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 21 Aug 2017 21:58:38 +0000
(22:58 +0100)
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 959b5709cac5b13be4ae5b4666827ee0daddb7d8..70ff051ab39667cf99396aac17e2c9ee6b119948 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-28,6
+28,7
@@
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/video_content.h"
+#include "lib/subtitle_content.h"
#include "wx/wx_signal_manager.h"
#include "wx/wx_util.h"
#include "wx/about_dialog.h"
@@
-154,6
+155,10
@@
public:
return;
}
+ if (dcp->subtitle) {
+ dcp->subtitle->set_use (true);
+ }
+
_viewer->set_film (_film);
_info->triggered_update ();
}