diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-25 11:58:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-25 13:36:17 +0100 |
| commit | 89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac (patch) | |
| tree | 5a1d1b3e1e6fc4d280f1ff0f1598a37e0fea3257 /src/lib/player_video.h | |
| parent | e08c1d30bb5e2d77339541eb7dbe7d1ca95485ab (diff) | |
Make player decide whether subtitles should be burnt based on
content settings rather than using the film's settings. Remove
film property of burn-subtitles.
Diffstat (limited to 'src/lib/player_video.h')
| -rw-r--r-- | src/lib/player_video.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 50c27bebe..0dcc2eeec 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -54,10 +54,10 @@ public: void set_subtitle (PositionImage); - boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle, dcp::NoteHandler note) const; + boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, dcp::NoteHandler note) const; - void add_metadata (xmlpp::Node* node, bool send_subtitles) const; - void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const; + void add_metadata (xmlpp::Node* node) const; + void send_binary (boost::shared_ptr<Socket> socket) const; bool has_j2k () const; Data j2k () const; |