diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-01 15:59:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-03 01:32:02 +0100 |
| commit | a5e1a485a825a0967142fae98488fc79e345cb4a (patch) | |
| tree | 2090ae41469158ed73cbc5d52cf3c7be8aa2c9ed /src/lib/player.h | |
| parent | 0ae77cead48b7d6e94b3913e40254826dfe43277 (diff) | |
Fix subtitles being written with negative times when trimmed (#2965).
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 5148ad3a1..8922741bd 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -177,8 +177,11 @@ private: boost::optional<PositionImage> open_texts_for_frame(dcpomatic::DCPTime time) const; void emit_video(std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time); void use_video(std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time, dcpomatic::DCPTime end); - void emit_audio(std::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time); - std::shared_ptr<const Playlist> playlist() const; + void emit_audio (std::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time); + std::shared_ptr<const Playlist> playlist () const; + boost::optional<dcpomatic::DCPTime> should_store( + std::weak_ptr<Piece> weak_piece, std::weak_ptr<const TextContent> weak_content, dcpomatic::ContentTime subtitle_from + ) const; /** Mutex to protect the most of the Player state. When it's used for the preview we have seek() and pass() called from the Butler thread and lots of other stuff called |