diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 15:53:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 15:53:05 +0100 |
| commit | 4d54b053b6e9565e026554b1dba31d73a1b492ae (patch) | |
| tree | 152f5c4cb1cee20c6070c533e67b4fdb2f402944 /src/lib | |
| parent | 194615b5f673214b1e4fc4211364f95eeb96af15 (diff) | |
Put times in subtitle view.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/frame_rate_change.cc | 6 | ||||
| -rw-r--r-- | src/lib/frame_rate_change.h | 3 | ||||
| -rw-r--r-- | src/lib/playlist.cc | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc index 3e9c4b505..454938ada 100644 --- a/src/lib/frame_rate_change.cc +++ b/src/lib/frame_rate_change.cc @@ -51,8 +51,10 @@ about_equal (float a, float b) } -FrameRateChange::FrameRateChange (float source, int dcp) - : skip (false) +FrameRateChange::FrameRateChange (float source_, int dcp_) + : source (source_) + , dcp (dcp_) + , skip (false) , repeat (1) , change_speed (false) { diff --git a/src/lib/frame_rate_change.h b/src/lib/frame_rate_change.h index 92af0ec01..f53adc059 100644 --- a/src/lib/frame_rate_change.h +++ b/src/lib/frame_rate_change.h @@ -37,6 +37,9 @@ struct FrameRateChange return repeat; } + float source; + int dcp; + /** true to skip every other frame */ bool skip; /** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */ diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 41ed00b24..e555db9ba 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -194,6 +194,11 @@ Playlist::has_subtitles () const if (fc && !fc->subtitle_streams().empty()) { return true; } + + shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (*i); + if (sc) { + return true; + } } return false; |