more changes from last commit

Author: flipcoder

decadence.py

@@ -8,33 +8,33 @@
     decadence.py song.dc  play song
 
 Usage:
-    decadence.py [--midi=<fn> | --ring | --follow | --csound | --supercollider] [-eftnpsrxh] [SONGNAME]
-    decadence.py [+RANGE] [--ring || --follow | --csound | --supercollider] [-eftnpsrxh] [SONGNAME]
+    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 -c [COMMANDS ...]
     decadence.py -l [LINE_CONTENT ...]
 
 Options:
     -h --help             show this
     -v --verbose          verbose
-    -t --tempo=<bpm>      (STUB) set tempo
-    -x --grid=<g>         (STUB) set grid
-    -n --note=<n>         (STUB) set grid using note value
-    -s --speed=<s>        (STUB) playback speed
+    -t --tempo=<bpm>      (STUB) set tempo [default: 120]
+    -x --grid=<g>         (STUB) set grid [default: 4]
+    -n --note=<n>         (STUB) set grid using note value [default: 1]
+    -s --speed=<s>        (STUB) playback speed [speed: 1.0]
     --dev=<device>        output device, partial match
     -p --patch=<patch>    (STUB) default midi patch, partial match
     -c                    execute commands sequentially
     -l                    execute commands simultaenously
-    -r --remote           (STUB) remote, keep alive as daemon
+    -r --remote           (STUB) remote/daemon mode, keep alive
     --ring                don't mute midi on end
     --midi=<fn>           generate midi file
     +<range>              play from line or maker, for range use start:end
     -e --edit             (STUB) open file in editor
     --vi                  (STUB) shell vi mode
     -h --transpose        transpose (in half steps)
-    --sustain             sustain by default
+    --sustain             start with sustain enabled
     --numbers             use note numbers in output
     --notenames           use note names in output
-    --flats               prefer flats in output
+    --flats               prefer flats in output (default)
     --sharps              prefer sharps in output
     --lint                (STUB) analyze file
     --follow              (old) print newlines every line, no output
@@ -79,7 +79,8 @@
         elif arg == '--note': dc.grid = float(val)/4.0
         elif arg == '--speed': dc.speed = float(val)
         elif arg == '--verbose': dc.showtext = True
-        elif arg == '--dev': dc.portname = val
+        elif arg == '--dev':
+            dc.portname = val
         elif arg == '--vi': dc.vimode = True
         elif arg == '--patch':
             vals = val.split(',')
@@ -155,21 +156,27 @@
     print('No midi devices found.')
     sys.exit(1)    
 dev = -1
+
+# if dc.showtext:
+#     for i in range(pygame.midi.get_count()):
+#         print(pygame.midi.get_device_info(i))
+
+DEVS = get_defs()['dev']
 for i in range(pygame.midi.get_count()):
     port = pygame.midi.get_device_info(i)
+    # print(port)
     portname = port[1].decode('utf-8')
-    # print(portname)
-    devs = get_defs()['dev']
     if dc.portname:
-        if portname.lower().startswith(dc.portname.lower()):
-            dc.portname = portname
-            dev = i
-            break
-    for name in devs:
-        if portname.lower().startswith(name):
+        if dc.portname.lower() in portname.lower():
             dc.portname = portname
             dev = i
             break
+    else:
+        for name in DEVS:
+            if portname.lower().startswith(name):
+                dc.portname = portname
+                dev = i
+                break
 
 # dc.player = pygame.midi.Output(pygame.midi.get_default_output_id())
 

def/default.yaml

@@ -14,27 +14,35 @@ scales:
     wholetone:
         human: 'whole tone'
         intervals: '222222'
-    bebop: 
+    bebopmajor:
         intervals: '2212p121'
     pentatonic: 
         intervals: '23223'
         modes:
             - yo
             - minorpentatonic
             - majorpentatonic
-            - egyption
+            - egyptian
             - mangong
     blues: 
         intervals: '32p132'
     melodicminor: 
         intervals: '2122221'
+        modes:
+            - melodicminor
+            - assyrian
+            - lydianaug
+            - acoustic
+            - melodicmajor
+            - halfdim
+            - altered
     harmonicminor: 
         human: 'harmonic minor'
         intervals: '2122132'
         modes:
             - harmonicminor
             - locriann6
-            - ionianaug#5
+            - ionianaug
             - dorian#4
             - phyrigianminor
             - lydian#9
@@ -43,6 +51,7 @@ scales:
         human: 'harmonic major'
         intervals: '2122132'
         modes:
+            - harmonicmajor
             - dorianb5
             - phyrgianb4
             - lydianb3
@@ -58,7 +67,7 @@ scales:
             - ultraphyrigian
             - hungarianminor
             - oriental
