From bfca1f3a2739c1c0148b0641d3bdb8f4ea16b431 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 4 Jan 2010 20:59:01 +0000 Subject: Remove redundant LV2EventBuffer class and merge with EventBuffer. Refactor mixing from an in-place Buffer method (which doesn't work with EventBuffer) to a single function that takes an out of place destination and an array of sources. Fix audio buffer mixing for control<->audio. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2333 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/LV2EventBuffer.hpp | 85 ------------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 src/engine/LV2EventBuffer.hpp (limited to 'src/engine/LV2EventBuffer.hpp') diff --git a/src/engine/LV2EventBuffer.hpp b/src/engine/LV2EventBuffer.hpp deleted file mode 100644 index 26548e71..00000000 --- a/src/engine/LV2EventBuffer.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LV2EVENTBUFFER_H -#define LV2EVENTBUFFER_H - -#include "event.lv2/event.h" -#include "event.lv2/event-helpers.h" -#include "object.lv2/object.h" - -namespace Ingen { - - -class LV2EventBuffer { -public: - LV2EventBuffer(size_t capacity); - ~LV2EventBuffer(); - - /*inline LV2_Event_Buffer* data() { return _data; } - inline const LV2_Event_Buffer* data() const { return _data; }*/ - - inline void rewind() const { lv2_event_begin(&_iter, _data); } - - inline void reset() { - _latest_frames = 0; - _latest_subframes = 0; - _data->event_count = 0; - _data->size = 0; - rewind(); - } - - inline size_t event_count() const { return _data->event_count; } - inline uint32_t capacity() const { return _data->capacity; } - inline uint32_t size() const { return _data->size; } - inline uint32_t latest_frames() const { return _latest_frames; } - inline uint32_t latest_subframes() const { return _latest_subframes; } - - bool increment() const; - - bool is_valid() const; - - bool get_event(uint32_t* frames, - uint32_t* subframes, - uint16_t* type, - uint16_t* size, - uint8_t** data) const; - - LV2_Object* get_object() const; - LV2_Event* get_event() const; - - bool append(uint32_t frames, - uint32_t subframes, - uint16_t type, - uint16_t size, - const uint8_t* data); - - bool append(const LV2_Event_Buffer* buf); - - void copy(const LV2EventBuffer& buf); - -private: - LV2_Event_Buffer* _data; ///< Contents - mutable LV2_Event_Iterator _iter; ///< Iterator into _data - uint32_t _latest_frames; ///< Latest time of all events (frames) - uint32_t _latest_subframes; ///< Latest time of all events (subframes) -}; - - -} // namespace Ingen - -#endif // LV2EVENTBUFFER_H -- cgit v1.2.1