Make music_sampler multilingual

[perso/Immae/Projets/Python/MusicSampler.git] / music_sampler / mapping.py

diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py
index ca471ef7115a3762870c3e5177e996a9c56273af..74feec886f6f37b623b484314ac0012b927abafb 100644 (file)
--- a/music_sampler/mapping.py
+++ b/music_sampler/mapping.py
@@ -93,8 +93,7 @@ class Mapping(RelativeLayout):
             self.key_config, self.open_files = self.parse_config()
         except Exception as e:
             error_print("Error while loading configuration: {}".format(e),
-                    with_trace=True)
-            sys.exit()
+                    with_trace=True, exit=True)
         else:
             self.success()
 
@@ -125,11 +124,16 @@ class Mapping(RelativeLayout):
             threading.Thread(name="MSKeyAction", target=key.run,
                     args=['-'.join(modifiers)]).start()
         elif 'ctrl' in modifiers and (keycode[0] == 113 or keycode[0] == '99'):
+            self.keyboard.unbind(on_key_down=self.on_keyboard_down)
             self.stop_all_running()
+            for music in self.open_files.values():
+                music.stop()
             for thread in threading.enumerate():
-                if thread.getName()[0:2] != "MS":
-                    continue
-                thread.join()
+                if thread.getName()[0:2] == "MS":
+                    thread.join()
+                elif thread.__class__ == threading.Timer:
+                    thread.cancel()
+                    thread.join()
 
             sys.exit()
         elif 'ctrl' in modifiers and keycode[0] == 114:
@@ -306,12 +310,13 @@ class Mapping(RelativeLayout):
         try:
             config = yaml.safe_load(stream)
         except Exception as e:
-            error_print("Error while loading config file: {}".format(e))
-            sys.exit()
+            error_print("Error while loading config file: {}".format(e),
+                    exit=True)
         stream.close()
 
         if not isinstance(config, dict):
-            raise Exception("Top level config is supposed to be a hash")
+            error_print("Top level config is supposed to be a hash",
+                    exit=True)
 
         if 'aliases' in config and isinstance(config['aliases'], dict):
             aliases = config['aliases']