X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=cdc9836c19a299b82b2ba2fcca17495ea5f53cd9;hb=425dd061bf64a8304ec96aec870b0e2e24fa44f4;hp=f6b0117d1f1bf71f67d6d9973c1e9b80b7ecf226;hpb=d479af33afa54fee7c22701c6012a1579ead395f;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index f6b0117..cdc9836 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -3,28 +3,35 @@ import pydub
 import pygame
 
 class MusicFile:
-    def __init__(self, filename, lock, channel_id):
+    def __init__(self, filename, lock, channel_id, name = None):
         self.filename = filename
         self.channel_id = channel_id
+        self.name = name or filename
         self.raw_data = None
         self.sound = None
 
         self.loaded = False
+        self.flag_paused = False
         threading.Thread(name = "MSMusicLoad", target = self.load_sound, args = [lock]).start()
 
     def load_sound(self, lock):
         lock.acquire()
-        print("Loading {}".format(self.filename))
-        self.raw_data = pydub.AudioSegment.from_file(self.filename).raw_data
+        print("Loading « {} »".format(self.name))
+        self.raw_data = pydub.AudioSegment.from_file(self.filename).set_frame_rate(44100).raw_data
         self.sound = pygame.mixer.Sound(self.raw_data)
-        print("Loaded {}".format(self.filename))
+        print("Loaded « {} »".format(self.name))
         self.loaded = True
         lock.release()
 
     def is_playing(self):
         return self.channel().get_busy()
 
+    def is_paused(self):
+        return self.flag_paused
+
     def play(self, fade_in = 0, volume = 100, start_at = 0):
+        self.channel().set_endevent()
+        self.channel().set_endevent(pygame.USEREVENT)
         self.set_volume(volume)
 
         if start_at > 0:
@@ -37,9 +44,15 @@ class MusicFile:
             self.sound = pygame.mixer.Sound(self.raw_data)
 
         self.channel().play(self.sound, fade_ms = fade_in * 1000)
+        self.flag_paused = False
 
     def pause(self):
         self.channel().pause()
+        self.flag_paused = True
+
+    def unpause(self):
+        self.channel().unpause()
+        self.flag_paused = False
 
     def stop(self, fade_out = 0):
         if fade_out > 0: