projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.cc
diff --git
a/src/lib/audio_buffers.cc
b/src/lib/audio_buffers.cc
index 0e31793ea2d7634035343fb2245e562af442b9a0..9b88827f7af816252ec0bb7e6f23b788acccebae 100644
(file)
--- a/
src/lib/audio_buffers.cc
+++ b/
src/lib/audio_buffers.cc
@@
-22,7
+22,7
@@
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include "maths_util.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include "maths_util.h"
-#include
"scope_guard.h"
+#include
<dcp/scope_guard.h>
#include <cassert>
#include <cstring>
#include <cmath>
#include <cassert>
#include <cstring>
#include <cmath>
@@
-83,7
+83,7
@@
AudioBuffers::allocate (int channels, int frames)
DCPOMATIC_ASSERT (frames >= 0);
DCPOMATIC_ASSERT(frames == 0 || channels > 0);
DCPOMATIC_ASSERT (frames >= 0);
DCPOMATIC_ASSERT(frames == 0 || channels > 0);
- ScopeGuard sg = [this]() { update_data_pointers(); };
+
dcp::
ScopeGuard sg = [this]() { update_data_pointers(); };
_data.resize(channels);
for (int channel = 0; channel < channels; ++channel) {
_data.resize(channels);
for (int channel = 0; channel < channels; ++channel) {
@@
-344,7
+344,7
@@
AudioBuffers::set_channels(int new_channels)
{
DCPOMATIC_ASSERT(new_channels > 0);
{
DCPOMATIC_ASSERT(new_channels > 0);
- ScopeGuard sg = [this]() { update_data_pointers(); };
+
dcp::
ScopeGuard sg = [this]() { update_data_pointers(); };
int const old_channels = channels();
_data.resize(new_channels);
int const old_channels = channels();
_data.resize(new_channels);