projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add channel_count() to audio source API
[ardour.git]
/
libs
/
ardour
/
thread_buffers.cc
diff --git
a/libs/ardour/thread_buffers.cc
b/libs/ardour/thread_buffers.cc
index fd3160bb15a81933b4dc291d084631f2bd571ca4..2336ee50bc866327ce802a8323788e59d2a0092d 100644
(file)
--- a/
libs/ardour/thread_buffers.cc
+++ b/
libs/ardour/thread_buffers.cc
@@
-33,6
+33,7
@@
ThreadBuffers::ThreadBuffers ()
, route_buffers (new BufferSet)
, mix_buffers (new BufferSet)
, gain_automation_buffer (0)
, route_buffers (new BufferSet)
, mix_buffers (new BufferSet)
, gain_automation_buffer (0)
+ , trim_automation_buffer (0)
, send_gain_automation_buffer (0)
, pan_automation_buffer (0)
, npan_buffers (0)
, send_gain_automation_buffer (0)
, pan_automation_buffer (0)
, npan_buffers (0)
@@
-40,7
+41,7
@@
ThreadBuffers::ThreadBuffers ()
}
void
}
void
-ThreadBuffers::ensure_buffers (ChanCount howmany)
+ThreadBuffers::ensure_buffers (ChanCount howmany
, size_t custom
)
{
// std::cerr << "ThreadBuffers " << this << " resize buffers with count = " << howmany << std::endl;
{
// std::cerr << "ThreadBuffers " << this << " resize buffers with count = " << howmany << std::endl;
@@
-60,7
+61,14
@@
ThreadBuffers::ensure_buffers (ChanCount howmany)
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
size_t count = std::max (scratch_buffers->available().get(*t), howmany.get(*t));
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
size_t count = std::max (scratch_buffers->available().get(*t), howmany.get(*t));
- size_t size = _engine->raw_buffer_size (*t);
+ size_t size;
+ if (custom > 0) {
+ size = custom;
+ } else {
+ size = (*t == DataType::MIDI)
+ ? _engine->raw_buffer_size (*t)
+ : _engine->raw_buffer_size (*t) / sizeof (Sample);
+ }
scratch_buffers->ensure_buffers (*t, count, size);
mix_buffers->ensure_buffers (*t, count, size);
scratch_buffers->ensure_buffers (*t, count, size);
mix_buffers->ensure_buffers (*t, count, size);
@@
-68,12
+76,16
@@
ThreadBuffers::ensure_buffers (ChanCount howmany)
route_buffers->ensure_buffers (*t, count, size);
}
route_buffers->ensure_buffers (*t, count, size);
}
+ size_t audio_buffer_size = custom > 0 ? custom : _engine->raw_buffer_size (DataType::AUDIO) / sizeof (Sample);
+
delete [] gain_automation_buffer;
delete [] gain_automation_buffer;
- gain_automation_buffer = new gain_t[_engine->raw_buffer_size (DataType::AUDIO)];
+ gain_automation_buffer = new gain_t[audio_buffer_size];
+ delete [] trim_automation_buffer;
+ trim_automation_buffer = new gain_t[audio_buffer_size];
delete [] send_gain_automation_buffer;
delete [] send_gain_automation_buffer;
- send_gain_automation_buffer = new gain_t[
_engine->raw_buffer_size (DataType::AUDIO)
];
+ send_gain_automation_buffer = new gain_t[
audio_buffer_size
];
- allocate_pan_automation_buffers (
_engine->raw_buffer_size (DataType::AUDIO)
, howmany.n_audio(), false);
+ allocate_pan_automation_buffers (
audio_buffer_size
, howmany.n_audio(), false);
}
void
}
void