From: Ismaƫl Bouya Date: Fri, 24 Jun 2016 12:26:44 +0000 (+0200) Subject: Fix fade_out X-Git-Tag: 1.0.0~85 X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=commitdiff_plain;h=92cc4ce2e6d3372c167117c55069cad8a2e69965 Fix fade_out --- diff --git a/helpers/action.py b/helpers/action.py index 1cb1686..42a08d0 100644 --- a/helpers/action.py +++ b/helpers/action.py @@ -69,7 +69,7 @@ class Action: music.stop(fade_out = fade_out) else: if fade_out > 0: - pygame.fadeout(fade_out * 1000) + pygame.fadeout(int(fade_out * 1000)) else: pygame.mixer.stop() diff --git a/helpers/music_file.py b/helpers/music_file.py index 1078459..667c169 100644 --- a/helpers/music_file.py +++ b/helpers/music_file.py @@ -42,7 +42,7 @@ class MusicFile: else: sound = pygame.mixer.Sound(self.raw_data) - self.channel().play(sound, fade_ms = fade_in * 1000) + self.channel().play(sound, fade_ms = int(fade_in * 1000)) self.flag_paused = False def pause(self): @@ -55,7 +55,7 @@ class MusicFile: def stop(self, fade_out = 0): if fade_out > 0: - self.channel().fadeout(fade_out * 1000) + self.channel().fadeout(int(fade_out * 1000)) else: self.channel().stop()