aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helpers/__init__.py6
-rw-r--r--helpers/mapping.py6
-rw-r--r--helpers/music_file.py1
3 files changed, 7 insertions, 6 deletions
diff --git a/helpers/__init__.py b/helpers/__init__.py
index 863a23b..ce8f04b 100644
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -32,9 +32,9 @@ def parse_args():
32 default="config.yml", 32 default="config.yml",
33 required=False, 33 required=False,
34 help="Config file to load") 34 help="Config file to load")
35 parser.add_argument("-m", "--no-mixing", 35 parser.add_argument("-m", "--builtin-mixing",
36 action="store_true", 36 action="store_true",
37 help="Don't make the mixing of sounds manually and let the sound system do it") 37 help="Make the mixing of sounds manually (do it if the system cannot handle it correctly)")
38 parser.add_argument("-l", "--latency", 38 parser.add_argument("-l", "--latency",
39 default="high", 39 default="high",
40 required=False, 40 required=False,
@@ -83,7 +83,7 @@ def parse_args():
83 Config.frame_rate = args.frame_rate 83 Config.frame_rate = args.frame_rate
84 Config.channels = args.channels 84 Config.channels = args.channels
85 Config.sample_width = args.sample_width 85 Config.sample_width = args.sample_width
86 Config.no_mixing = args.no_mixing 86 Config.builtin_mixing = args.builtin_mixing
87 87
88class SelectDeviceAction(argparse.Action): 88class SelectDeviceAction(argparse.Action):
89 def __call__(self, parser, namespace, values, option_string=None): 89 def __call__(self, parser, namespace, values, option_string=None):
diff --git a/helpers/mapping.py b/helpers/mapping.py
index cfc2c3f..bc8ccba 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -17,10 +17,10 @@ class Mapping(RelativeLayout):
17 ready_color = ListProperty([1, 165/255, 0, 1]) 17 ready_color = ListProperty([1, 165/255, 0, 1])
18 18
19 def __init__(self, **kwargs): 19 def __init__(self, **kwargs):
20 if Config.no_mixing: 20 if Config.builtin_mixing:
21 self.mixer = None
22 else:
23 self.mixer = Mixer() 21 self.mixer = Mixer()
22 else:
23 self.mixer = None
24 self.key_config, self.open_files = self.parse_config() 24 self.key_config, self.open_files = self.parse_config()
25 super(Mapping, self).__init__(**kwargs) 25 super(Mapping, self).__init__(**kwargs)
26 self._keyboard = Window.request_keyboard(self._keyboard_closed, self) 26 self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
diff --git a/helpers/music_file.py b/helpers/music_file.py
index f391ff4..efa8628 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -32,6 +32,7 @@ class MusicFile(Machine):
32 32
33 Machine.__init__(self, states=states, transitions=transitions, initial='initial') 33 Machine.__init__(self, states=states, transitions=transitions, initial='initial')
34 34
35 # FIXME: catch error here
35 self.mixer = mapping.mixer or Mixer() 36 self.mixer = mapping.mixer or Mixer()
36 self.volume = 100 37 self.volume = 100
37 self.mapping = mapping 38 self.mapping = mapping