Reorder MusicFile methods

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

diff --git a/helpers/mixer.py b/helpers/mixer.py
index d08520a00cf7c3197ff63e37ec2c68d503addf58..9242b61af9100e944b5060220bf40c0567741443 100644 (file)
--- a/helpers/mixer.py
+++ b/helpers/mixer.py
@@ -5,6 +5,7 @@ import time
 from . import Config
 
 sample_width = Config.sample_width
+
 def sample_width_to_dtype(sample_width):
     if sample_width == 1 or sample_width == 2 or sample_width == 4:
         return 'int' + str(8*sample_width)
@@ -19,13 +20,13 @@ def _latency(latency):
 
 class Mixer:
     def __init__(self):
-        self.stream = sd.RawOutputStream(samplerate=Config.frame_rate,
-                        channels=Config.channels,
-                        dtype=sample_width_to_dtype(Config.sample_width),
-                        latency=_latency(Config.latency),
-                        blocksize=Config.blocksize,
-                        callback=self.play_callback,
-                        )
+        self.stream = sd.RawOutputStream(
+                samplerate=Config.frame_rate,
+                channels=Config.channels,
+                dtype=sample_width_to_dtype(Config.sample_width),
+                latency=_latency(Config.latency),
+                blocksize=Config.blocksize,
+                callback=self.play_callback)
         self.open_files = []
 
     def add_file(self, music_file):
@@ -34,7 +35,8 @@ class Mixer:
         self.start()
 
     def remove_file(self, music_file):
-        self.open_files.remove(music_file)
+        if music_file in self.open_files:
+            self.open_files.remove(music_file)
         if len(self.open_files) == 0:
             self.stop()