projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
libs
/
ardour
/
audio_buffer.cc
diff --git
a/libs/ardour/audio_buffer.cc
b/libs/ardour/audio_buffer.cc
index aa4f64755aeb9399d31e402b8703eae2dd1a4d1d..89e210c7728a7c323e8bc3940264a71fcae6c2fd 100644
(file)
--- a/
libs/ardour/audio_buffer.cc
+++ b/
libs/ardour/audio_buffer.cc
@@
-22,7
+22,7
@@
#include "pbd/error.h"
#include "pbd/malign.h"
#include "pbd/error.h"
#include "pbd/malign.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
@@
-43,7
+43,7
@@
AudioBuffer::AudioBuffer(size_t capacity)
AudioBuffer::~AudioBuffer()
{
if (_owns_data)
AudioBuffer::~AudioBuffer()
{
if (_owns_data)
- free(_data);
+
cache_aligned_
free(_data);
}
void
}
void
@@
-57,28
+57,21
@@
AudioBuffer::resize (size_t size)
if (_data && size < _capacity) {
/* buffer is already large enough */
if (_data && size < _capacity) {
/* buffer is already large enough */
-
- if (size < _size) {
- /* truncate */
- _size = size;
- }
-
return;
}
return;
}
- free (_data);
+
cache_aligned_
free (_data);
cache_aligned_malloc ((void**) &_data, sizeof (Sample) * size);
_capacity = size;
cache_aligned_malloc ((void**) &_data, sizeof (Sample) * size);
_capacity = size;
- _size = 0;
_silent = false;
}
bool
_silent = false;
}
bool
-AudioBuffer::check_silence (pframes_t nframes,
bool wholebuffer,
pframes_t& n) const
+AudioBuffer::check_silence (pframes_t nframes, pframes_t& n) const
{
{
- for (n = 0;
(wholebuffer || n < _size) &&
n < nframes; ++n) {
+ for (n = 0; n < nframes; ++n) {
if (_data[n] != Sample (0)) {
return false;
}
if (_data[n] != Sample (0)) {
return false;
}