X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=810bc2266dbe807d26d00727931cd4daddb12619;hb=aee1334ca47ff55c815eee204fe03683a572be0f;hp=54a3fdcbb65614187f5ff5c75b399bbbca239944;hpb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index 54a3fdc..810bc22 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -10,6 +10,7 @@ import audioop
 from .lock import Lock
 from . import Config, gain, debug_print, error_print
 from .mixer import Mixer
+from .music_effect import GainEffect
 
 file_lock = Lock("file")
 
@@ -81,6 +82,7 @@ class MusicFile(Machine):
         self.music_lock = Lock("music__" + filename)
         self.wait_event = threading.Event()
         self.db_gain = 0
+        self.gain_effects = []
 
         threading.Thread(name="MSMusicLoad", target=self.load).start()
 
@@ -123,7 +125,7 @@ class MusicFile(Machine):
             return 0
 
     def play(self, fade_in=0, volume=100, loop=0, start_at=0):
-        self.db_gain = gain(volume) + self.mapping.master_gain
+        self.set_gain(gain(volume) + self.mapping.master_gain, absolute=True)
         self.volume = volume
         self.loop = loop
 
@@ -133,7 +135,6 @@ class MusicFile(Machine):
             self.current_audio_segment = self.audio_segment
             self.current_frame = int(start_at * self.audio_segment.frame_rate)
             if ms_fi > 0:
-                # FIXME: apply it to repeated when looping?
                 self.a_s_with_effect = self \
                         .current_audio_segment[ms : ms+ms_fi] \
                         .fade_in(ms_fi)
@@ -212,7 +213,10 @@ class MusicFile(Machine):
         nb_frames += end_i - start_i
         self.current_frame += end_i - start_i
 
-        data = audioop.mul(data, Config.sample_width, self.volume_factor)
+        # FIXME: self.effects_next_gain should take into account the loop number
+        volume_factor = self.volume_factor(self.effects_next_gain(nb_frames))
+
+        data = audioop.mul(data, Config.sample_width, volume_factor)
 
         return [data, nb_frames]
 
@@ -221,6 +225,7 @@ class MusicFile(Machine):
         if not (self.is_loaded_playing() or self.is_loaded_paused()):
             return
         with self.music_lock:
+            self.abandon_all_effects()
             self.a_s_with_effect = None
             self.current_frame = max(
                     0,
@@ -228,6 +233,28 @@ class MusicFile(Machine):
                         + int(value * self.audio_segment.frame_rate))
         # FIXME: si on fait un seek + delta, adapter le "loop"
 
+    def effects_next_gain(self, frame_count):
+        db_gain = 0
+        for gain_effect in self.gain_effects:
+            [new_gain, last_gain] = gain_effect.get_next_gain(
+                    self.current_frame,
+                    frame_count)
+            if last_gain:
+                self.set_gain(new_gain)
+                self.gain_effects.remove(gain_effect)
+            else:
+                db_gain += new_gain
+        return db_gain
+
+
+    def abandon_all_effects(self):
+        db_gain = 0
+        for gain_effect in self.gain_effects:
+            db_gain += gain_effect.get_last_gain()
+
+        self.gain_effects = []
+        self.set_gain(db_gain)
+
     def stop(self, fade_out=0, wait=False):
         if self.is_loaded_playing():
             ms = int(self.sound_position * 1000)
@@ -244,16 +271,29 @@ class MusicFile(Machine):
             self.stop_playing()
             self.stopped()
 
-    def set_gain(self, db_gain):
-        self.db_gain += db_gain
-        self.volume_factor = 10 ** (self.db_gain / 20)
+    def volume_factor(self, additional_gain):
+        return 10 ** ( (self.db_gain + additional_gain) / 20)
+
+    def set_gain(self, db_gain, absolute=False):
+        if absolute:
+            self.db_gain = db_gain
+        else:
+            self.db_gain += db_gain
 
-    def set_volume(self, value, delta=False):
+    def set_volume(self, value, delta=False, fade=0):
         [db_gain, self.volume] = gain(
                 value + int(delta) * self.volume,
                 self.volume)
 
-        self.set_gain(db_gain)
+        if fade > 0:
+            self.gain_effects.append(GainEffect(
+                "fade",
+                self.current_audio_segment,
+                self.sound_position,
+                self.sound_position + fade,
+                gain=db_gain))
+        else:
+            self.set_gain(db_gain)
 
     def wait_end(self):
         self.wait_event.clear()