ref: 9374e578e4c269eb52fa8d2898ecba1448055418
parent: 2c8ada64b37bb68c5f5ce274b9ecf90a779aaef0
author: Paul Brossier <piem@piem.org>
date: Sun Nov 4 15:01:44 EST 2018
[py] improve code style of midiconv.py
--- a/python/lib/aubio/midiconv.py
+++ b/python/lib/aubio/midiconv.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
""" utilities to convert midi note number to and from note names """
-__all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
-
import sys
from ._aubio import freqtomidi, miditofreq
+__all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
+
py3 = sys.version_info[0] == 3
if py3:
str_instances = str
@@ -14,6 +14,7 @@
str_instances = (str, unicode)
int_instances = (int, long)
+
def note2midi(note):
"""Convert note name to midi note number.
@@ -55,13 +56,14 @@
--------
midi2note, freqtomidi, miditofreq
"""
- _valid_notenames = {'C': 0, 'D': 2, 'E': 4, 'F': 5, 'G': 7, 'A': 9, 'B': 11}+ _valid_notenames = {'C': 0, 'D': 2, 'E': 4, 'F': 5, 'G': 7,+ 'A': 9, 'B': 11}
_valid_modifiers = {- u'𝄫': -2, # double flat
- u'♭': -1, 'b': -1, '\u266d': -1, # simple flat
- u'♮': 0, '\u266e': 0, None: 0, # natural
- '#': +1, u'♯': +1, '\u266f': +1, # sharp
- u'𝄪': +2, # double sharp
+ u'𝄫': -2, # double flat
+ u'♭': -1, 'b': -1, '\u266d': -1, # simple flat
+ u'♮': 0, '\u266e': 0, None: 0, # natural
+ '#': +1, u'♯': +1, '\u266f': +1, # sharp
+ u'𝄪': +2, # double sharp
}
_valid_octaves = range(-1, 10)
if not isinstance(note, str_instances):
@@ -93,12 +95,13 @@
if octave not in _valid_octaves:
raise ValueError("%s is not a valid octave" % octave)- midi = 12 + octave * 12 + _valid_notenames[notename] \
- + _valid_modifiers[modifier]
+ midi = (octave + 1) * 12 + _valid_notenames[notename] \
+ + _valid_modifiers[modifier]
if midi > 127:
raise ValueError("%s is outside of the range C-2 to G8" % note)return midi
+
def midi2note(midi):
"""Convert midi note number to note name.
@@ -136,9 +139,10 @@
msg = "an integer between 0 and 127 is excepted, got {:d}"raise ValueError(msg.format(midi))
_valid_notenames = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#',
- 'A', 'A#', 'B']
+ 'A', 'A#', 'B']
return _valid_notenames[midi % 12] + str(int(midi / 12) - 1)
+
def freq2note(freq):
"""Convert frequency in Hz to nearest note name.
@@ -161,6 +165,7 @@
"""
nearest_note = int(freqtomidi(freq) + .5)
return midi2note(nearest_note)
+
def note2freq(note):
"""Convert note name to corresponding frequency, in Hz.