Mercurial > hg > smacpy
changeset 29:372ee94cc82e
Merge branch 'master' into aaspchall
| author | Dan Stowell <danstowell@users.sourceforge.net> |
|---|---|
| date | Wed, 13 Feb 2013 16:46:01 +0000 |
| parents | 81d346d43a44 (current diff) 8319429b20da (diff) |
| children | 49436fc230eb |
| files | smacpy.py |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/MFCC.py Thu Jan 24 12:25:59 2013 +0000 +++ b/MFCC.py Wed Feb 13 16:46:01 2013 +0000 @@ -52,7 +52,6 @@ %(self.minHz,self.maxHz,self.minMel,self.maxMel)) self.filterMatrix = self.getFilterMatrix(self.inputSize,self.numBands) self.DCTMatrix = self.getDCTMatrix(self.numBands) - self.filterIter = self.filterMatrix.__iter__() self.valid = True return self.valid
--- a/smacpy.py Thu Jan 24 12:25:59 2013 +0000 +++ b/smacpy.py Wed Feb 13 16:46:01 2013 +0000 @@ -102,7 +102,7 @@ def file_to_features(self, wavpath): "Reads through a mono WAV file, converting each frame to the required features. Returns a 2D array." if verbose: print("Reading %s" % wavpath) - if not os.path.isfile(wavpath): raise ValueError("path %s not found" % path) + if not os.path.isfile(wavpath): raise ValueError("path %s not found" % wavpath) sf = Sndfile(wavpath, "r") #if (sf.channels != 1) and verbose: print(" Sound file has multiple channels (%i) - channels will be mixed to mono." % sf.channels) if sf.samplerate != fs: raise ValueError("wanted sample rate %g - got %g." % (fs, sf.samplerate))