#include "util.h"
#include "subrip.h"
#include "film.h"
+#include <dcp/raw_convert.h>
#include "i18n.h"
-using std::stringstream;
using std::string;
using std::cout;
+using dcp::raw_convert;
using boost::shared_ptr;
using boost::lexical_cast;
}
-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)
- , _length (node->number_child<int64_t> ("Length"))
+ , _length (node->number_child<DCPTime::Type> ("Length"))
{
}
{
Content::examine (job);
SubRip s (shared_from_this ());
- boost::mutex::scoped_lock lm (_mutex);
+
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
SubRipContent::information () 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("Length")->add_child_text (lexical_cast<string> (_length.get ()));
+ node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
}
DCPTime
*/
return _length;
}
-
-string
-SubRipContent::identifier () const
-{
- LocaleGuard lg;
-
- stringstream s;
- s << Content::identifier()
- << "_" << subtitle_scale()
- << "_" << subtitle_x_offset()
- << "_" << subtitle_y_offset();
-
- return s.str ();
-}