- use std::vector
- removed views
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#ifndef DSP_BUFFER_H
|
||||
#define DSP_BUFFER_H
|
||||
|
||||
#include <vector>
|
||||
#include <cstddef>
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
/*
|
||||
* jayDSP, A cross-platform Digital Signal Processing library written in modern C++.
|
||||
* Copyright (C) 2025 Jens Ahrensfeld, All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
* File: buffer_view.hpp
|
||||
* Author Jens Ahrensfeld on 26.10.2025.
|
||||
*/
|
||||
|
||||
#ifndef DSP_BUFFER_VIEW_H
|
||||
#define DSP_BUFFER_VIEW_H
|
||||
|
||||
#include "buffer_multi.hpp"
|
||||
|
||||
|
||||
namespace dsp {
|
||||
|
||||
template <typename T>
|
||||
class BufferMultiView
|
||||
{
|
||||
BufferMulti<T> &m_buffer;
|
||||
uint m_offset;
|
||||
uint m_channel;
|
||||
|
||||
public:
|
||||
BufferMultiView(BufferMulti<T> &buffer, int offset, int channel)
|
||||
: m_buffer(buffer)
|
||||
, m_offset(offset)
|
||||
, m_channel(channel)
|
||||
{
|
||||
}
|
||||
|
||||
T & operator[](int offset)
|
||||
{
|
||||
return m_buffer.at(m_channel, m_offset + offset);
|
||||
}
|
||||
|
||||
const T & operator[](int offset) const
|
||||
{
|
||||
return m_buffer[m_offset + offset];
|
||||
}
|
||||
|
||||
size_t size()
|
||||
{
|
||||
return m_buffer.size();
|
||||
}
|
||||
|
||||
typedef std::vector<T>::iterator iterator;
|
||||
typedef std::vector<T>::const_iterator const_iterator;
|
||||
iterator begin()
|
||||
{
|
||||
return m_buffer.begin();
|
||||
}
|
||||
|
||||
iterator end()
|
||||
{
|
||||
return m_buffer.end();
|
||||
}
|
||||
|
||||
const_iterator begin() const
|
||||
{
|
||||
return m_buffer.begin();
|
||||
}
|
||||
|
||||
const_iterator end() const
|
||||
{
|
||||
return m_buffer.end();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif // DSP_BUFFER_VIEW_H
|
||||
@@ -1,87 +0,0 @@
|
||||
/*
|
||||
* jayDSP, A cross-platform Digital Signal Processing library written in modern C++.
|
||||
* Copyright (C) 2025 Jens Ahrensfeld, All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
* File: buffer_view.hpp
|
||||
* Author Jens Ahrensfeld on 26.10.2025.
|
||||
*/
|
||||
|
||||
#ifndef DSP_BUFFER_VIEW_H
|
||||
#define DSP_BUFFER_VIEW_H
|
||||
|
||||
#include "buffer.hpp"
|
||||
|
||||
|
||||
namespace dsp {
|
||||
|
||||
template <typename T>
|
||||
class BufferView
|
||||
{
|
||||
Buffer<T> &m_buffer;
|
||||
uint m_offset;
|
||||
|
||||
public:
|
||||
BufferView(Buffer<T> &buffer, int offset)
|
||||
: m_buffer(buffer)
|
||||
, m_offset(offset)
|
||||
{
|
||||
}
|
||||
|
||||
T & operator[](int offset)
|
||||
{
|
||||
return m_buffer[m_offset + offset];
|
||||
}
|
||||
|
||||
const T & operator[](int offset) const
|
||||
{
|
||||
return m_buffer[m_offset + offset];
|
||||
}
|
||||
|
||||
size_t size()
|
||||
{
|
||||
return m_buffer.size();
|
||||
}
|
||||
|
||||
typedef std::vector<T>::iterator iterator;
|
||||
typedef std::vector<T>::const_iterator const_iterator;
|
||||
iterator begin()
|
||||
{
|
||||
return m_buffer.begin();
|
||||
}
|
||||
|
||||
iterator end()
|
||||
{
|
||||
return m_buffer.end();
|
||||
}
|
||||
|
||||
const_iterator begin() const
|
||||
{
|
||||
return m_buffer.begin();
|
||||
}
|
||||
|
||||
const_iterator end() const
|
||||
{
|
||||
return m_buffer.end();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif // DSP_BUFFER_VIEW_H
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "test_common.hpp"
|
||||
|
||||
#include <delay/buffer.hpp>
|
||||
#include <delay/buffer_view.hpp>
|
||||
#include <cstdio>
|
||||
|
||||
#include <iostream>
|
||||
@@ -27,13 +25,11 @@ int test_buffer_1()
|
||||
printf("i=%d: v=%d\n", i, v);
|
||||
}
|
||||
|
||||
auto v1 = dsp::BufferView<int>(buffer, 0);
|
||||
auto v2 = dsp::BufferView<int>(buffer, -5);
|
||||
auto v1 = dsp::Buffer<int>(buffer, 0);
|
||||
auto v2 = dsp::Buffer<int>(buffer, -5);
|
||||
|
||||
for(int i=0; i < buffer.capacity(); i++)
|
||||
{
|
||||
std::cout << buffer[i] << std::endl;
|
||||
}
|
||||
print(v1, v1.capacity());
|
||||
print(v2, v2.capacity());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#include "dsp_types.hpp"
|
||||
#include "test_common.hpp"
|
||||
#include <delay/buffer_multi.hpp>
|
||||
#include <delay/buffer.hpp>
|
||||
|
||||
@@ -26,15 +26,9 @@
|
||||
#ifndef DSP_TYPES_HPP
|
||||
#define DSP_TYPES_HPP
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace dsp {
|
||||
|
||||
template<typename T, size_t SIZE=1024>
|
||||
class vector : public std::vector<T>
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user