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 c60b05d50a1ede29617d30ae2c8733593546b190..7a336f88af632d3770eeed3beb3f9cd82b0915e7 100644
(file)
--- a/
src/lib/subrip_content.cc
+++ b/
src/lib/subrip_content.cc
@@
-25,7
+25,6
@@
#include "i18n.h"
#include "i18n.h"
-using std::stringstream;
using std::string;
using std::cout;
using dcp::raw_convert;
using std::string;
using std::cout;
using dcp::raw_convert;
@@
-48,9
+47,9
@@
SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
}
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 ());
shared_ptr<const Film> film = _film.lock ();
SubRip s (shared_from_this ());
shared_ptr<const Film> film = _film.lock ();