X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/64f8cd4d684f0be29308516446a85432c6a4d396..b0a3123973062597484f6bc64ad0900eddc21ba7:/src/app/config.py

diff --git a/src/app/config.py b/src/app/config.py
index 2de1b90..d8bdd6c 100755
--- a/src/app/config.py
+++ b/src/app/config.py
@@ -21,8 +21,7 @@ pygame.font.init()
 
 
 # playingscreen
-FRAMERATE = 50
-BORDER = 0 # 5px
+FRAMERATE = 100
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1
@@ -32,9 +31,11 @@ ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 2
 ON_COLUMN_ALPHA = 1
 font_file = _computePath('fonts/Arial Unicode.ttf')
-FONT = pygame.font.Font(font_file, 50)
+NOTES_FONT = pygame.font.Font(font_file, 50)
+LYRICS_FONT = pygame.font.Font(None, 80)
 FONT_COLOR = (0,0,0)
-DEFAULT_MIDI_VELOCITY = 96
+MIDI_VELOCITY_RANGE = (64, 127)
+MIDI_PAN_RANGE = (32, 96)
 
 SONG_FILE_PATH = _computePath('../../chansons')
 
@@ -80,3 +81,6 @@ INSTRUMENTS = (
      'octave' : -2
     },
 )
+
+for i in INSTRUMENTS :
+    i['octave'] = i.get('octave', 0)
\ No newline at end of file