Showing the changes to python/lib (1 of 1 file). Show all
Unified · Split
| @@ -1,23 +1,26 @@ | ||
| 1 | 1 | # -*- coding: utf-8 -*- |
| 2 | +""" utilities to convert midi note number to and from note names """ | |
| 2 | 3 | |
| 3 | 4 | import sys |
| 4 | −PY3 = sys.version_info[0] == 3 | |
| 5 | −if PY3: | |
| 6 | − string_types = [str] | |
| 5 | +py3 = sys.version_info[0] == 3 | |
| 6 | +if py3: | |
| 7 | + str_instances = [str] | |
| 8 | + int_instances = [int] | |
| 7 | 9 | else: |
| 8 | − string_types = [str, unicode] | |
| 10 | + str_instances = [str, unicode] | |
| 11 | + int_instances = [int, long] | |
| 9 | 12 | |
| 10 | 13 | def note2midi(note): |
| 11 | 14 | " convert note name to midi note number, e.g. [C-1, G9] -> [0, 127] " |
| 12 | 15 | _valid_notenames = {'C': 0, 'D': 2, 'E': 4, 'F': 5, 'G': 7, 'A': 9, 'B': 11} |
| 13 | − _valid_modifiers = {None: 0, u'♮': 0, '#': +1, u'♯': +1, u'\udd2a': +2, 'b': -1, u'♭': -1, u'\ufffd': -2} | |
| 16 | + _valid_modifiers = {None: 0, u'♮': 0, '#': +1, u'♯': +1, u'\udd2a': +2, | |
| 17 | + 'b': -1, u'♭': -1, u'\ufffd': -2} | |
| 14 | 18 | _valid_octaves = range(-1, 10) |
| 15 | − if type(note) not in string_types: | |
| 16 | − raise TypeError("a string is required, got %s (%s)" % (note, str(type(note)) )) | |
| 17 | − if not (1 < len(note) < 5): | |
| 18 | − raise ValueError( | |
| 19 | − "string of 2 to 4 characters expected, got %d (%s)" % | |
| 20 | − (len(note), note)) | |
| 19 | + if isinstance(note, str_instances): | |
| 20 | + raise TypeError("a string is required, got %s (%s)" % (note, str(type(note)))) | |
| 21 | + if len(note) not in range(2, 5): | |
| 22 | + raise ValueError("string of 2 to 4 characters expected, got %d (%s)" \ | |
| 23 | + % (len(note), note)) | |
| 21 | 24 | notename, modifier, octave = [None]*3 |
| 22 | 25 | |
| 23 | 26 | if len(note) == 4: |
| @@ -48,15 +51,14 @@ def note2midi(note): · 24 unmodified lines | ||
| 48 | 51 | |
| 49 | 52 | def midi2note(midi): |
| 50 | 53 | " convert midi note number to note name, e.g. [0, 127] -> [C-1, G9] " |
| 51 | − if type(midi) != int: | |
| 54 | + if isinstance(midi, int_instances): | |
| 52 | 55 | raise TypeError("an integer is required, got %s" % midi) |
| 53 | − if not (-1 < midi < 128): | |
| 54 | − raise ValueError( | |
| 55 | − "an integer between 0 and 127 is excepted, got %d" % midi) | |
| 56 | − midi = int(midi) | |
| 56 | + if midi not in range(0, 128): | |
| 57 | + raise ValueError("an integer between 0 and 127 is excepted, got %d" % midi) | |
| 57 | 58 | _valid_notenames = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'] |
| 58 | − return _valid_notenames[midi % 12] + str( int(midi / 12) - 1 ) | |
| 59 | + return _valid_notenames[midi % 12] + str(int(midi / 12) - 1) | |
| 59 | 60 | |
| 60 | 61 | def freq2note(freq): |
| 62 | + " convert frequency in Hz to nearest note name, e.g. [0, 22050.] -> [C-1, G9] " | |
| 61 | 63 | from aubio import freqtomidi |
| 62 | 64 | return midi2note(int(freqtomidi(freq))) |