Fix channels and description with blank lines

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

diff --git a/helpers/music_file.py b/helpers/music_file.py
index 36a7dd9ee913bc350058ae24de4079c17a4eb749..f6b0117d1f1bf71f67d6d9973c1e9b80b7ecf226 100644 (file)
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -3,14 +3,14 @@ import pydub
 import pygame
 
 class MusicFile:
-    def __init__(self, filename, lock):
+    def __init__(self, filename, lock, channel_id):
         self.filename = filename
-        self.channel = None
+        self.channel_id = channel_id
         self.raw_data = None
         self.sound = None
 
         self.loaded = False
-        threading.Thread(target = self.load_sound, args = [lock]).start()
+        threading.Thread(name = "MSMusicLoad", target = self.load_sound, args = [lock]).start()
 
     def load_sound(self, lock):
         lock.acquire()
@@ -22,7 +22,7 @@ class MusicFile:
         lock.release()
 
     def is_playing(self):
-        return self.channel is not None and self.channel.get_busy()
+        return self.channel().get_busy()
 
     def play(self, fade_in = 0, volume = 100, start_at = 0):
         self.set_volume(volume)
@@ -36,18 +36,16 @@ class MusicFile:
         else:
             self.sound = pygame.mixer.Sound(self.raw_data)
 
-        self.channel = self.sound.play(fade_ms = fade_in * 1000)
+        self.channel().play(self.sound, fade_ms = fade_in * 1000)
 
     def pause(self):
-        if self.channel is not None:
-            self.channel.pause()
+        self.channel().pause()
 
     def stop(self, fade_out = 0):
-        self.channel = None
         if fade_out > 0:
-            self.sound.fadeout(fade_out * 1000)
+            self.channel().fadeout(fade_out * 1000)
         else:
-            self.sound.stop()
+            self.channel().stop()
 
     def set_volume(self, value):
         if value < 0:
@@ -56,3 +54,8 @@ class MusicFile:
             value = 100
         self.sound.set_volume(value / 100)
 
+    def wait_end(self):
+        pass
+
+    def channel(self):
+        return pygame.mixer.Channel(self.channel_id)