4 files changed, 69 insertions, 11 deletions

diff --git a/simpl/base.pxd b/simpl/base.pxd
index f31c9a3..8b825ba 100644
--- a/simpl/base.pxd
+++ b/simpl/base.pxd
@@ -1,6 +1,7 @@
 import numpy as np
 cimport numpy as np
 from libcpp.vector cimport vector
+from libcpp cimport bool
 
 np.import_array()
 
@@ -36,7 +37,7 @@ cdef extern from "../src/simpl/base.h" namespace "simpl":
 
     cdef cppclass c_Frame "simpl::Frame":
         c_Frame()
-        c_Frame(int frame_size)
+        c_Frame(int frame_size, bool alloc_memory)
 
         # peaks
         int num_peaks()
diff --git a/simpl/base.pyx b/simpl/base.pyx
index 8edb7a0..0fa6e84 100644
--- a/simpl/base.pyx
+++ b/simpl/base.pyx
@@ -35,10 +35,10 @@ cdef class Peak:
 
 
 cdef class Frame:
-    def __cinit__(self, size=None, create_new=True):
+    def __cinit__(self, size=None, create_new=True, alloc_memory=False):
         if create_new:
             if size:
-                self.thisptr = new c_Frame(size)
+                self.thisptr = new c_Frame(size, alloc_memory)
             else:
                 self.thisptr = new c_Frame()
             self.created = True
@@ -46,7 +46,7 @@ cdef class Frame:
             self.created = False
 
     def __dealloc__(self):
-        if self.created:
+        if self.created and self.thisptr:
             del self.thisptr
 
     cdef set_frame(self, c_Frame* f):
@@ -86,7 +86,7 @@ cdef class Frame:
     # partials
     property num_partials:
         def __get__(self): return self.thisptr.num_partials()
-        def __set__(self, int i): raise Exception("Invalid Operation")
+        def __set__(self, int i): raise Exception("NotImplemented")
 
     property max_partials:
         def __get__(self): return self.thisptr.max_partials()
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index 3b35251..e3da251 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -81,17 +81,27 @@ Peak* Partial::peak(int peak_number) {
 // ---------------------------------------------------------------------------
 Frame::Frame() {
     _size = 512;
+    _alloc_memory = false;
     init();
 }
 
-Frame::Frame(int frame_size) {
+Frame::Frame(int frame_size, bool alloc_memory) {
     _size = frame_size;
+    _alloc_memory = alloc_memory;
     init();
+
+    if(_alloc_memory) {
+        create_arrays();
+    }
 }
 
 Frame::~Frame() {
     _peaks.clear();
     _partials.clear();
+
+    if(_alloc_memory) {
+        destroy_arrays();
+    }
 }
 
 void Frame::init() {
@@ -107,6 +117,25 @@ void Frame::init() {
     _synth_residual = NULL;
 }
 
+void Frame::create_arrays() {
+    _audio = new sample[_size];
+    _synth = new sample[_size];
+    _residual = new sample[_size];
+    _synth_residual = new sample[_size];
+
+    memset(_audio, 0.0, sizeof(sample) * _size);
+    memset(_synth, 0.0, sizeof(sample) * _size);
+    memset(_residual, 0.0, sizeof(sample) * _size);
+    memset(_synth_residual, 0.0, sizeof(sample) * _size);
+}
+
+void Frame::destroy_arrays() {
+    delete [] _audio;
+    delete [] _synth;
+    delete [] _residual;
+    delete [] _synth_residual;
+}
+
 // Frame - peaks
 // -------------
 
@@ -199,10 +228,20 @@ int Frame::size() {
 
 void Frame::size(int new_size) {
     _size = new_size;
+
+    if(_alloc_memory) {
+        destroy_arrays();
+        create_arrays();
+    }
 }
 
 void Frame::audio(sample* new_audio) {
-    _audio = new_audio;
+    if(_alloc_memory) {
+        memcpy(_audio, new_audio, sizeof(sample) * _size);
+    }
+    else {
+        _audio = new_audio;
+    }
 }
 
 sample* Frame::audio() {
@@ -210,7 +249,12 @@ sample* Frame::audio() {
 }
 
 void Frame::synth(sample* new_synth) {
-    _synth = new_synth;
+    if(_alloc_memory) {
+        memcpy(_synth, new_synth, sizeof(sample) * _size);
+    }
+    else {
+        _synth = new_synth;
+    }
 }
 
 sample* Frame::synth() {
@@ -218,7 +262,12 @@ sample* Frame::synth() {
 }
 
 void Frame::residual(sample* new_residual) {
-    _residual = new_residual;
+    if(_alloc_memory) {
+        memcpy(_residual, new_residual, sizeof(sample) * _size);
+    }
+    else {
+        _residual = new_residual;
+    }
 }
 
 sample* Frame::residual() {
@@ -226,7 +275,12 @@ sample* Frame::residual() {
 }
 
 void Frame::synth_residual(sample* new_synth_residual) {
-    _synth_residual = new_synth_residual;
+    if(_alloc_memory) {
+        memcpy(_synth_residual, new_synth_residual, sizeof(sample) * _size);
+    }
+    else {
+        _synth_residual = new_synth_residual;
+    }
 }
 
 sample* Frame::synth_residual() {
diff --git a/src/simpl/base.h b/src/simpl/base.h
index b82ded1..7c19f77 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -90,10 +90,13 @@ class Frame {
         sample* _residual;
         sample* _synth_residual;
         void init();
+        bool _alloc_memory;
+        void create_arrays();
+        void destroy_arrays();
 
     public:
         Frame();
-        Frame(int frame_size);
+        Frame(int frame_size, bool alloc_memory=false);
         ~Frame();
 
         // peaks