X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/8df567a914cb4a0ffe5e3401945a14dcc248ebac..e7854ed82aa375273bfbf772493739f875817061:/src/app/config.py

diff --git a/src/app/config.py b/src/app/config.py
index 2482512..f98238b 100755
--- a/src/app/config.py
+++ b/src/app/config.py
@@ -8,12 +8,20 @@ $URL$
 
 import pygame
 import os.path
+
+_here = os.path.abspath(__file__).split(os.path.sep)[:-1]
+def _computePath(path) :
+    path = path.split('/')
+    path = _here + path
+    path = os.path.abspath(os.path.sep.join(path))
+    return path
+
+
 pygame.font.init()
 
 
 # playingscreen
-FRAMERATE = 50
-BORDER = 0 # 5px
+FRAMERATE = 100
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1
@@ -22,11 +30,15 @@ ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 2
 ON_COLUMN_ALPHA = 1
-FONT = pygame.font.Font(None, 80)
+font_file = _computePath('fonts/Arial Unicode.ttf')
+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)
+MIDI_VELOCITY_WRONG_NOTE_ATTN = 0.5
 
-SONG_FILE_PATH = '../../chansons'
+SONG_FILE_PATH = _computePath('../../chansons')
 
 INSTRUMENTS = (
     {'name'   : 'accordeon',
@@ -35,7 +47,8 @@ INSTRUMENTS = (
     },
     {'name' : 'celesta',
      'bank'   : 0,
-     'preset' : 8
+     'preset' : 8,
+     'octave' : 1
     },
     {'name' : 'flute',
      'bank'   : 0,
@@ -43,7 +56,8 @@ INSTRUMENTS = (
     },
     {'name' : 'guitare',
      'bank'   : 0,
-     'preset' : 24
+     'preset' : 24,
+     'octave' : -1
     },
     {'name' : 'orgue',
      'bank'   : 0,
@@ -55,7 +69,8 @@ INSTRUMENTS = (
     },
     {'name' : 'tuba',
      'bank'   : 0,
-     'preset' : 58
+     'preset' : 58,
+     'octave' : -2
     },
     {'name' : 'violon',
      'bank'   : 0,
@@ -63,14 +78,10 @@ INSTRUMENTS = (
     },
     {'name' : 'violoncelle',
      'bank'   : 0,
-     'preset' : 42
+     'preset' : 42,
+     'octave' : -2
     },
 )
 
-# cuisine : ne pas modifier
-_here = os.path.abspath(__file__).split(os.path.sep)[:-1]
-SONG_FILE_PATH = SONG_FILE_PATH.split('/')
-SONG_FILE_PATH = _here + SONG_FILE_PATH
-SONG_FILE_PATH = os.path.abspath(os.path.sep.join(SONG_FILE_PATH))
-
-
+for i in INSTRUMENTS :
+    i['octave'] = i.get('octave', 0)
\ No newline at end of file