projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some left-over JSON bits.
[dcpomatic.git]
/
src
/
lib
/
analyse_audio_job.cc
diff --git
a/src/lib/analyse_audio_job.cc
b/src/lib/analyse_audio_job.cc
index 9a911669095bdfba9cbb3f31262c7d01f733b6cf..8186f9de49b9d89baa81c04d7f454f876b8de963 100644
(file)
--- a/
src/lib/analyse_audio_job.cc
+++ b/
src/lib/analyse_audio_job.cc
@@
-45,12
+45,7
@@
AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioCont
string
AnalyseAudioJob::name () const
{
string
AnalyseAudioJob::name () const
{
- shared_ptr<AudioContent> content = _content.lock ();
- if (!content) {
- return "";
- }
-
- return String::compose (_("Analyse audio of %1"), content->file().filename());
+ return _("Analyse audio");
}
void
}
void
@@
-68,14
+63,15
@@
AnalyseAudioJob::run ()
player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2));
player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2));
- _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length
_without_loop
()) / _num_points);
+ _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
- _current.resize (_film->
dcp_
audio_channels ());
- _analysis.reset (new AudioAnalysis (_film->
dcp_
audio_channels ()));
+ _current.resize (_film->audio_channels ());
+ _analysis.reset (new AudioAnalysis (_film->audio_channels ()));
_done = 0;
_done = 0;
+ OutputAudioFrame const len = _film->time_to_audio_frames (_film->length ());
while (!player->pass ()) {
while (!player->pass ()) {
- set_progress (double (_
film->audio_frames_to_time (_done)) / _film->length_without_loop ()
);
+ set_progress (double (_
done) / len
);
}
_analysis->write (content->audio_analysis_path ());
}
_analysis->write (content->audio_analysis_path ());