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

diff --git a/helpers/music_file.py b/helpers/music_file.py
index f1aa341..efa8628 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -7,6 +7,7 @@ import os.path
 
 from .lock import Lock
 from . import Config, gain
+from .mixer import Mixer
 
 file_lock = Lock("file")
 
@@ -31,6 +32,8 @@ class MusicFile(Machine):
 
         Machine.__init__(self, states=states, transitions=transitions, initial='initial')
 
+        # FIXME: catch error here
+        self.mixer = mapping.mixer or Mixer()
         self.volume = 100
         self.mapping = mapping
         self.filename = filename
@@ -95,7 +98,7 @@ class MusicFile(Machine):
         self.start_playing()
 
     def on_enter_loaded_playing(self):
-        self.mapping.mixer.add_file(self)
+        self.mixer.add_file(self)
 
     def finished_callback(self):
         if self.is_loaded_playing():
@@ -104,7 +107,7 @@ class MusicFile(Machine):
             self.stopped()
 
     def trigger_stopped_events(self):
-        self.mapping.mixer.remove_file(self)
+        self.mixer.remove_file(self)
         self.wait_event.set()
 
     def play_callback(self, out_data_length, frame_count):