projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set owner or disk-i/o processors
[ardour.git]
/
libs
/
ardour
/
buffer_set.cc
diff --git
a/libs/ardour/buffer_set.cc
b/libs/ardour/buffer_set.cc
index 243c6777542e018c252d035d6162ad48b575109f..54eb7fe62b1736cd9ced67821758c1710c4a5b34 100644
(file)
--- a/
libs/ardour/buffer_set.cc
+++ b/
libs/ardour/buffer_set.cc
@@
-128,7
+128,7
@@
BufferSet::attach_buffers (PortSet& ports)
* the process() callback tree anyway, so this has to be called in RT context.
*/
void
* the process() callback tree anyway, so this has to be called in RT context.
*/
void
-BufferSet::get_backend_port_addresses (PortSet& ports,
fram
ecnt_t nframes)
+BufferSet::get_backend_port_addresses (PortSet& ports,
sampl
ecnt_t nframes)
{
assert (_count == ports.count ());
assert (_available == ports.count ());
{
assert (_count == ports.count ());
assert (_available == ports.count ());
@@
-302,11
+302,11
@@
BufferSet::forward_lv2_midi(LV2_Evbuf* buf, size_t i, bool purge_ardour_buffer)
for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(buf);
lv2_evbuf_is_valid(i);
i = lv2_evbuf_next(i)) {
for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(buf);
lv2_evbuf_is_valid(i);
i = lv2_evbuf_next(i)) {
- uint32_t
fram
es, subframes, type, size;
+ uint32_t
sampl
es, subframes, type, size;
uint8_t* data;
uint8_t* data;
- lv2_evbuf_get(i, &
fram
es, &subframes, &type, &size, &data);
+ lv2_evbuf_get(i, &
sampl
es, &subframes, &type, &size, &data);
if (type == URIMap::instance().urids.midi_MidiEvent) {
if (type == URIMap::instance().urids.midi_MidiEvent) {
- mbuf.push_back(
fram
es, size, data);
+ mbuf.push_back(
sampl
es, size, data);
}
}
}
}
}
}
@@
-322,12
+322,12
@@
BufferSet::flush_lv2_midi(bool input, size_t i)
for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(evbuf);
lv2_evbuf_is_valid(i);
i = lv2_evbuf_next(i)) {
for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(evbuf);
lv2_evbuf_is_valid(i);
i = lv2_evbuf_next(i)) {
- uint32_t
fram
es;
+ uint32_t
sampl
es;
uint32_t subframes;
uint32_t type;
uint32_t size;
uint8_t* data;
uint32_t subframes;
uint32_t type;
uint32_t size;
uint8_t* data;
- lv2_evbuf_get(i, &
fram
es, &subframes, &type, &size, &data);
+ lv2_evbuf_get(i, &
sampl
es, &subframes, &type, &size, &data);
#ifndef NDEBUG
DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("(FLUSH) MIDI event of size %1\n", size));
for (uint16_t x = 0; x < size; ++x) {
#ifndef NDEBUG
DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("(FLUSH) MIDI event of size %1\n", size));
for (uint16_t x = 0; x < size; ++x) {
@@
-336,7
+336,7
@@
BufferSet::flush_lv2_midi(bool input, size_t i)
#endif
if (type == URIMap::instance().urids.midi_MidiEvent) {
// TODO: Make Ardour event buffers generic so plugins can communicate
#endif
if (type == URIMap::instance().urids.midi_MidiEvent) {
// TODO: Make Ardour event buffers generic so plugins can communicate
- mbuf.push_back(
fram
es, size, data);
+ mbuf.push_back(
sampl
es, size, data);
}
}
}
}
}
}
@@
-401,7
+401,7
@@
BufferSet::VSTBuffer::clear ()
}
void
}
void
-BufferSet::VSTBuffer::push_back (Evoral::Event<
fram
epos_t> const & ev)
+BufferSet::VSTBuffer::push_back (Evoral::Event<
sampl
epos_t> const & ev)
{
if (ev.size() > 3) {
/* XXX: this will silently drop MIDI messages longer than 3 bytes, so
{
if (ev.size() > 3) {
/* XXX: this will silently drop MIDI messages longer than 3 bytes, so
@@
-420,7
+420,7
@@
BufferSet::VSTBuffer::push_back (Evoral::Event<framepos_t> const & ev)
v->type = kVstMidiType;
v->byteSize = sizeof (VstMidiEvent);
v->type = kVstMidiType;
v->byteSize = sizeof (VstMidiEvent);
- v->delta
Fram
es = ev.time ();
+ v->delta
Sampl
es = ev.time ();
v->flags = 0;
v->detune = 0;
v->flags = 0;
v->detune = 0;
@@
-439,7
+439,7
@@
BufferSet::VSTBuffer::push_back (Evoral::Event<framepos_t> const & ev)
/** Copy buffers of one type from `in' to this BufferSet */
void
/** Copy buffers of one type from `in' to this BufferSet */
void
-BufferSet::read_from (const BufferSet& in,
fram
ecnt_t nframes, DataType type)
+BufferSet::read_from (const BufferSet& in,
sampl
ecnt_t nframes, DataType type)
{
assert (available().get (type) >= in.count().get (type));
{
assert (available().get (type) >= in.count().get (type));
@@
-453,7
+453,7
@@
BufferSet::read_from (const BufferSet& in, framecnt_t nframes, DataType type)
/** Copy buffers of all types from `in' to this BufferSet */
void
/** Copy buffers of all types from `in' to this BufferSet */
void
-BufferSet::read_from (const BufferSet& in,
fram
ecnt_t nframes)
+BufferSet::read_from (const BufferSet& in,
sampl
ecnt_t nframes)
{
assert(available() >= in.count());
{
assert(available() >= in.count());
@@
-464,7
+464,7
@@
BufferSet::read_from (const BufferSet& in, framecnt_t nframes)
}
void
}
void
-BufferSet::merge_from (const BufferSet& in,
fram
ecnt_t nframes)
+BufferSet::merge_from (const BufferSet& in,
sampl
ecnt_t nframes)
{
/* merge all input buffers into out existing buffers.
{
/* merge all input buffers into out existing buffers.
@@
-482,7
+482,7
@@
BufferSet::merge_from (const BufferSet& in, framecnt_t nframes)
}
void
}
void
-BufferSet::silence (
framecnt_t nframes, fram
ecnt_t offset)
+BufferSet::silence (
samplecnt_t nframes, sampl
ecnt_t offset)
{
for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) {
for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) {
{
for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) {
for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) {