Merge d50122f into 5d7314f

librosa/__init__.py

@@ -16,6 +16,7 @@
     get_duration
     get_samplerate
 
+
 Time-domain processing
 ----------------------
 .. autosummary::
@@ -27,6 +28,7 @@
     mu_compress
     mu_expand
 
+
 Signal generation
 -----------------
 .. autosummary::
@@ -36,6 +38,7 @@
     tone
     chirp
 
+
 Spectral representations
 ------------------------
 .. autosummary::
@@ -58,6 +61,7 @@
 
     magphase
 
+
 Phase recovery
 --------------
 .. autosummary::
@@ -98,6 +102,7 @@
 
     pcen
 
+
 Time unit conversion
 --------------------
 .. autosummary::
@@ -114,20 +119,24 @@
     blocks_to_samples
     blocks_to_time
 
+
 Frequency unit conversion
 -------------------------
 .. autosummary::
     :toctree: generated/
 
     hz_to_note
     hz_to_midi
+    hz_to_svara_h
+    hz_to_svara_c
     midi_to_hz
     midi_to_note
+    midi_to_svara_h
+    midi_to_svara_c
     note_to_hz
     note_to_midi
-
-    key_to_notes
-    key_to_degrees
+    note_to_svara_h
+    note_to_svara_c
 
     hz_to_mel
     hz_to_octs
@@ -138,6 +147,20 @@
     tuning_to_A4
 
 
+Music notation
+--------------
+.. autosummary::
+    :toctree: generated/
+
+    key_to_notes
+    key_to_degrees
+
+    mela_to_svara
+    mela_to_degrees
+
+    thaat_to_degrees
+
+
 Frequency range generation
 --------------------------
 .. autosummary::

librosa/core/__init__.py

@@ -2,13 +2,14 @@
 # -*- coding: utf-8 -*-
 """ Core IO and DSP functions"""
 
-from .time_frequency import *  # pylint: disable=wildcard-import
+from .convert import *  # pylint: disable=wildcard-import
 from .audio import *  # pylint: disable=wildcard-import
 from .spectrum import *  # pylint: disable=wildcard-import
 from .pitch import *  # pylint: disable=wildcard-import
 from .constantq import *  # pylint: disable=wildcard-import
 from .harmonic import *  # pylint: disable=wildcard-import
 from .fft import *  # pylint: disable=wildcard-import
+from .notation import *  # pylint: disable=wildcard-import
 
 
 __all__ = [_ for _ in dir() if not _.startswith('_')]

librosa/core/audio.py

@@ -13,7 +13,7 @@
 
 from numba import jit
 from .fft import get_fftlib
-from .time_frequency import frames_to_samples, time_to_samples
+from .convert import frames_to_samples, time_to_samples
 from .._cache import cache
 from .. import util
 from ..util.exceptions import ParameterError

librosa/core/constantq.py

@@ -9,7 +9,7 @@
 
 from . import audio
 from .fft import get_fftlib
-from .time_frequency import cqt_frequencies, note_to_hz
+from .convert import cqt_frequencies, note_to_hz
 from .spectrum import stft, istft
 from .pitch import estimate_tuning
 from .._cache import cache