projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[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 e2c9c5b1854747d5703a7037655c24f050dac211..f3c55b208db152bd866eed8a44f550ff2c20c957 100644
(file)
--- a/
src/lib/analyse_audio_job.cc
+++ b/
src/lib/analyse_audio_job.cc
@@
-21,7
+21,7
@@
#include "analyse_audio_job.h"
#include "compose.hpp"
#include "film.h"
#include "analyse_audio_job.h"
#include "compose.hpp"
#include "film.h"
-#include "play
list
.h"
+#include "play
er
.h"
#include "i18n.h"
#include "i18n.h"
@@
-57,8
+57,8
@@
AnalyseAudioJob::run ()
_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
- _current.resize (
_film->audio_channels ()
);
- _analysis.reset (new AudioAnalysis (
_film->audio_channels()
));
+ _current.resize (
MAX_AUDIO_CHANNELS
);
+ _analysis.reset (new AudioAnalysis (
MAX_AUDIO_CHANNELS
));
while (!player->pass()) {
set_progress (float (_done) / _film->audio_length ());
while (!player->pass()) {
set_progress (float (_done) / _film->audio_length ());
@@
-71,7
+71,7
@@
AnalyseAudioJob::run ()
}
void
}
void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<
const
AudioBuffers> b)
{
for (int i = 0; i < b->frames(); ++i) {
for (int j = 0; j < b->channels(); ++j) {
{
for (int i = 0; i < b->frames(); ++i) {
for (int j = 0; j < b->channels(); ++j) {