Reorder MusicFile methods

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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index d60e709bde0a80e96be783131d5ad4b847be6faa..c2a94e67baa52f3bfe4b06eccb78d88741805789 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -10,7 +10,6 @@ import sys
 from .music_file import *
 from .mixer import Mixer
 from . import Config, gain, error_print
-from .music_effect import GainEffect
 from .action import Action
 
 class Mapping(RelativeLayout):
@@ -47,19 +46,7 @@ class Mapping(RelativeLayout):
                 self.master_volume)
 
         for music in self.open_files.values():
-            if not (music.is_loaded_playing() or music.is_loaded_paused()):
-                continue
-
-            if fade > 0:
-                music.gain_effects.append(GainEffect(
-                    "fade",
-                    music.current_audio_segment,
-                    music.current_loop,
-                    music.sound_position,
-                    music.sound_position + fade,
-                    gain=db_gain))
-            else:
-                music.set_gain(db_gain)
+            music.set_gain_with_effect(db_gain, fade=fade)
 
     def add_wait_id(self, wait_id, action_or_wait):
         self.wait_ids[wait_id] = action_or_wait