projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.cc
diff --git
a/src/lib/audio_buffers.cc
b/src/lib/audio_buffers.cc
index 4c3c2d4a7a20515b8f58d4acbf17d1feb18b2039..2ab8e187e3a32f9c3566a669990899cb2caf5649 100644
(file)
--- a/
src/lib/audio_buffers.cc
+++ b/
src/lib/audio_buffers.cc
@@
-20,7
+20,6
@@
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
-#include <boost/make_shared.hpp>
#include <cassert>
#include <cstring>
#include <cmath>
#include <cassert>
#include <cstring>
#include <cmath>
@@
-28,7
+27,6
@@
using std::bad_alloc;
using boost::shared_ptr;
using std::bad_alloc;
using boost::shared_ptr;
-using boost::make_shared;
/** Construct an AudioBuffers. Audio data is undefined after this constructor.
* @param channels Number of channels.
/** Construct an AudioBuffers. Audio data is undefined after this constructor.
* @param channels Number of channels.
@@
-307,7
+305,7
@@
AudioBuffers::apply_gain (float dB)
shared_ptr<AudioBuffers>
AudioBuffers::channel (int c) const
{
shared_ptr<AudioBuffers>
AudioBuffers::channel (int c) const
{
- shared_ptr<AudioBuffers> o
= make_shared<AudioBuffers> (1, frames (
));
+ shared_ptr<AudioBuffers> o
(new AudioBuffers (1, frames ()
));
o->copy_channel_from (this, c, 0);
return o;
}
o->copy_channel_from (this, c, 0);
return o;
}
@@
-322,7
+320,7
@@
AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, in
shared_ptr<AudioBuffers>
AudioBuffers::clone () const
{
shared_ptr<AudioBuffers>
AudioBuffers::clone () const
{
- shared_ptr<AudioBuffers> b
= make_shared<AudioBuffers> (channels (), frames (
));
+ shared_ptr<AudioBuffers> b
(new AudioBuffers (channels (), frames ()
));
b->copy_from (this, frames (), 0, 0);
return b;
}
b->copy_from (this, frames (), 0, 0);
return b;
}