projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fr_FR tweaks from Lilian.
[dcpomatic.git]
/
src
/
lib
/
subtitle.cc
diff --git
a/src/lib/subtitle.cc
b/src/lib/subtitle.cc
index c52d3ac664891576a1cced625da24bc678001f73..5c1ad97064fd1042450b99638d21de8a62f049b5 100644
(file)
--- a/
src/lib/subtitle.cc
+++ b/
src/lib/subtitle.cc
@@
-25,8
+25,11
@@
#include "image.h"
#include "exceptions.h"
#include "image.h"
#include "exceptions.h"
+#include "i18n.h"
+
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
+using libdcp::Size;
/** Construct a TimedSubtitle. This is a subtitle image, position,
* and a range of time over which it should be shown.
/** Construct a TimedSubtitle. This is a subtitle image, position,
* and a range of time over which it should be shown.
@@
-34,7
+37,7
@@
using namespace boost;
*/
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
{
*/
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
{
- assert (sub.rects > 0);
+ assert (sub.
num_
rects > 0);
/* Subtitle PTS in seconds (within the source, not taking into account any of the
source that we may have chopped off for the DCP)
/* Subtitle PTS in seconds (within the source, not taking into account any of the
source that we may have chopped off for the DCP)
@@
-46,16
+49,16
@@
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
_to = packet_time + (double (sub.end_display_time) / 1e3);
if (sub.num_rects > 1) {
_to = packet_time + (double (sub.end_display_time) / 1e3);
if (sub.num_rects > 1) {
- throw DecodeError (
"multi-part subtitles not yet supported"
);
+ throw DecodeError (
_("multi-part subtitles not yet supported")
);
}
AVSubtitleRect const * rect = sub.rects[0];
if (rect->type != SUBTITLE_BITMAP) {
}
AVSubtitleRect const * rect = sub.rects[0];
if (rect->type != SUBTITLE_BITMAP) {
- throw DecodeError (
"non-bitmap subtitles not yet supported"
);
+ throw DecodeError (
_("non-bitmap subtitles not yet supported")
);
}
}
- shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h), true));
+ shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA,
libdcp::
Size (rect->w, rect->h), true));
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
@@
-133,8
+136,8
@@
subtitle_transformed_area (
* Combining these two translations gives these expressions.
*/
* Combining these two translations gives these expressions.
*/
- tx.x =
target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2
));
- tx.y =
target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2
));
+ tx.x =
rint (target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2)
));
+ tx.y =
rint (target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2)
));
return tx;
}
return tx;
}