# HG changeset patch
# User Dan Stowell <danstowell@users.sourceforge.net>
# Date 1360773961 0
# Node ID 372ee94cc82e0ad4311cd41d18bfb351cf99d540
# Parent  81d346d43a445dfa67cfbaa6606d8aec5fe156a9# Parent  8319429b20da23e483937879907ffd39bd0bb56f
Merge branch 'master' into aaspchall

diff -r 81d346d43a44 -r 372ee94cc82e MFCC.py
--- 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
 				
diff -r 81d346d43a44 -r 372ee94cc82e smacpy.py
--- 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))