diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/buffer_set.cc | |
parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/ardour/buffer_set.cc')
-rw-r--r-- | libs/ardour/buffer_set.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 243c677754..54eb7fe62b 100644 --- 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 -BufferSet::get_backend_port_addresses (PortSet& ports, framecnt_t nframes) +BufferSet::get_backend_port_addresses (PortSet& ports, samplecnt_t nframes) { 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)) { - uint32_t frames, subframes, type, size; + uint32_t samples, subframes, type, size; uint8_t* data; - lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data); + lv2_evbuf_get(i, &samples, &subframes, &type, &size, &data); if (type == URIMap::instance().urids.midi_MidiEvent) { - mbuf.push_back(frames, size, data); + mbuf.push_back(samples, 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)) { - uint32_t frames; + uint32_t samples; uint32_t subframes; uint32_t type; uint32_t size; uint8_t* data; - lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data); + lv2_evbuf_get(i, &samples, &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) { @@ -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 - mbuf.push_back(frames, size, data); + mbuf.push_back(samples, size, data); } } } @@ -401,7 +401,7 @@ BufferSet::VSTBuffer::clear () } void -BufferSet::VSTBuffer::push_back (Evoral::Event<framepos_t> const & ev) +BufferSet::VSTBuffer::push_back (Evoral::Event<samplepos_t> const & ev) { 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->deltaFrames = ev.time (); + v->deltaSamples = ev.time (); 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 -BufferSet::read_from (const BufferSet& in, framecnt_t nframes, DataType type) +BufferSet::read_from (const BufferSet& in, samplecnt_t nframes, DataType 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 -BufferSet::read_from (const BufferSet& in, framecnt_t nframes) +BufferSet::read_from (const BufferSet& in, samplecnt_t nframes) { assert(available() >= in.count()); @@ -464,7 +464,7 @@ BufferSet::read_from (const BufferSet& in, framecnt_t nframes) } void -BufferSet::merge_from (const BufferSet& in, framecnt_t nframes) +BufferSet::merge_from (const BufferSet& in, samplecnt_t nframes) { /* merge all input buffers into out existing buffers. @@ -482,7 +482,7 @@ BufferSet::merge_from (const BufferSet& in, framecnt_t nframes) } void -BufferSet::silence (framecnt_t nframes, framecnt_t offset) +BufferSet::silence (samplecnt_t nframes, samplecnt_t offset) { for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) { for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) { |