-            - ionianaug
+            - ionian#2#5
             - locrianbb3bb7
     neapolitan:
         intervals: '1222221'
@@ -123,13 +132,13 @@ chords:
 
     ma: '3 5'
     mab5: '3 b5' # lyd
-    ma#4: '3 #4 5' # lydadd5
+    ma#4: '3 #4 5' # lyd5
     ma6: '3 5 6'
     ma69: '3 5 6 9'
     ma769: '3 5 6 7 9'
     m69: 'b3 5 6 9'
     ma7: '3 5 7'
-    ma7#4: '3 #4 5 7' # lyd7add5
+    ma7#4: '3 #4 5 7' # lyd75
     ma7b5: '3 b5 7' # lyd7
     ma7b9: '3 5 7 b9'
     ma7b13: '3 5 7 9 11 b13'
@@ -198,12 +207,25 @@ chords:
     dim7: 'b3 b5 bb7'
     dim9: 'b3 b5 bb7 9'
     dim11: 'b3 b5 bb7 9 11'
+    dimma7: 'b3 b5 7'
     sus: '4 5'
     sus2: '2 5'
     mm7: 'b3 5 7'
     mm9: 'b3 5 7 9'
     pow: '5 8'
 
+    # tunings (1 = lowest)
+    guitar: '4 b7 b10 12 15' # 1=E
+    bass: '4 b7 b10' # 1=E
+    bass5: '4 b7 b10 b13' # 1=B
+    bass6: '4 b7 b10 b13 16' # 1=B
+
+tune:
+    guitar: 'E,'
+    bass: 'E,,'
+    bass5: 'B,,'
+    bass6: 'B,,'
+
 chord_alts:
     r: '1'
     aug: +
@@ -216,10 +238,7 @@ chord_alts:
     sus4: sus
     ma7: ma7
     ma9: ma9
-    lyd: mab5
-    lyd7: ma7b5
-    plyd: ma#4
-    lyd5: ma#4
+    oma7: dimma7
     p: pow
     o: dim
     o7: dim7

def/dev.yaml

@@ -1,7 +1,10 @@
 dev:
+    - synth input port # linux qsynth
     - timidity port 0
-    - synth input port
     - loopmidi
+    - loopbe
     - fluidsynth-midi
+    - bassmidi driver (port a)
     #- qjackctl
     # helm will autoconnect
+    - microsoft midi mapper # lowest preference

def/informal.yaml

@@ -24,3 +24,12 @@ chords:
 #        replace: ma
 #        add: '2'
 
+chord_alts:
+    lyd: mab5
+    lyd7: ma7b5
+    plyd: ma#4
+    lyd5: ma#4
+    lyd57: ma7#4
+    plyd7: ma7#4
+    lyd75: ma7#4
+

src/__init__.py

@@ -8,7 +8,12 @@
 import yaml, colorama, appdirs
 from docopt import docopt
 import mido
-import pygame, pygame.midi
+with open(os.devnull, 'w') as devnull:
+    # suppress pygame messages
+    stdout = sys.stdout
+    sys.stdout = devnull
+    import pygame, pygame.midi
+    sys.stdout = stdout
 from multiprocessing import Process,Pipe
 from prompt_toolkit import prompt
 from prompt_toolkit.styles import style_from_dict
@@ -33,8 +38,8 @@
 RANGE = 109
 OCTAVE_BASE = 5
 DRUM_WORDS = ['drum','drums','drumset','drumkit','percussion']
-CCHAR = ' <>=~.\'`,_&|!?*\"$(){}[]%@'
-CCHAR_START = 'T' # control chars
+CCHAR = ' <>=~.\'`,_&|!?*\"$(){}[]%@;'
+CCHAR_START = 'TV' # control chars
 PRINT = True
 
 def cmp(a,b):

src/midi.py

@@ -2,6 +2,7 @@
 MIDI_CC = 0B1011
 MIDI_PROGRAM = 0B1100
 MIDI_PITCH = 0B1110
+MIDI_SUSTAIN_PEDAL = 0B1000
 GM = get_defs()['patches']
 GM_LOWER = [""]*len(GM)
 for i in range(len(GM)): GM_LOWER[i] = GM[i].lower()

src/parser.py

@@ -3,18 +3,20 @@
 def count_seq(seq, match=''):
     if not seq:
         return 0
+    r = 0
     if match == '':
-        match = seq[0]
-        seq = seq[1:]
-    r = 1
+        try:
+            match = seq[0]
+        except IndexError:
+            return 0
     for c in seq:
         if c != match:
             break
         r+=1
     return r
 
 def peel_uint(s, d=None):
-    a,b = peel_uint_s(s,d)
+    a,b = peel_uint_s(s,str(d))
     return (int(a),b)
 
 # don't cast