projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
[dcpomatic.git]
/
src
/
lib
/
subrip_content.cc
diff --git
a/src/lib/subrip_content.cc
b/src/lib/subrip_content.cc
index bf034200d366cd532b09bfc5150e948fbc98a560..7a336f88af632d3770eeed3beb3f9cd82b0915e7 100644
(file)
--- a/
src/lib/subrip_content.cc
+++ b/
src/lib/subrip_content.cc
@@
-21,12
+21,13
@@
#include "util.h"
#include "subrip.h"
#include "film.h"
#include "util.h"
#include "subrip.h"
#include "film.h"
+#include <dcp/raw_convert.h>
#include "i18n.h"
#include "i18n.h"
-using std::stringstream;
using std::string;
using std::cout;
using std::string;
using std::cout;
+using dcp::raw_convert;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::shared_ptr;
using boost::lexical_cast;
@@
-37,22
+38,27
@@
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)
, SubtitleContent (film, node, version)
: Content (film, node)
, SubtitleContent (film, node, version)
- , _length (node->number_child<
int64_t
> ("Length"))
+ , _length (node->number_child<
DCPTime::Type
> ("Length"))
{
}
void
{
}
void
-SubRipContent::examine (boost::shared_ptr<Job> job)
+SubRipContent::examine (boost::shared_ptr<Job> job
, bool calculate_digest
)
{
{
- Content::examine (job);
+ Content::examine (job
, calculate_digest
);
SubRip s (shared_from_this ());
SubRip s (shared_from_this ());
- boost::mutex::scoped_lock lm (_mutex);
+
shared_ptr<const Film> film = _film.lock ();
shared_ptr<const Film> film = _film.lock ();
- _length = DCPTime (s.length (), film->active_frame_rate_change (position ()));
+ assert (film);
+
+ DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+
+ boost::mutex::scoped_lock lm (_mutex);
+ _length = len;
}
string
}
string
@@
-70,18
+76,16
@@
SubRipContent::technical_summary () const
string
SubRipContent::information () const
{
string
SubRipContent::information () const
{
-
+
}
void
SubRipContent::as_xml (xmlpp::Node* node) const
{
}
void
SubRipContent::as_xml (xmlpp::Node* node) const
{
- LocaleGuard lg;
-
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 (
lexical_cas
t<string> (_length.get ()));
+ node->add_child("Length")->add_child_text (
raw_conver
t<string> (_length.get ()));
}
DCPTime
}
DCPTime
@@
-92,17
+96,3
@@
SubRipContent::full_length () const
*/
return _length;
}
*/
return _length;
}
-
-string
-SubRipContent::identifier () const
-{
- LocaleGuard lg;
-
- stringstream s;
- s << Content::identifier()
- << "_" << subtitle_scale()
- << "_" << subtitle_x_offset()
- << "_" << subtitle_y_offset();
-
- return s.str ();
-}