diff options
author | John Glover <glover.john@gmail.com> | 2011-08-24 09:23:11 +0100 |
---|---|---|
committer | John Glover <glover.john@gmail.com> | 2011-08-24 09:23:11 +0100 |
commit | 7929f46d0a78e5cac7c35c6da8e4ac7fbe2668e9 (patch) | |
tree | 6f2c035df697483ffc82f268c749bcaa7400da56 /src | |
parent | 42d9e300d8ee16af3d005bb6146258515e517bf9 (diff) | |
download | simpl-7929f46d0a78e5cac7c35c6da8e4ac7fbe2668e9.tar.gz simpl-7929f46d0a78e5cac7c35c6da8e4ac7fbe2668e9.tar.bz2 simpl-7929f46d0a78e5cac7c35c6da8e4ac7fbe2668e9.zip |
Change frame objects to have pointers to number
arrays instead of having their own std::vector
of samples
Diffstat (limited to 'src')
-rw-r--r-- | src/simpl/base.cpp | 8 | ||||
-rw-r--r-- | src/simpl/base.h | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index cc9dc2c..42832d6 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -93,10 +93,6 @@ Frame::~Frame() void Frame::init() { - audio.resize(_size); - synth.resize(_size); - residual.resize(_size); - synth_residual.resize(_size); _max_peaks = 100; peaks.resize(_max_peaks); _max_partials = 100; @@ -111,10 +107,6 @@ int Frame::size() void Frame::size(int new_size) { _size = new_size; - audio.resize(_size); - synth.resize(_size); - residual.resize(_size); - synth_residual.resize(_size); } int Frame::max_peaks() diff --git a/src/simpl/base.h b/src/simpl/base.h index 7649f86..a0064f1 100644 --- a/src/simpl/base.h +++ b/src/simpl/base.h @@ -30,6 +30,7 @@ namespace Simpl { typedef double number; +typedef std::vector<number> samples; // --------------------------------------------------------------------------- // Peak @@ -89,10 +90,10 @@ protected: public: Peaks peaks; Partials partials; - std::vector<number> audio; - std::vector<number> synth; - std::vector<number> residual; - std::vector<number> synth_residual; + number* audio; + number* synth; + number* residual; + number* synth_residual; Frame(); Frame(int frame_size); |