Merge branch 'master' into coveralls

diff --git a/aubio.pc.in b/aubio.pc.in
index 301a1b5..16a892f 100644 (file)
--- a/aubio.pc.in
+++ b/aubio.pc.in
@@ -7,4 +7,4 @@ Name: aubio
 Description: a library for audio labelling
 Version: @VERSION@
 Libs: -L${libdir} -laubio
-Cflags: -I${includedir} 
+Cflags: -I${includedir}

diff --git a/python/tests/test_aubio_cmd.py b/python/tests/test_aubio_cmd.py
new file mode 100755 (executable)
index 0000000..79675cb
--- /dev/null
+++ b/python/tests/test_aubio_cmd.py
@@ -0,0 +1,27 @@
+#! /usr/bin/env python
+
+import aubio.cmd
+from nose2 import main
+from numpy.testing import TestCase
+
+class aubio_cmd(TestCase):
+
+    def setUp(self):
+        self.a_parser = aubio.cmd.aubio_parser()
+
+    def test_default_creation(self):
+        assert self.a_parser.parse_args(['-V']).show_version
+
+class aubio_cmd_utils(TestCase):
+
+    def test_samples2seconds(self):
+        self.assertEqual(aubio.cmd.samples2seconds(3200, 32000), "0.100000\t")
+
+    def test_samples2milliseconds(self):
+        self.assertEqual(aubio.cmd.samples2milliseconds(3200, 32000), "100.000000\t")
+
+    def test_samples2samples(self):
+        self.assertEqual(aubio.cmd.samples2samples(3200, 32000), "3200\t")
+
+if __name__ == '__main__':
+    main()

diff --git a/python/tests/test_aubio_cut.py b/python/tests/test_aubio_cut.py
new file mode 100755 (executable)
index 0000000..cbbfe05
--- /dev/null
+++ b/python/tests/test_aubio_cut.py
@@ -0,0 +1,16 @@
+#! /usr/bin/env python
+
+import aubio.cut
+from nose2 import main
+from numpy.testing import TestCase
+
+class aubio_cut(TestCase):
+
+    def setUp(self):
+        self.a_parser = aubio.cut.aubio_cut_parser()
+
+    def test_default_creation(self):
+        assert self.a_parser.parse_args(['-v']).verbose
+
+if __name__ == '__main__':
+    main()

diff --git a/src/spectral/mfcc.c b/src/spectral/mfcc.c
index 101deb8..f54799d 100644 (file)
--- a/src/spectral/mfcc.c
+++ b/src/spectral/mfcc.c
@@ -36,7 +36,7 @@ struct _aubio_mfcc_t
 {
   uint_t win_s;             /** grain length */
   uint_t samplerate;        /** sample rate (needed?) */
-  uint_t n_filters;         /** number of  *filters */
+  uint_t n_filters;         /** number of filters */
   uint_t n_coefs;           /** number of coefficients (<= n_filters/2 +1) */
   aubio_filterbank_t *fb;   /** filter bank */
   fvec_t *in_dct;           /** input buffer for dct * [fb->n_filters] */