From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 17 Jul 2016 14:32:03 +0000 (+0200)
Subject: Small fixes
X-Git-Tag: 1.0.0~47
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=commitdiff_plain;h=c80ff6dc4579ab28c4064576db5a4859e639c504

Small fixes
---

diff --git a/helpers/action.py b/helpers/action.py
index 792b123..1b8fc5f 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -42,17 +42,17 @@ class Action:
         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 music_list(self, music):
         if music is not None:
             return [music]
         else:
             return self.mapping.open_files.values()
 
+    # Actions
+    def command(self, command = "", **kwargs):
+        # FIXME: todo
+        pass
+
     def pause(self, music = None, **kwargs):
         for music in self.music_list(music):
             if music.is_loaded_playing():
@@ -67,7 +67,7 @@ class Action:
             restart_if_running = False, volume = 100,
             loop = 0,
             **kwargs):
-        if music is not None:
+        for music in self.music_list(music):
             if restart_if_running:
                 if music.is_not_stopped():
                     music.stop()
@@ -131,7 +131,7 @@ class Action:
         if music is not None:
             message += "« {} »".format(music.name)
         else:
-            message += "music"
+            message += "all musics"
 
         if start_at != 0:
             message += " at {}s".format(start_at)
diff --git a/helpers/music_file.py b/helpers/music_file.py
index 5baab7e..7e5f978 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -177,8 +177,6 @@ class MusicFile(Machine):
             ms = int(self.sound_position * 1000)
             ms_fo = max(1, int(fade_out * 1000))
 
-            # FIXME: stop fade_out puis seek -5 -> on abandonne le fade ? (cf
-            # commentaire dans fonction seek
             new_audio_segment = self.current_audio_segment[:ms + ms_fo].fade_out(ms_fo)
             with self.music_lock:
                 self.current_audio_segment = new_audio_segment