From 75d6cdbac628b57e206cd37808c1d3c7fecbb9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 17 Jul 2016 13:00:29 +0200 Subject: Add new configurations parameters --- helpers/mapping.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'helpers/mapping.py') diff --git a/helpers/mapping.py b/helpers/mapping.py index 60c7691..8e0265c 100644 --- a/helpers/mapping.py +++ b/helpers/mapping.py @@ -9,7 +9,7 @@ import sys from .music_file import * from .mixer import Mixer -from . import yml_file,gain +from . import Config, gain class Mapping(RelativeLayout): expected_keys = NumericProperty(0) @@ -17,6 +17,7 @@ class Mapping(RelativeLayout): ready_color = ListProperty([1, 165/255, 0, 1]) def __init__(self, **kwargs): + self.mixer = Mixer() self.key_config, self.open_files = self.parse_config() super(Mapping, self).__init__(**kwargs) self._keyboard = Window.request_keyboard(self._keyboard_closed, self) @@ -24,8 +25,6 @@ class Mapping(RelativeLayout): self.running = [] Clock.schedule_interval(self.not_all_keys_ready, 1) - self.mixer = Mixer() - @property def master_gain(self): return gain(self.master_volume) @@ -83,7 +82,7 @@ class Mapping(RelativeLayout): self.running.remove((key, start_time)) def parse_config(self): - stream = open(yml_file(), "r") + stream = open(Config.yml_file, "r") config = yaml.load(stream) stream.close() -- cgit v1.2.3