projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
subrip_content.cc
diff --git
a/src/lib/subrip_content.cc
b/src/lib/subrip_content.cc
index 79a1d49999acf8849fb007a68e0188ad29d81dff..f4dd427f347f220a3b7954c32af852ddb991259c 100644
(file)
--- a/
src/lib/subrip_content.cc
+++ b/
src/lib/subrip_content.cc
@@
-19,12
+19,20
@@
#include "subrip_content.h"
#include "util.h"
#include "subrip_content.h"
#include "util.h"
+#include "subrip.h"
+#include "film.h"
+#include "font.h"
+#include <dcp/raw_convert.h>
#include "i18n.h"
#include "i18n.h"
-using std::stringstream;
using std::string;
using std::string;
+using std::cout;
+using dcp::raw_convert;
using boost::shared_ptr;
using boost::shared_ptr;
+using boost::lexical_cast;
+
+std::string const SubRipContent::font_id = "font";
SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
@@
-33,17
+41,28
@@
SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
}
}
-SubRipContent::SubRipContent (shared_ptr<const Film> film,
shared_ptr<const cxml::Node>
node, int version)
+SubRipContent::SubRipContent (shared_ptr<const Film> film,
cxml::ConstNodePtr
node, int version)
: Content (film, node)
: Content (film, node)
- , SubtitleContent (film, node)
+ , SubtitleContent (film, node, version)
+ , _length (node->number_child<DCPTime::Type> ("Length"))
{
}
void
{
}
void
-SubRipContent::examine (boost::shared_ptr<Job>)
+SubRipContent::examine (boost::shared_ptr<Job>
job, bool calculate_digest
)
{
{
+ Content::examine (job, calculate_digest);
+ SubRip s (shared_from_this ());
+
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+
+ DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+ boost::mutex::scoped_lock lm (_mutex);
+ _length = len;
+ _fonts.push_back (shared_ptr<Font> (new Font (font_id)));
}
string
}
string
@@
-65,29
+84,19
@@
SubRipContent::information () const
}
void
}
void
-SubRipContent::as_xml (xmlpp::Node* node)
+SubRipContent::as_xml (xmlpp::Node* node)
const
{
node->add_child("Type")->add_child_text ("SubRip");
Content::as_xml (node);
SubtitleContent::as_xml (node);
{
node->add_child("Type")->add_child_text ("SubRip");
Content::as_xml (node);
SubtitleContent::as_xml (node);
+ node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
}
}
-Time
+
DCP
Time
SubRipContent::full_length () const
{
SubRipContent::full_length () const
{
-
+ /* XXX: this assumes that the timing of the SubRip file is appropriate
+ for the DCP's frame rate.
+ */
+ return _length;
}
}
-
-string
-SubRipContent::identifier () const
-{
- LocaleGuard lg;
-
- stringstream s;
- s << Content::identifier()
- << "_" << subtitle_scale()
- << "_" << subtitle_offset();
-
- return s.str ();
-}
-