diff options
-rw-r--r-- | simpl/__init__.py | 1 | ||||
-rw-r--r-- | src/simpl/base.cpp | 31 | ||||
-rw-r--r-- | src/simpl/base.h | 25 |
3 files changed, 0 insertions, 57 deletions
diff --git a/simpl/__init__.py b/simpl/__init__.py index 80a7ad8..932ed1d 100644 --- a/simpl/__init__.py +++ b/simpl/__init__.py @@ -11,7 +11,6 @@ import pybase dtype = np.double Frame = base.Frame Peak = base.Peak -Partial = pybase.Partial compare_peak_amps = pybase.compare_peak_amps compare_peak_freqs = pybase.compare_peak_freqs read_wav = audio.read_wav diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index f418bf5..ac4d120 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -19,37 +19,6 @@ Peak::~Peak() { // --------------------------------------------------------------------------- -// Partial -// --------------------------------------------------------------------------- -Partial::Partial() { - _starting_frame = 0; - _partial_number = -1; -} - -Partial::~Partial() { - _peaks.clear(); -} - -void Partial::add_peak(Peak* peak) { -} - -int Partial::length() { - return _peaks.size(); -} - -int Partial::first_frame_number() { - return _starting_frame; -} - -int Partial::last_frame_number() { - return _starting_frame + length(); -} - -Peak* Partial::peak(int peak_number) { - return _peaks[peak_number]; -} - -// --------------------------------------------------------------------------- // Frame // --------------------------------------------------------------------------- Frame::Frame() { diff --git a/src/simpl/base.h b/src/simpl/base.h index 83ab6bd..5a3bf5b 100644 --- a/src/simpl/base.h +++ b/src/simpl/base.h @@ -32,31 +32,6 @@ typedef std::vector<Peak*> Peaks; // --------------------------------------------------------------------------- -// Partial -// -// Represents a sinuoidal partial or track, an ordered sequence of Peaks -// --------------------------------------------------------------------------- -class Partial { - private: - int _starting_frame; - long _partial_number; - Peaks _peaks; - - public: - Partial(); - ~Partial(); - - void add_peak(Peak* peak); - int length(); - int first_frame_number(); - int last_frame_number(); - Peak* peak(int peak_number); -}; - -typedef std::vector<Partial*> Partials; - - -// --------------------------------------------------------------------------- // Frame // // Represents a frame of audio information. |