projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
audio_analyser.cc
diff --git
a/src/lib/audio_analyser.cc
b/src/lib/audio_analyser.cc
index 53d764a9b58dfbe55083719760e17f4a5db96334..c9fc2118c13276c0f78e810c6bb52bf53b20dd3f 100644
(file)
--- a/
src/lib/audio_analyser.cc
+++ b/
src/lib/audio_analyser.cc
@@
-31,15
+31,15
@@
#include "filter.h"
#include "playlist.h"
#include "types.h"
#include "filter.h"
#include "playlist.h"
#include "types.h"
-#include
"warnings.h"
+#include
<dcp/warnings.h>
extern "C" {
#include <leqm_nrt.h>
extern "C" {
#include <leqm_nrt.h>
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
#include <libavutil/channel_layout.h>
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
#include <libavfilter/f_ebur128.h>
#endif
#include <libavutil/channel_layout.h>
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
#include <libavfilter/f_ebur128.h>
#endif
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
}
}
@@
-134,7
+134,7
@@
AudioAnalyser::~AudioAnalyser ()
void
void
-AudioAnalyser::analyse (shared_ptr<
const
AudioBuffers> b, DCPTime time)
+AudioAnalyser::analyse (shared_ptr<AudioBuffers> b, DCPTime time)
{
LOG_DEBUG_AUDIO_ANALYSIS("Received %1 frames at %2", b->frames(), to_string(time));
DCPOMATIC_ASSERT (time >= _start);
{
LOG_DEBUG_AUDIO_ANALYSIS("Received %1 frames at %2", b->frames(), to_string(time));
DCPOMATIC_ASSERT (time >= _start);
@@
-150,7
+150,7
@@
AudioAnalyser::analyse (shared_ptr<const AudioBuffers> b, DCPTime time)
vector<double> interleaved(frames * channels);
for (int j = 0; j < channels; ++j) {
vector<double> interleaved(frames * channels);
for (int j = 0; j < channels; ++j) {
- float* data = b->data(j);
+ float
const
* data = b->data(j);
for (int i = 0; i < frames; ++i) {
float s = data[i];
for (int i = 0; i < frames; ++i) {
float s = data[i];