Separate MidiBuffer and AudioBuffer into separate headers (trims the dependency tree, and too large to be in one anyway).

git-svn-id: svn://localhost/ardour2/trunk@2081 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 130 deletions

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index fe9516cb84..18c83f8bfb 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -80,136 +80,6 @@ protected:
 };
 
 
-/* Inside every class with a type in it's name is a template waiting to get out... */
-
-
-/** Buffer containing 32-bit floating point (audio) data. */
-class AudioBuffer : public Buffer
-{
-public:
-	AudioBuffer(size_t capacity);
-	
-	~AudioBuffer();
-
-	void silence(nframes_t len, nframes_t offset=0)
-	{
-		if (!_silent) {
-			assert(_capacity > 0);
-			assert(offset + len <= _capacity);
-			memset(_data + offset, 0, sizeof (Sample) * len);
-			if (offset == 0 && len == _capacity) {
-				_silent = true;
-			}
-		}
-	}
-	
-	/** Read @a len frames FROM THE START OF @a src into self at @a offset */
-	void read_from(const Buffer& src, nframes_t len, nframes_t offset)
-	{
-		assert(_capacity > 0);
-		assert(src.type() == _type == DataType::AUDIO);
-		assert(offset + len <= _capacity);
-		memcpy(_data + offset, ((AudioBuffer&)src).data(), sizeof(Sample) * len);
-		_silent = src.silent();
-	}
-	
-	/** Accumulate (add)@a len frames FROM THE START OF @a src into self at @a offset */
-	void accumulate_from(const AudioBuffer& src, nframes_t len, nframes_t offset)
-	{
-		assert(_capacity > 0);
-		assert(offset + len <= _capacity);
-
-		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data();
-
-		for (nframes_t n = 0; n < len; ++n) {
-			dst_raw[n] += src_raw[n];
-		}
-
-		_silent = (src.silent() && _silent);
-	}
-	
-	/** Accumulate (add) @a len frames FROM THE START OF @a src into self at @a offset
-	 * scaling by @a gain_coeff */
-	void accumulate_with_gain_from(const AudioBuffer& src, nframes_t len, nframes_t offset, gain_t gain_coeff)
-	{
-		assert(_capacity > 0);
-		assert(offset + len <= _capacity);
-
-		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data();
-
-		mix_buffers_with_gain (dst_raw, src_raw, len, gain_coeff);
-
-		_silent = ( (src.silent() && _silent) || (_silent && gain_coeff == 0) );
-	}
-	
-	void apply_gain(gain_t gain, nframes_t len, nframes_t offset=0) {
-		apply_gain_to_buffer (_data + offset, len, gain);
-	}
-
-	/** Set the data contained by this buffer manually (for setting directly to jack buffer).
-	 * 
-	 * Constructor MUST have been passed capacity=0 or this will die (to prevent mem leaks).
-	 */
-	void set_data(Sample* data, size_t size)
-	{
-		assert(!_owns_data); // prevent leaks
-		_capacity = size;
-		_size = size;
-		_data = data;
-		_silent = false;
-	}
-
-	const Sample* data () const { return _data; }
-	Sample* data () { return _data; }
-
-	const Sample* data(nframes_t nframes, nframes_t offset) const
-		{ assert(offset + nframes <= _capacity); return _data + offset; }
-
-	Sample* data (nframes_t nframes, nframes_t offset)
-		{ assert(offset + nframes <= _capacity); return _data + offset; }
-
-private:
-	bool    _owns_data;
-	Sample* _data; ///< Actual buffer contents
-};
-
-
-
-/** Buffer containing 8-bit unsigned char (MIDI) data. */
-class MidiBuffer : public Buffer
-{
-public:
-	MidiBuffer(size_t capacity);
-	
-	~MidiBuffer();
-
-	void silence(nframes_t dur, nframes_t offset=0);
-	
-	void read_from(const Buffer& src, nframes_t nframes, nframes_t offset);
-
-	bool  push_back(const ARDOUR::MidiEvent& event);
-	bool  push_back(const jack_midi_event_t& event);
-	Byte* reserve(double time, size_t size);
-	
-	const MidiEvent& operator[](size_t i) const { assert(i < _size); return _events[i]; }
-	MidiEvent& operator[](size_t i) { assert(i < _size); return _events[i]; }
-
-	static size_t max_event_size() { return MAX_EVENT_SIZE; }
-
-private:
-	// FIXME: Jack needs to tell us this
-	static const size_t MAX_EVENT_SIZE = 4; // bytes
-	
-	/* We use _size as "number of events", so the size of _data is
-	 * (_size * MAX_EVENT_SIZE)
-	 */
-
-	MidiEvent* _events; ///< Event structs that point to offsets in _data
-	Byte*      _data;   ///< MIDI, straight up.  No time stamps.
-};
-
 } // namespace ARDOUR
 
 #endif // __ardour_buffer_h__