doc++

[minwii.git] / src / app / config.py

diff --git a/src/app/config.py b/src/app/config.py
index 00d0b89..a8410d2 100755 (executable)
--- a/src/app/config.py
+++ b/src/app/config.py
@@ -8,11 +8,20 @@ $URL$
 
 import pygame
 import os.path
 
 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
 pygame.font.init()
 
 
 # playingscreen

-FRAMERATE = 50
+FRAMERATE = 100

 BORDER = 0 # 5px
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 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
 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
 
 FONT_COLOR = (0,0,0)
 DEFAULT_MIDI_VELOCITY = 96
 

-SONG_FILE_PATH = '../../chansons'
+SONG_FILE_PATH = _computePath('../../chansons')

 
 INSTRUMENTS = (
     {'name'   : 'accordeon',
 
 INSTRUMENTS = (
     {'name'   : 'accordeon',


@@ -35,15 +46,17 @@ INSTRUMENTS = (
     },
     {'name' : 'celesta',
      'bank'   : 0,
     },
     {'name' : 'celesta',
      'bank'   : 0,

-     'preset' : 8
+     'preset' : 8,
+     'octave' : 1

     },
     {'name' : 'flute',
      'bank'   : 0,
     },
     {'name' : 'flute',
      'bank'   : 0,

-     'preset' : 74
+     'preset' : 73

     },
     {'name' : 'guitare',
      'bank'   : 0,
     },
     {'name' : 'guitare',
      'bank'   : 0,

-     'preset' : 24
+     'preset' : 24,
+     'octave' : -1

     },
     {'name' : 'orgue',
      'bank'   : 0,
     },
     {'name' : 'orgue',
      'bank'   : 0,


@@ -55,7 +68,8 @@ INSTRUMENTS = (
     },
     {'name' : 'tuba',
      'bank'   : 0,
     },
     {'name' : 'tuba',
      'bank'   : 0,

-     'preset' : 58
+     'preset' : 58,
+     'octave' : -2

     },
     {'name' : 'violon',
      'bank'   : 0,
     },
     {'name' : 'violon',
      'bank'   : 0,


@@ -63,14 +77,7 @@ INSTRUMENTS = (
     },
     {'name' : 'violoncelle',
      'bank'   : 0,
     },
     {'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))
-
-