projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore old behaviour of "no-stretch" mode with crop.
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index 0ffe5e50158e1a70a9bf242b8dc43b3b00c07a1a..c06f3d718a812e9403266e3ccf91f5c494fa69b8 100644
(file)
--- a/
src/lib/subtitle_decoder.cc
+++ b/
src/lib/subtitle_decoder.cc
@@
-19,7
+19,6
@@
#include <boost/shared_ptr.hpp>
#include "subtitle_decoder.h"
#include <boost/shared_ptr.hpp>
#include "subtitle_decoder.h"
-#include "subtitle.h"
using boost::shared_ptr;
using boost::shared_ptr;
@@
-31,11
+30,10
@@
SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
/** Called by subclasses when a subtitle is ready.
/** Called by subclasses when a subtitle is ready.
- * s may be 0 to say that there is no current subtitle.
- * @param s New current subtitle, or 0.
+ * Image may be 0 to say that there is no current subtitle.
*/
void
*/
void
-SubtitleDecoder::subtitle (shared_ptr<
TimedSubtitle> s
)
+SubtitleDecoder::subtitle (shared_ptr<
Image> image, dcpomatic::Rect<double> rect, Time from, Time to
)
{
{
- Subtitle (
s
);
+ Subtitle (
image, rect, from, to
);
}
}