Skip to content
Snippets Groups Projects
Unverified Commit 7d8fcb40 authored by mirabilos's avatar mirabilos Committed by mirabilos
Browse files

reorder to be closer to spkr(4) implementation

(done on the other side, too)
parent 0bdc17b9
No related branches found
No related tags found
No related merge requests found
...@@ -168,11 +168,11 @@ def _getint(macro, minval, maxval, defval): ...@@ -168,11 +168,11 @@ def _getint(macro, minval, maxval, defval):
Returns an int, or defval. Returns an int, or defval.
""" """
if not (macro and macro[0].isdigit()):
return defval
num = "" num = ""
while macro and macro[0].isdigit(): while macro and macro[0].isdigit():
num += macro.pop(0) num += macro.pop(0)
if not num:
return defval
i = int(num) i = int(num)
if i < minval or i > maxval: if i < minval or i > maxval:
return defval return defval
...@@ -306,6 +306,18 @@ def mml(macro, _nplay=None, _barline=None, _mmltrk=None): ...@@ -306,6 +306,18 @@ def mml(macro, _nplay=None, _barline=None, _mmltrk=None):
octave_tracking = False octave_tracking = False
octave_tracking_onhold = False octave_tracking_onhold = False
elif char == ">":
if octave < 6:
octave += 1
normml[0] += char
octave_tracking_onhold = True
elif char == "<":
if octave > 0:
octave -= 1
normml[0] += char
octave_tracking_onhold = True
elif char == "P": elif char == "P":
_length = _getint(macro, 1, 64, timevalue) _length = _getint(macro, 1, 64, timevalue)
normml[0] += "P" + str(_length) normml[0] += "P" + str(_length)
...@@ -315,18 +327,6 @@ def mml(macro, _nplay=None, _barline=None, _mmltrk=None): ...@@ -315,18 +327,6 @@ def mml(macro, _nplay=None, _barline=None, _mmltrk=None):
bpm = _getint(macro, 32, 255, 120) bpm = _getint(macro, 32, 255, 120)
normml[0] += "T" + str(bpm) normml[0] += "T" + str(bpm)
elif char == "<":
if octave > 0:
octave -= 1
normml[0] += char
octave_tracking_onhold = True
elif char == ">":
if octave < 6:
octave += 1
normml[0] += char
octave_tracking_onhold = True
elif char == "|": elif char == "|":
normml[0] += " " normml[0] += " "
_barline(res) _barline(res)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment