X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=916b95526fcff251d09717577e2d23a77273e9c3;hb=ea97edb3ea6fc9a222d7ec43ff517276a25c7f14;hp=a972bc5bc965b9a59634897587e807640d24725b;hpb=e55b29bb38b845c7b9e65a1fbca0198882658e14;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index a972bc5..916b955 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -92,6 +92,31 @@ class MusicFile:
 
         threading.Thread(name="MSMusicLoad", target=self.load).start()
 
+    def reload_properties(self, name=None, gain=1):
+        self.name = name or self.filename
+        if gain != self.initial_volume_factor:
+            self.initial_volume_factor = gain
+            self.reload_music_file()
+
+    def reload_music_file(self):
+        with file_lock:
+            try:
+                debug_print("Reloading « {} »".format(self.name))
+                initial_db_gain = gain(self.initial_volume_factor * 100)
+                self.audio_segment = pydub.AudioSegment \
+                        .from_file(Config.music_path + self.filename) \
+                        .set_frame_rate(Config.frame_rate) \
+                        .set_channels(Config.channels) \
+                        .set_sample_width(Config.sample_width) \
+                        .apply_gain(initial_db_gain)
+            except Exception as e:
+                error_print("failed to reload « {} »: {}"\
+                        .format(self.name, e))
+                self.loading_error = e
+                self.to_failed()
+            else:
+                debug_print("Reloaded « {} »".format(self.name))
+
     # Machine related events
     def on_enter_loading(self):
         with file_lock:
@@ -100,7 +125,7 @@ class MusicFile:
                 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) \
+                        .from_file(Config.music_path + self.filename) \
                         .set_frame_rate(Config.frame_rate) \
                         .set_channels(Config.channels) \
                         .set_sample_width(Config.sample_width) \
@@ -115,6 +140,9 @@ class MusicFile:
                 debug_print("Loaded « {} »".format(self.name))
 
     def on_enter_loaded(self):
+        self.cleanup()
+
+    def cleanup(self):
         self.gain_effects = []
         self.set_gain(0, absolute=True)
         self.current_audio_segment = None
@@ -136,6 +164,7 @@ class MusicFile:
     def trigger_stopped_events(self):
         self.mixer.remove_file(self)
         self.wait_event.set()
+        self.cleanup()
 
     # Actions and properties called externally
     @property