X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/6bfe9ce8372febedd68290beef0405405062b17b..972649bb3a4feb51c6073c99ad10a82d50786717:/src/app/config.py

diff --git a/src/app/config.py b/src/app/config.py
index ebca47b..1c2b9bd 100755
--- a/src/app/config.py
+++ b/src/app/config.py
@@ -8,11 +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
+FRAMERATE = 100
 BORDER = 0 # 5px
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
@@ -22,11 +31,13 @@ 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
 
-SONG_FILE_PATH = '../../chansons'
+SONG_FILE_PATH = _computePath('../../chansons')
 
 INSTRUMENTS = (
     {'name'   : 'accordeon',
@@ -71,10 +82,5 @@ INSTRUMENTS = (
     },
 )
 
-# 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