X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Faction.py;h=3dc1b8daf396f1316049b2d707ed2f47316d551e;hb=52d58baf7a39e5e09a0b4ce24b1e951d98e7618b;hp=b921fbff18c8a263d9473b748c0602a36aed6445;hpb=60979de4e9f5f3f249f4887b8fecfe94f233b3d4;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git diff --git a/helpers/action.py b/helpers/action.py index b921fbf..3dc1b8d 100644 --- a/helpers/action.py +++ b/helpers/action.py @@ -1,4 +1,4 @@ -import pygame +import threading import time class Action: @@ -6,6 +6,7 @@ class Action: 'command', 'pause', 'play', + 'seek', 'stop', 'stop_all_actions', 'unpause', @@ -20,7 +21,9 @@ class Action: raise Exception("Unknown action {}".format(action)) self.key = key + self.mapping = key.parent self.arguments = kwargs + self.sleep_event = None def ready(self): if 'music' in self.arguments: @@ -35,65 +38,76 @@ class Action: def description(self): return getattr(self, self.action + "_print")(**self.arguments) + def interrupt(self): + if getattr(self, self.action + "_interrupt", None): + return getattr(self, self.action + "_interrupt")(**self.arguments) + + # Actions def command(self, command = "", **kwargs): + # FIXME: todo pass - def pause(self, music = None, **kwargs): + def music_list(self, music): if music is not None: - music.pause() + return [music] else: - for music in self.key.parent.open_files.values(): - if music.is_playing() and not music.is_paused(): - music.pause() + return self.mapping.open_files.values() + + def pause(self, music = None, **kwargs): + for music in self.music_list(music): + if music.is_loaded_playing(): + music.pause() def unpause(self, music = None, **kwargs): - if music is not None: - music.unpause() - else: - for music in self.key.parent.open_files.values(): - if music.is_playing() and music.is_paused(): - music.unpause() + for music in self.music_list(music): + if music.is_loaded_paused(): + music.unpause() def play(self, music = None, fade_in = 0, start_at = 0, restart_if_running = False, volume = 100, **kwargs): if music is not None: if restart_if_running: - if music.is_playing(): + if music.is_not_stopped(): music.stop() music.play(volume = volume, fade_in = fade_in, start_at = start_at) else: - if not music.is_playing(): + if not music.is_not_stopped(): music.play(volume = volume, fade_in = fade_in, start_at = start_at) - else: - pygame.mixer.unpause() - def stop(self, music = None, fade_out = 0, **kwargs): - if music is not None: - music.stop(fade_out = fade_out) - else: - if fade_out > 0: - pygame.mixer.fadeout(int(fade_out * 1000)) - else: - pygame.mixer.stop() + def seek(self, music = None, value = 0, delta = False, **kwargs): + for music in self.music_list(music): + music.seek(value = value, delta = delta) + + def stop(self, music = None, fade_out = 0, wait = False, **kwargs): + previous = None + for music in self.music_list(music): + if music.is_loaded_paused() or music.is_loaded_playing(): + if previous is not None: + previous.stop(fade_out = fade_out) + previous = music + + if previous is not None: + previous.stop(fade_out = fade_out, wait = wait) def stop_all_actions(self, **kwargs): - self.key.parent.stop_all_running() + self.mapping.stop_all_running() - def volume(self, music = None, value = 100, **kwargs): + def volume(self, music = None, value = 100, delta = False, **kwargs): if music is not None: - music.set_volume(value) + music.set_volume(value, delta = delta) else: - pass + self.mapping.set_master_volume(value, delta = delta) def wait(self, duration = 0, music = None, **kwargs): - # FIXME: Make it stoppable - # http://stackoverflow.com/questions/29082268/python-time-sleep-vs-event-wait - if music is None: - time.sleep(duration) - else: - # TODO + self.sleep_event = threading.Event() + + if music is not None: music.wait_end() + threading.Timer(duration, self.sleep_event.set).start() + self.sleep_event.wait() + + # Action messages def command_print(self, command = "", **kwargs): return "running command {}".format(command) @@ -130,28 +144,60 @@ class Action: return message - def stop_print(self, music = None, fade_out = 0, **kwargs): + def stop_print(self, music = None, fade_out = 0, wait = False, **kwargs): + message = "stopping " if music is not None: - if fade_out == 0: - return "stopping music « {} »".format(music.name) - else: - return "stopping music « {} » with {}s fadeout".format(music.name, fade_out) + message += "music « {} »".format(music.name) else: - if fade_out == 0: - return "stopping all musics" - else: - return "stopping all musics with {}s fadeout".format(fade_out) + message += "all musics" + + if fade_out > 0: + message += " with {}s fadeout".format(fade_out) + if wait: + message += " (waiting the end of fadeout)" + + return message def stop_all_actions_print(self, **kwargs): return "stopping all actions" - def volume_print(self, music = None, value = 100, **kwargs): - if music is not None: - return "setting volume of « {} » to {}%".format(music.name, value) + def seek_print(self, music = None, value = 0, delta = False, **kwargs): + if delta: + if music is not None: + return "moving music « {} » by {:+d}s".format(music.name, value) + else: + return "moving all musics by {:+d}s".format(value) + else: + if music is not None: + return "moving music « {} » to position {}s".format(music.name, value) + else: + return "moving all musics to position {}s".format(value) + + def volume_print(self, music = None, value = 100, delta = False, **kwargs): + if delta: + if music is not None: + return "{:+d}% to volume of « {} »".format(value, music.name) + else: + return "{:+d}% to volume".format(value) + else: + if music is not None: + return "setting volume of « {} » to {}%".format(music.name, value) + else: + return "setting volume to {}%".format(value) + + def wait_print(self, duration = 0, music = None, **kwargs): + if music is None: + return "waiting {}s".format(duration) + elif duration == 0: + return "waiting the end of « {} »".format(music.name) else: - return "setting volume to {}%".format(value) + return "waiting the end of « {} » + {}s".format(music.name, duration) - def wait_print(self, duration, **kwargs): - return "waiting {}s".format(duration) + # Interruptions + def wait_interrupt(self, duration = 0, music = None, **kwargs): + if self.sleep_event is not None: + self.sleep_event.set() + if music is not None: + music.wait_event.set()