fixed note omission in chord names

Author: flipcoder

textbeat/parser.py

@@ -93,7 +93,7 @@ def peel_any(s, match, d=''):
             ct += 1
         else:
             break
-    return (ct,orr(r,d))
+    return (orr(r,d),ct)
 
 def note_value(s): # turns dot note values (. and *) into frac
     if not s:

textbeat/player.py

@@ -1017,28 +1017,42 @@ def run(self):
                                         try:
                                             # TODO: addchords
 
-                                            # TODO note removal (Maj7no5)
+                                            # TODO omit note (Maj7no5)
                                             if chordname[-2:]=='no':
-                                                numberpart = tok[cut+1:]
+                                                # print(tok)
+                                                # print(cut)
+                                                cut += 1 # The 'o' of no
+                                                numberpart = tok[cut:]
+                                                # print(numberpart)
                                                 # second check will throws
-                                                if numberpart in '#b' or (int(numberpart) or True):
+                                                int_numberpart = None
+                                                try:
+                                                    int_numberpart = int(numberpart)
+                                                except ValueError:
+                                                    pass
+                                                if numberpart[0] in '#b' or int_numberpart!=None:
                                                     # if tok[]
                                                     prefix,ct = peel_any(tok[cut:],'#b')
+                                                    # print('prefix', prefix)
+                                                    # print('ct', ct)
                                                     if ct: cut += ct
 
-                                                    num,ct = peel_uint(tok[cut+1:])
+                                                    num,ct = peel_uint(tok[cut:])
                                                     if ct:
-                                                        out(num)
                                                         cut += ct
-                                                        cut -= 2 # remove "no"
-                                                        chordname = chordname[:-2] # cut "no
-                                                        nonotes.append(str(prefix)+str(num)) # ex: b5
+                                                        # cut += 1 # remove "no"
+                                                        chordname = chordname[:-2] # cut "no"
+                                                        if prefix:
+                                                            nonotes.append(str(prefix)+str(num)) # ex: b5
+                                                        else:
+                                                            nonotes.append(str(num)) # ex: b5
+                                                        # print(nonotes)
                                                         break
 
                                                 # cut += 2
 
                                         except IndexError:
-                                            log('chordname length ' + str(len(chordname)))
+                                            log('bad chordname index')
                                             pass # chordname length
                                         except ValueError:
                                             log('bad cast ' + char)

textbeat/schedule.py

@@ -14,6 +14,7 @@ def __init__(self, ctx):
         # we'll need to reenter knowing this value
         self.passed = 0.0 
         self.clock = 0.0
+        self.last_clock = 0
         self.started = False
     # all note mute and play events should be marked skippable
     def pending(self):
@@ -30,6 +31,12 @@ def logic(self, t):
         processed = 0
         self.passed = 0
 
+        # if self.last_clock == 0:
+        #     self.last_clock = time.clock()
+        # clock = time.clock()
+        # self.dontsleep = (clock - self.last_clock)
+        # self.last_clock = clock
+
         # clock = time.clock()
         # if self.started:
         #     tdelta = (clock - self.passed)
@@ -50,20 +57,20 @@ def logic(self, t):
                     # sleep until next event
                     if ev.t >= 0.0:
                         if self.ctx.cansleep and self.ctx.startrow == -1:
-                            self.ctx.t += self.ctx.speed*t*(ev.t-self.passed)
-                            time.sleep(self.ctx.speed*t*(ev.t-self.passed))
+                            self.ctx.t += self.ctx.speed * t * (ev.t-self.passed)
+                            time.sleep(max(0,self.ctx.speed * t * (ev.t-self.passed)))
                         ev.func(0)
                         self.passed = ev.t # only inc if positive
                     else:
                         ev.func(0)
 
                     processed += 1
 
-            slp = t*(1.0-self.passed) # remaining time
+            slp = t * (1.0 - self.passed) # remaining time
             if slp > 0.0:
                 self.ctx.t += self.ctx.speed*slp
                 if self.ctx.cansleep and self.ctx.startrow == -1:
-                    time.sleep(self.ctx.speed*slp)
+                    time.sleep(max(0,self.ctx.speed*slp))
             self.passed = 0.0
 
             self.events = self.events[processed:]