X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=f1aa341ee26f194d6af50a35d512f4fd44fe177f;hb=75d6cdbac628b57e206cd37808c1d3c7fecbb9eb;hp=6da547b8473678b78985272ed7b72f548ab4b368;hpb=22514f3ae6d4e19537ae5ab6bdb5bc9f99a64f47;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index 6da547b..f1aa341 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -6,7 +6,7 @@ from transitions.extensions import HierarchicalMachine as Machine
 import os.path
 
 from .lock import Lock
-from . import gain
+from . import Config, gain
 
 file_lock = Lock("file")
 
@@ -48,7 +48,7 @@ class MusicFile(Machine):
             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(44100).set_channels(2).set_sample_width(2).apply_gain(db_gain)
+                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:
@@ -121,6 +121,7 @@ class MusicFile(Machine):
                     data += new_data
                     nb_frames += new_nb_frames
                 elif nb_frames == 0:
+                    # FIXME: too slow
                     threading.Thread(name = "MSFinishedCallback", target=self.finished_callback).start()
 
             return data.ljust(out_data_length, b'\0')