Add debugger

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

diff --git a/helpers/music_file.py b/helpers/music_file.py
index f1aa341ee26f194d6af50a35d512f4fd44fe177f..5b0d0dffdf2205d90e5c7fddbb3a2723860db659 100644 (file)
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -6,7 +6,8 @@ from transitions.extensions import HierarchicalMachine as Machine
 import os.path
 
 from .lock import Lock
-from . import Config, gain
+from . import Config, gain, debug_print, error_print
+from .mixer import Mixer
 
 file_lock = Lock("file")
 
@@ -46,18 +47,19 @@ class MusicFile(Machine):
     def on_enter_loading(self):
         with file_lock:
             try:
-                print("Loading « {} »".format(self.name))
+                debug_print("Loading « {} »".format(self.name))
+                self.mixer = self.mapping.mixer or Mixer()
                 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)
                 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_')
@@ -95,7 +97,7 @@ class MusicFile(Machine):
         self.start_playing()
 
     def on_enter_loaded_playing(self):
-        self.mapping.mixer.add_file(self)
+        self.mixer.add_file(self)
 
     def finished_callback(self):
         if self.is_loaded_playing():
@@ -104,7 +106,7 @@ class MusicFile(Machine):
             self.stopped()
 
     def trigger_stopped_events(self):
-        self.mapping.mixer.remove_file(self)
+        self.mixer.remove_file(self)
         self.wait_event.set()
 
     def play_callback(self, out_data_length, frame_count):
@@ -174,8 +176,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
@@ -209,13 +209,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