projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted image subtitle fixes.
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index 9b2aa8ab04198f8108606474897c2445973dfc93..ac9a67e33f18405eb0704cc63c587f3fc866f379 100644
(file)
--- a/
src/lib/subtitle_decoder.cc
+++ b/
src/lib/subtitle_decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,7
+33,8
@@
SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
}
/** Called by subclasses when an image subtitle is ready.
}
/** Called by subclasses when an image subtitle is ready.
- * Image may be 0 to say that there is no current subtitle.
+ * @param period Period of the subtitle.
+ * @param image Subtitle image.
* @param rect Area expressed as a fraction of the video frame that this subtitle
* is for (e.g. a width of 0.5 means the width of the subtitle is half the width
* of the video frame)
* @param rect Area expressed as a fraction of the video frame that this subtitle
* is for (e.g. a width of 0.5 means the width of the subtitle is half the width
* of the video frame)
@@
-50,12
+51,11
@@
SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
_decoded_text_subtitles.push_back (ContentTextSubtitle (s));
}
_decoded_text_subtitles.push_back (ContentTextSubtitle (s));
}
+/** @param sp Full periods of subtitles that are showing or starting during the specified period */
template <class T>
list<T>
template <class T>
list<T>
-SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool starting)
+SubtitleDecoder::get (list<T> const & subs,
list<ContentTimePeriod> const & sp,
ContentTimePeriod period, bool starting)
{
{
- /* Get the full periods of the subtitles that are showing or starting during the specified period */
- list<ContentTimePeriod> sp = subtitles_during (period, starting);
if (sp.empty ()) {
/* Nothing in this period */
return list<T> ();
if (sp.empty ()) {
/* Nothing in this period */
return list<T> ();
@@
-88,13
+88,13
@@
SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool start
list<ContentTextSubtitle>
SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
{
list<ContentTextSubtitle>
SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
{
- return get<ContentTextSubtitle> (_decoded_text_subtitles, period, starting);
+ return get<ContentTextSubtitle> (_decoded_text_subtitles,
text_subtitles_during (period, starting),
period, starting);
}
list<ContentImageSubtitle>
SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
{
}
list<ContentImageSubtitle>
SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
{
- return get<ContentImageSubtitle> (_decoded_image_subtitles, period, starting);
+ return get<ContentImageSubtitle> (_decoded_image_subtitles,
image_subtitles_during (period, starting),
period, starting);
}
void
}
void