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
/
sndfile_content.cc
diff --git
a/src/lib/sndfile_content.cc
b/src/lib/sndfile_content.cc
index a573d43c407f8ac8a825190a1784600ba37ac873..cdc9734bffcad0fe1d561ecdd1df6e6c68df19c7 100644
(file)
--- a/
src/lib/sndfile_content.cc
+++ b/
src/lib/sndfile_content.cc
@@
-25,11
+25,11
@@
#include "compose.hpp"
#include "job.h"
#include "util.h"
#include "compose.hpp"
#include "job.h"
#include "util.h"
+#include "safe_stringstream.h"
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
-using std::stringstream;
using std::cout;
using boost::shared_ptr;
using dcp::raw_convert;
using std::cout;
using boost::shared_ptr;
using dcp::raw_convert;
@@
-79,7
+79,7
@@
SndfileContent::information () const
return "";
}
return "";
}
-
strings
tream s;
+
SafeStringS
tream s;
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
s << String::compose (
_("%1 channels, %2kHz, %3 samples"),
@@
-101,10
+101,10
@@
SndfileContent::valid_file (boost::filesystem::path f)
}
void
}
void
-SndfileContent::examine (shared_ptr<Job> job)
+SndfileContent::examine (shared_ptr<Job> job
, bool calculate_digest
)
{
job->set_progress_unknown ();
{
job->set_progress_unknown ();
- Content::examine (job);
+ Content::examine (job
, calculate_digest
);
shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
take_from_audio_examiner (dec);
}
shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
take_from_audio_examiner (dec);
}