X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=56060bd8d9368ab8e9e08d7f2cd9a4f7b37f0c1d;hb=ccda4cb91686d4c2b70f0c26d21c26ac3d03c3b9;hp=efa8628b83c4b078abd6d87b00f30edace769310;hpb=d6290f14246b69e10a73e2798dd3905e866b3e88;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index efa8628..56060bd 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -5,8 +5,10 @@ from transitions.extensions import HierarchicalMachine as Machine
 
 import os.path
 
+import audioop
+
 from .lock import Lock
-from . import Config, gain
+from . import Config, gain, debug_print, error_print
 from .mixer import Mixer
 
 file_lock = Lock("file")
@@ -32,35 +34,35 @@ class MusicFile(Machine):
 
         Machine.__init__(self, states=states, transitions=transitions, initial='initial')
 
-        # FIXME: catch error here
-        self.mixer = mapping.mixer or Mixer()
         self.volume = 100
         self.mapping = mapping
         self.filename = filename
         self.name = name or filename
         self.audio_segment = None
         self.audio_segment_frame_width = 0
-        self.volume_factor = gain
+        self.initial_volume_factor = gain
         self.music_lock = Lock("music__" + filename)
         self.wait_event = threading.Event()
+        self.db_gain = 0
 
         threading.Thread(name = "MSMusicLoad", target = self.load).start()
 
     def on_enter_loading(self):
         with file_lock:
             try:
-                print("Loading « {} »".format(self.name))
-                db_gain = gain(self.volume_factor * 100)
-                self.audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(Config.frame_rate).set_channels(Config.channels).set_sample_width(Config.sample_width).apply_gain(db_gain)
+                debug_print("Loading « {} »".format(self.name))
+                self.mixer = self.mapping.mixer or Mixer()
+                initial_db_gain = gain(self.initial_volume_factor * 100)
+                self.audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(Config.frame_rate).set_channels(Config.channels).set_sample_width(Config.sample_width).apply_gain(initial_db_gain)
                 self.audio_segment_frame_width = self.audio_segment.frame_width
                 self.sound_duration = self.audio_segment.duration_seconds
             except Exception as e:
-                print("failed to load « {} »: {}".format(self.name, e))
+                error_print("failed to load « {} »: {}".format(self.name, e))
                 self.loading_error = e
                 self.fail()
             else:
                 self.success()
-                print("Loaded « {} »".format(self.name))
+                debug_print("Loaded « {} »".format(self.name))
 
     def check_is_loaded(self):
         return self.state.startswith('loaded_')
@@ -79,14 +81,14 @@ class MusicFile(Machine):
             return 0
 
     def play(self, fade_in = 0, volume = 100, loop = 0, start_at = 0):
-        db_gain = gain(volume) + self.mapping.master_gain
+        self.db_gain = gain(volume) + self.mapping.master_gain
         self.volume = volume
         self.loop = loop
 
         ms = int(start_at * 1000)
         ms_fi = int(fade_in * 1000)
         with self.music_lock:
-            self.current_audio_segment = (self.audio_segment + db_gain)
+            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?
@@ -161,6 +163,8 @@ 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)
+
         return [data, nb_frames]
 
     def seek(self, value = 0, delta = False):
@@ -177,8 +181,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
@@ -190,18 +192,8 @@ class MusicFile(Machine):
             self.stopped()
 
     def set_gain(self, db_gain):
-        if not self.is_not_stopped():
-            return
-
-        new_audio_segment = self.current_audio_segment + db_gain
-
-        new_a_s_with_effect = None
-        if self.a_s_with_effect is not None:
-            new_a_s_with_effect = self.a_s_with_effect + db_gain
-
-        with self.music_lock:
-            self.current_audio_segment = new_audio_segment
-            self.a_s_with_effect = new_a_s_with_effect
+        self.db_gain += db_gain
+        self.volume_factor = 10 ** (self.db_gain / 20)
 
     def set_volume(self, value, delta = False):
         [db_gain, self.volume] = gain(value + int(delta) * self.volume, self.volume)
@@ -212,13 +204,3 @@ class MusicFile(Machine):
         self.wait_event.clear()
         self.wait_event.wait()
 
-# Add some more functions to AudioSegments
-def get_sample_slice_data(self, start_sample=0, end_sample=float('inf')):
-    max_val = int(self.frame_count())
-
-    start_i = max(start_sample, 0) * self.frame_width
-    end_i =   min(end_sample, max_val) * self.frame_width
-
-    return self._data[start_i:end_i]
-
-pydub.AudioSegment.get_sample_slice_data = get_sample_slice_data