X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=music_sampler%2Fmapping.py;h=e589ac0a93edfdb234587e25ab6cb1d15a4d7d1b;hb=ca3264c828e5220e9d729152572de7a4600149b4;hp=74feec886f6f37b623b484314ac0012b927abafb;hpb=0a557acb3e9842114e752270fa8863ae1890c402;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py index 74feec8..e589ac0 100644 --- a/music_sampler/mapping.py +++ b/music_sampler/mapping.py @@ -124,22 +124,24 @@ 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": - thread.join() - elif thread.__class__ == threading.Timer: - thread.cancel() - thread.join() - + self.leave_application() sys.exit() elif 'ctrl' in modifiers and keycode[0] == 114: threading.Thread(name="MSReload", target=self.reload).start() return True + def leave_application(self): + 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": + thread.join() + elif thread.__class__ == threading.Timer: + thread.cancel() + thread.join() + # Helpers def allowed_modifiers(self, modifiers): allowed = []