Changeset 7be77bb

Timestamp:

Oct 30, 2018, 1:04:07 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

cefa29d

Parents:

7af37df (diff), 476cb41 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'feature/note2freq'

Location:

python

Files:

• lib/aubio/midiconv.py (modified) (2 diffs)
• tests/test_note2midi.py (modified) (2 diffs)

python/lib/aubio/midiconv.py

@@ -2 +2 @@
 """ utilities to convert midi note number to and from note names """
 
-__all__ = ['note2midi', 'midi2note', 'freq2note']
+__all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
 
 import sys
-from ._aubio import freqtomidi
+from ._aubio import freqtomidi, miditofreq
 
 py3 = sys.version_info[0] == 3
@@ -76 +76 @@
     nearest_note = int(freqtomidi(freq) + .5)
     return midi2note(nearest_note)
+
+def note2freq(note):
+    """Convert note name to corresponding frequency, in Hz.
+
+    Parameters
+    ----------
+    note : str
+        input note name
+
+    Returns
+    -------
+    freq : float [0, 23000[
+        frequency, in Hz
+
+    Example
+    -------
+    >>> aubio.note2freq('A4')
+    440
+    >>> aubio.note2freq('A3')
+    220.1
+    """
+    midi = note2midi(note)
+    return miditofreq(midi)

python/tests/test_note2midi.py

@@ -4 +4 @@
 from __future__ import unicode_literals
 
-from aubio import note2midi, freq2note
+from aubio import note2midi, freq2note, note2freq
 from nose2.tools import params
 import unittest
@@ -120 +120 @@
         self.assertEqual("A4", freq2note(439))
 
+class note2freq_simple_test(unittest.TestCase):
+
+    def test_note2freq(self):
+        " make sure note2freq('A3') == 220"
+        self.assertEqual(220, note2freq("A3"))
+
+    def test_note2freq_under(self):
+        " make sure note2freq(A4) == 440"
+        self.assertEqual(440, note2freq("A4"))
+
 if __name__ == '__main__':
     import nose2