Correction du path pour les chansons.

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

diff --git a/src/minwii/config.py b/src/minwii/config.py
index 9313339..f45ef84 100755 (executable)
--- a/src/minwii/config.py
+++ b/src/minwii/config.py
@@ -10,8 +10,6 @@ import pygame
 import os.path
 
 _here = os.path.abspath(__file__).split(os.path.sep)[:-1]
 import os.path
 
 _here = os.path.abspath(__file__).split(os.path.sep)[:-1]

-if _here[-2].endswith('.exe') or _here[-2].endswith('*.zip') :
-    _here.pop(-2)

 
 def _computePath(path) :
     path = path.split('/')
 
 def _computePath(path) :
     path = path.split('/')


@@ -21,8 +19,6 @@ def _computePath(path) :
 
 
 pygame.font.init()
 
 
 pygame.font.init()

-pygamedir = os.path.split(pygame.base.__file__)[0]
-default_font_file = os.path.join(pygamedir, pygame.font.get_default_font())

 
 
 # playingscreen
 
 
 # playingscreen


@@ -37,13 +33,13 @@ ON_COLUMN_OVERSIZING = 2
 ON_COLUMN_ALPHA = 1
 font_file = _computePath('fonts/Arial Unicode.ttf')
 NOTES_FONT = pygame.font.Font(font_file, 50)
 ON_COLUMN_ALPHA = 1
 font_file = _computePath('fonts/Arial Unicode.ttf')
 NOTES_FONT = pygame.font.Font(font_file, 50)

-LYRICS_FONT = pygame.font.Font(default_font_file, 80)
+LYRICS_FONT = pygame.font.Font(None, 80)

 FONT_COLOR = (0,0,0)
 MIDI_VELOCITY_RANGE = (64, 127)
 MIDI_PAN_RANGE = (32, 96)
 MIDI_VELOCITY_WRONG_NOTE_ATTN = 0.5
 
 FONT_COLOR = (0,0,0)
 MIDI_VELOCITY_RANGE = (64, 127)
 MIDI_PAN_RANGE = (32, 96)
 MIDI_VELOCITY_WRONG_NOTE_ATTN = 0.5
 

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

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