aboutsummaryrefslogtreecommitdiff
path: root/music_sampler/music_file.py
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-12 14:51:32 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-12 14:51:32 +0200
commit21ffec315b8fa8a6b46351021da915236148a7b1 (patch)
tree52951646c8f9d1ea453c58aa37c92e64ff0dd9a1 /music_sampler/music_file.py
parent4094ae4ebff7997e8c5e0fd84a1434b1b86632b1 (diff)
downloadMusicSampler-21ffec315b8fa8a6b46351021da915236148a7b1.tar.gz
MusicSampler-21ffec315b8fa8a6b46351021da915236148a7b1.tar.zst
MusicSampler-21ffec315b8fa8a6b46351021da915236148a7b1.zip
Make 'interrupt_wait' able to interrupt all waits
If 'wait_id' is not specified, interrupt_wait will now stop all wait events. This fixes https://git.immae.eu/mantisbt/view.php?id=4
Diffstat (limited to 'music_sampler/music_file.py')
-rw-r--r--music_sampler/music_file.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/music_sampler/music_file.py b/music_sampler/music_file.py
index fa6293d..4ba65e3 100644
--- a/music_sampler/music_file.py
+++ b/music_sampler/music_file.py
@@ -241,8 +241,7 @@ class MusicFile:
241 self.current_audio_segment = new_audio_segment 241 self.current_audio_segment = new_audio_segment
242 self.stop_playing() 242 self.stop_playing()
243 if wait: 243 if wait:
244 if set_wait_id is not None: 244 self.mapping.add_wait(self.wait_event, wait_id=set_wait_id)
245 self.mapping.add_wait_id(set_wait_id, self.wait_event)
246 self.wait_end() 245 self.wait_end()
247 else: 246 else:
248 self.stopped() 247 self.stopped()