diff options
author | Marian Sigler <m@qjym.de> | 2013-06-08 22:24:56 +0200 |
---|---|---|
committer | Marian Sigler <m@qjym.de> | 2013-06-08 22:24:56 +0200 |
commit | 950c29551269e0fb84d7eb9756fbc3a5ce3bda21 (patch) | |
tree | 8ba6b8b3e5982978b246614906602fe0a6130820 | |
parent | 2d4dca19d09a700dd85a52efdee4be8f3fc59c3d (diff) | |
parent | 8946d88bdacaf45331b9814370fb060effbd0b26 (diff) | |
download | tesla-950c29551269e0fb84d7eb9756fbc3a5ce3bda21.tar.gz tesla-950c29551269e0fb84d7eb9756fbc3a5ce3bda21.tar.bz2 tesla-950c29551269e0fb84d7eb9756fbc3a5ce3bda21.zip |
Merge branch 'split'
-rw-r--r-- | rtttl.py | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -12,8 +12,8 @@ import time BAUDRATE = 9600 PAUSE = .001 -_rtttl_re = re.compile('([0-9]+)?([a-hp]#?)(\.?)([0-9]?)(?:(?:,[ \n]*|$))') -_rtttl_prefix_re = re.compile('d=([0-9]+),o=([1-5]),b=([0-9]+)') +_rtttl_re = re.compile('^\s*([0-9]+)?([a-hp]#?)(\.?)([0-9]?)\s*$') +_rtttl_prefix_re = re.compile('d=([0-9]+),\s?o=([1-5]),\s?b=([0-9]+)') freqs = { 'a': 440.000, @@ -41,7 +41,15 @@ def parse(s): octave = int(o) timefactor = int(b)/60 - for m in _rtttl_re.finditer(music): + # for m in _rtttl_re.finditer(music): + for tone in music.split(","): + + m = _rtttl_re.match(tone) + + if not m: + print("Didn't match:",music) + continue + l, t, ld, o = m.groups() if l: |