Prise en charge de la touche « esc » pour quitter les écrans de sélectien d'instrumen...

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

diff --git a/src/minwii/config.py b/src/minwii/config.py
index 14ec709..eada9b9 100755 (executable)
--- a/src/minwii/config.py
+++ b/src/minwii/config.py
@@ -41,12 +41,13 @@ conf.set('playingscreen', 'MIDI_VELOCITY_RANGE', '(64, 127)')
 conf.set('playingscreen', 'MIDI_PAN_RANGE', '(32, 96)')
 conf.set('playingscreen', 'MIDI_VELOCITY_WRONG_NOTE_ATTN', '0.5')
 conf.set('playingscreen', 'IR_POSITION', 'ABOVE')
+conf.set('playingscreen', 'SCREEN_RESOLUTION', '(1024, 768)')
 
 conf.add_section('locations')
 conf.set('locations', 'notes_font_file', _computePath('fonts/Arial Unicode.ttf'))
 conf.set('locations', 'SONG_FILE_PATH', _computePath('../chansons'))
 conf.set('locations', 'LOGS_DIR', os.path.join(os.path.expanduser('~'), 'minwii_logs'))
-conf.set('locations', 'SOUND_FONT', _computePath('soundfonts/FluidR3_GM.sf2'))
+conf.set('locations', 'SOUND_FONT', _computePath('soundfonts/Minwii-light-soundfont.sf2'))
 
 # customisation
 conf.read(_computePath('../minwii.ini'))
@@ -65,6 +66,7 @@ MIDI_VELOCITY_RANGE = str2IntTuple(conf.get('playingscreen', 'MIDI_VELOCITY_RANG
 MIDI_PAN_RANGE = str2IntTuple(conf.get('playingscreen', 'MIDI_PAN_RANGE'))
 MIDI_VELOCITY_WRONG_NOTE_ATTN = conf.getfloat('playingscreen', 'MIDI_VELOCITY_WRONG_NOTE_ATTN')
 IR_POSITION = conf.get('playingscreen', 'IR_POSITION')
+SCREEN_RESOLUTION = str2IntTuple(conf.get('playingscreen', 'SCREEN_RESOLUTION'))
 
 SONG_FILE_PATH = conf.get('locations', 'SONG_FILE_PATH')
 LOGS_DIR = conf.get('locations', 'LOGS_DIR')
@@ -79,11 +81,11 @@ instruments.set('accordeon', 'bank', '0')
 instruments.set('accordeon', 'preset', '23')
 instruments.set('accordeon', 'pos', '0')
 
-instruments.add_section('celesta')
-instruments.set('celesta', 'bank', '0')
-instruments.set('celesta', 'preset', '8')
-instruments.set('celesta', 'octave', '1')
-instruments.set('celesta', 'pos', '1')
+instruments.add_section('carillon')
+instruments.set('carillon', 'bank', '0')
+instruments.set('carillon', 'preset', '8')
+instruments.set('carillon', 'octave', '1')
+instruments.set('carillon', 'pos', '1')
 
 instruments.add_section('flute')
 instruments.set('flute', 'bank', '0')