projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lots of #include <iostream>s for Arch.
[dcpomatic.git]
/
src
/
lib
/
subrip_content.cc
diff --git
a/src/lib/subrip_content.cc
b/src/lib/subrip_content.cc
index 8becbc4d03b6905d53493c6139ba83823a006462..0d1bd748db3c1a9a075e9aa841577f69df2198b4 100644
(file)
--- a/
src/lib/subrip_content.cc
+++ b/
src/lib/subrip_content.cc
@@
-23,6
+23,8
@@
#include "film.h"
#include "font.h"
#include "raw_convert.h"
#include "film.h"
#include "font.h"
#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-56,7
+58,7
@@
SubRipContent::examine (boost::shared_ptr<Job> job)
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
-
+
DCPTime len (s.length (), film->active_frame_rate_change (position ()));
/* Default to turning these subtitles on */
DCPTime len (s.length (), film->active_frame_rate_change (position ()));
/* Default to turning these subtitles on */
@@
-64,7
+66,7
@@
SubRipContent::examine (boost::shared_ptr<Job> job)
boost::mutex::scoped_lock lm (_mutex);
_length = len;
boost::mutex::scoped_lock lm (_mutex);
_length = len;
-
_fonts.push_back
(shared_ptr<Font> (new Font (font_id)));
+
add_font
(shared_ptr<Font> (new Font (font_id)));
}
string
}
string