Changes in / [7be77bb:7af37df]


Ignore:
Location:
python
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • python/lib/aubio/midiconv.py

    r7be77bb r7af37df  
    22""" utilities to convert midi note number to and from note names """
    33
    4 __all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
     4__all__ = ['note2midi', 'midi2note', 'freq2note']
    55
    66import sys
    7 from ._aubio import freqtomidi, miditofreq
     7from ._aubio import freqtomidi
    88
    99py3 = sys.version_info[0] == 3
    … …  
    7676    nearest_note = int(freqtomidi(freq) + .5)
    7777    return midi2note(nearest_note)
    78 
    79 def note2freq(note):
    80     """Convert note name to corresponding frequency, in Hz.
    81 
    82     Parameters
    83     ----------
    84     note : str
    85         input note name
    86 
    87     Returns
    88     -------
    89     freq : float [0, 23000[
    90         frequency, in Hz
    91 
    92     Example
    93     -------
    94     >>> aubio.note2freq('A4')
    95     440
    96     >>> aubio.note2freq('A3')
    97     220.1
    98     """
    99     midi = note2midi(note)
    100     return miditofreq(midi)

  • python/tests/test_note2midi.py

    r7be77bb r7af37df  
    44from __future__ import unicode_literals
    55
    6 from aubio import note2midi, freq2note, note2freq
     6from aubio import note2midi, freq2note
    77from nose2.tools import params
    88import unittest
    … …  
    120120        self.assertEqual("A4", freq2note(439))
    121121
    122 class note2freq_simple_test(unittest.TestCase):
    123 
    124     def test_note2freq(self):
    125         " make sure note2freq('A3') == 220"
    126         self.assertEqual(220, note2freq("A3"))
    127 
    128     def test_note2freq_under(self):
    129         " make sure note2freq(A4) == 440"
    130         self.assertEqual(440, note2freq("A4"))
    131 
    132122if __name__ == '__main__':
    133123    import nose2
Note: See TracChangeset for help on using the changeset viewer.