Changeset 1827c49


Ignore:
Timestamp:
May 10, 2016, 9:03:10 PM (3 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
ddfa6be
Parents:
cb89e51
Message:

python/lib/aubio/midiconv.py: clean up, add some documentation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/lib/aubio/midiconv.py

    rcb89e51 r1827c49  
    11# -*- coding: utf-8 -*-
     2""" utilities to convert midi note number to and from note names """
    23
    34import sys
    4 PY3 = sys.version_info[0] == 3
    5 if PY3:
    6     string_types = [str]
     5py3 = sys.version_info[0] == 3
     6if py3:
     7    str_instances = [str]
     8    int_instances = [int]
    79else:
    8     string_types = [str, unicode]
     10    str_instances = [str, unicode]
     11    int_instances = [int, long]
    912
    1013def note2midi(note):
    1114    " convert note name to midi note number, e.g. [C-1, G9] -> [0, 127] "
    1215    _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}
    1418    _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))
    2124    notename, modifier, octave = [None]*3
    2225
     
    4952def midi2note(midi):
    5053    " 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):
    5255        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)
    5758    _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)
    5960
    6061def freq2note(freq):
     62    " convert frequency in Hz to nearest note name, e.g. [0, 22050.] -> [C-1, G9] "
    6163    from aubio import freqtomidi
    6264    return midi2note(int(freqtomidi(freq)))
Note: See TracChangeset for help on using the changeset viewer.