Eliminate circular dependency kludge for control_protocol/smpte.o.

[ardour.git] / libs / ardour / buffer_set.cc

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index b0f5563564e5d66a55f8061bc03e1271652c934d..c60c0ac2b91fbe20372822d6aba5df78b42a9512 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -85,7 +85,7 @@ BufferSet::clear()
 /** Make this BufferSet a direct mirror of a PortSet's buffers.
  */
 void
-BufferSet::attach_buffers(PortSet& ports, nframes_t nframes, nframes_t offset)
+BufferSet::attach_buffers (PortSet& ports, framecnt_t nframes, framecnt_t offset)
 {
        clear();
 
@@ -180,68 +180,9 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
 void
 BufferSet::ensure_buffers(const ChanCount& chns, size_t buffer_capacity)
 {
-       if (chns == ChanCount::ZERO) {
-               return;
-       }
-
-       // If we're a mirror just make sure we're ok
-       if (_is_mirror) {
-               assert(_count >= chns);
-               return;
+       for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+               ensure_buffers (*i, chns.get (*i), buffer_capacity);
        }
-
-       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-
-               // The vector of buffers of this type
-               BufferVec& bufs = _buffers[*t];
-
-               uint32_t nbufs = chns.get (*t);
-
-               if (nbufs == 0) {
-                       // Nuke it
-                       for (BufferVec::iterator i = bufs.begin(); i != bufs.end(); ++i) {
-                               delete (*i);
-                       }
-                       bufs.clear();
-                       continue;
-               }
-
-               // If there's not enough or they're too small, just nuke the whole thing and
-               // rebuild it (so I'm lazy..)
-               if (bufs.size() < nbufs
-                   || (bufs.size() > 0 && bufs[0]->capacity() < buffer_capacity)) {
-
-                       // Nuke it
-                       for (BufferVec::iterator i = bufs.begin(); i != bufs.end(); ++i) {
-                               delete (*i);
-                       }
-                       bufs.clear();
-
-                       // Rebuild it
-                       for (size_t i = 0; i < nbufs; ++i) {
-                               bufs.push_back(Buffer::create(*t, buffer_capacity));
-                       }
-
-                       _available.set (*t, nbufs);
-               }
-
-#ifdef HAVE_SLV2
-               // Ensure enough low level MIDI format buffers are available for conversion
-               // in both directions (input & output, out-of-place)
-               if (*t == DataType::MIDI && _lv2_buffers.size() < _buffers[DataType::MIDI].size() * 2 + 1) {
-                       while (_lv2_buffers.size() < _buffers[DataType::MIDI].size() * 2) {
-                               _lv2_buffers.push_back(std::make_pair(false, new LV2EventBuffer(buffer_capacity)));
-                       }
-               }
-#endif
-
-               // Post-conditions
-               assert(bufs[0]->type() == *t);
-               assert(bufs.size() == _available.get(*t));
-               assert(bufs[0]->capacity() >= buffer_capacity);
-       }
-
-       assert (available() >= chns);
 }
 
 /** Get the capacity (size) of the available buffers of the given type.
@@ -274,6 +215,8 @@ BufferSet::get(DataType type, size_t i) const
 LV2EventBuffer&
 BufferSet::get_lv2_midi(bool input, size_t i)
 {
+       assert (count().get(DataType::MIDI) > i);
+       
        MidiBuffer& mbuf = get_midi(i);
        LV2Buffers::value_type b = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
        LV2EventBuffer* ebuf = b.second;
@@ -281,7 +224,7 @@ BufferSet::get_lv2_midi(bool input, size_t i)
        ebuf->reset();
        if (input) {
                for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) {
-                       const Evoral::MIDIEvent<nframes_t> ev(*e, false);
+                       const Evoral::MIDIEvent<framepos_t> ev(*e, false);
                        uint32_t type = LV2Plugin::midi_event_type();
                        ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer());
                }
@@ -356,7 +299,7 @@ BufferSet::VSTBuffer::clear ()
 }
 
 void
-BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<nframes_t> const & ev)
+BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
 {
        if (ev.size() > 3) {
                /* XXX: this will silently drop MIDI messages longer than 3 bytes, so
@@ -390,7 +333,7 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<nframes_t> const & ev)
 #endif /* VST_SUPPORT */
 
 void
-BufferSet::read_from (const BufferSet& in, nframes_t nframes)
+BufferSet::read_from (const BufferSet& in, framecnt_t nframes)
 {
        assert(available() >= in.count());
 
@@ -406,7 +349,7 @@ BufferSet::read_from (const BufferSet& in, nframes_t nframes)
 }
 
 void
-BufferSet::merge_from (const BufferSet& in, nframes_t nframes)
+BufferSet::merge_from (const BufferSet& in, framecnt_t nframes)
 {
        /* merge all input buffers into out existing buffers.
 
@@ -424,7 +367,7 @@ BufferSet::merge_from (const BufferSet& in, nframes_t nframes)
 }
 
 void
-BufferSet::silence (nframes_t nframes, nframes_t offset)
+BufferSet::silence (framecnt_t nframes, framecnt_t offset)
 {
        for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) {
                for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) {