diff options
author | John Glover <glover.john@gmail.com> | 2011-07-22 19:04:13 +0100 |
---|---|---|
committer | John Glover <glover.john@gmail.com> | 2011-07-22 19:04:13 +0100 |
commit | 6609a1e4fcd341fbd9d421adef48af6137ff79ca (patch) | |
tree | a442b6cef8ebf316e91a7e25bc91d684f72248d6 /src | |
parent | d6073e01c933c77f1e2bc3c3fe1126d617003549 (diff) | |
download | simpl-6609a1e4fcd341fbd9d421adef48af6137ff79ca.tar.gz simpl-6609a1e4fcd341fbd9d421adef48af6137ff79ca.tar.bz2 simpl-6609a1e4fcd341fbd9d421adef48af6137ff79ca.zip |
start adding analyze_peaks code
Diffstat (limited to 'src')
-rw-r--r-- | src/loris/Analyzer.C | 5 | ||||
-rw-r--r-- | src/loris/Analyzer.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/loris/Analyzer.C b/src/loris/Analyzer.C index 7ed7469..5b4996c 100644 --- a/src/loris/Analyzer.C +++ b/src/loris/Analyzer.C @@ -732,6 +732,11 @@ Analyzer::analyze( const double * bufBegin, const double * bufEnd, double srate, } } +void +Analyzer::analyze_peaks( const std::vector<double> & vec, double srate ) +{ + printf("analyze_peaks\n"); +} // -- parameter access -- // --------------------------------------------------------------------------- diff --git a/src/loris/Analyzer.h b/src/loris/Analyzer.h index 6bdfe52..58ece87 100644 --- a/src/loris/Analyzer.h +++ b/src/loris/Analyzer.h @@ -37,18 +37,16 @@ #include "LinearEnvelope.h" #include "Partial.h" #include "PartialList.h" -// #include "SpectralPeaks.h" +#include "SpectralPeaks.h" // begin namespace namespace Loris { class Envelope; class LinearEnvelopeBuilder; -// class Peaks; -// class Peaks::iterator; // oooo, this is nasty, need to fix it! -class SpectralPeak; -typedef std::vector< SpectralPeak > Peaks; +// class SpectralPeak; +// typedef std::vector< SpectralPeak > Peaks; // --------------------------------------------------------------------------- // class Analyzer @@ -251,6 +249,8 @@ public: //! frequency contour expected of the resulting Partials. void analyze( const double * bufBegin, const double * bufEnd, double srate, const Envelope & reference ); + + void analyze_peaks( const std::vector<double> & vec, double srate ); // -- parameter access -- |