added loop flag, metronome example

Author: flipcoder

decadence.py

@@ -8,8 +8,8 @@
     decadence.py song.dc  play song
 
 Usage:
-    decadence.py [--dev=<device> | --verbose | --midi=<fn> | --ring | --follow | --csound | --supercollider] [-eftnpsrxhv] [SONGNAME]
-    decadence.py [+RANGE] [--dev=<device> | --midi=<fn> | --ring | --follow | --csound | --supercollider] [-eftnpsrxhv] [SONGNAME]
+    decadence.py [--dev=<device> | --verbose | --midi=<fn> | --ring | --follow | --csound | --supercollider | --loop] [-eftnpsrxhv] [SONGNAME]
+    decadence.py [+RANGE] [--dev=<device> | --midi=<fn> | --ring | --follow | --csound | --supercollider | --loop] [-eftnpsrxhv] [SONGNAME]
     decadence.py -c [COMMANDS ...]
     decadence.py -l [LINE_CONTENT ...]
 
@@ -26,6 +26,7 @@
     -l                    execute commands simultaenously
     -r --remote           (STUB) remote/daemon mode, keep alive
     --ring                don't mute midi on end
+    --loop                loop song
     --midi=<fn>           generate midi file
     +<range>              play from line or maker, for range use start:end
     -e --edit             (STUB) open file in editor
@@ -103,6 +104,7 @@
         elif arg == '--edit': pass
         elif arg == '-l' and val: dc.dcmode = 'l'
         elif arg == '-c' and val: dc.dcmode = 'c'
+        elif arg == '--loop': dc.add_flags(Player.Flag.LOOP)
 
 if dc.dcmode=='l':
     dc.buf = ' '.join(ARGS['LINE_CONTENT']).split(';') # ;

examples/metronome.dc

@@ -0,0 +1,5 @@
+%n=8 p=drums c10,-2 f=loop
+1        
+b5
+3
+b5

src/__init__.py

@@ -42,6 +42,8 @@
 CCHAR_START = 'TV' # control chars
 PRINT = True
 
+def bit(x):
+    return 1 << x
 def cmp(a,b):
     return bool(a>b) - bool(a<b)
 def sgn(a):

src/player.py

@@ -13,6 +13,22 @@ def __init__(self, row, caller, count):
         # self.returns[row] = 0
 
 class Player:
+    
+    class Flag:
+        ROMAN = bit(0)
+        TRANSPOSE = bit(1)
+        LOOP = bit(2)
+    FLAGS = [
+        'roman',
+        'transpose',
+        'loop'
+    ]
+    # FLAGS = set([
+    #     'roman', # STUB: fit roman chord in scale shape
+    #     'transpose', # allow transposition of note letters
+    #     'loop'
+    # ])
+
     def __init__(self):
         self.quitflag = False
         self.vimode = False
@@ -62,6 +78,35 @@ def __init__(self):
         self.last_follow = 0
         self.last_marker = -1
         self.midifile = None
+        self.flags = 0
+
+    def add_flags(self, f):
+        if isinstance(f, basestring):
+            f = 1 << self.FLAGS.index(f)
+        elif isinstance(f, int):
+            assert f > 0
+        else:
+            for e in f:
+                self.add_flags(e)
+            return
+        self.flags |= f
+    def has_flags(self, f):
+        if isinstance(f, basestring):
+            f = 1 << self.FLAGS.index(f)
+        elif isinstance(f, int):
+            assert f > 0
+        else:
+            vals = f
+            f = 0
+            i = 0
+            for e in self.FLAGS:
+                if e in vals:
+                    f |= 1 << i
+                i += 1
+            # for e in vals:
+            #     f |= 1 << self.FLAGS.index(e)
+            return
+        return self.flags & f
 
     def follow(self):
         if self.startrow==-1 and self.canfollow:
@@ -100,6 +145,10 @@ def run(self):
                         self.buf = []
                         raise IndexError
                 except IndexError:
+                    if self.has_flags(Player.Flag.LOOP):
+                        self.row = 0
+                        continue
+                    
                     self.row = len(self.buf)
                     # done with file, finish playing some stuff
 
@@ -196,7 +245,7 @@ def run(self):
                             if tok[0]==' ':
                                 tok = tok[1:]
                             var = tok[0].upper()
-                            if var in 'TGXNPSRCKO': # global vars %
+                            if var in 'TGXNPSRCKOF': # global vars %
                                 cmd = tok.split(' ')[0]
                                 op = cmd[1]
                                 try:
@@ -277,8 +326,9 @@ def run(self):
                                             else:
                                                 self.tracks[i].patch(p)
                                     elif var=='F': # flags
-                                        for i in range(len(vals)):
-                                            self.tracks[i].add_flags(val.split(','))
+                                        self.add_flags(val.split(','))
+                                        # for i in range(len(vals)): # TODO: ?
+                                        #     self.tracks[i].add_flags(val.split(','))
                                     elif var=='O':
                                         self.octave = int(val)
                                     elif var=='K':

src/track.py

@@ -25,10 +25,13 @@ def reset(self):
         self.sustain_notes = [False] * RANGE
 
 class Track(Lane):
-    FLAGS = set([
+    class Flag:
+        ROMAN = bit(0)
+        # TRANSPOSE = bit(1)
+    FLAGS = [
         'roman', # STUB: fit roman chord in scale shape
-        'transpose', # allow transposition of note letters
-    ])
+        # 'transpose', # allow transposition of note letters
+    ]
     def __init__(self, ctx, idx, midich):
         Lane.__init__(self,ctx,idx,midich)
         # self.players = [player]
@@ -76,7 +79,7 @@ def reset(self):
         self.use_sustain_pedal = False # whether to use midi sustain instead of track
         self.sustain_pedal_state = False # current midi pedal state
         # self.schedule.clear_channel(self)
-        self.flags = set()
+        self.flags = 0 # set()
         self.enabled = True
         self.soloed = False
         self.volval = 1.0
@@ -106,9 +109,21 @@ def refresh(self):
         self.volume(self.volval)
         self.ccs[7] = v
     def add_flags(self, f):
-        if f != f & FLAGS:
-            raise ParseError('invalid flags')
+        if isinstance(f, str):
+            f = 1 << FLAGS.index(f)
+        else:
+            assert f > 0
+        # if f != f & FLAGS:
+        #     raise ParseError('invalid flags')
         self.flags |= f
+    def has_flags(self, f):
+        if isinstance(f, str):
+            f = 1 << FLAGS.index(f)
+        else:
+            assert f > 0
+        # if f != f & FLAGS:
+        #     raise ParseError('invalid flags')
+        return self.flags & f
     def enable(self, v=True):
         was = v
         if not was and v: