X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=017fc596e236e14c700bff5bb88c746e56d38372;hb=108f858fcb8794b2d1c9ce75216458bd7e0a80f2;hp=810bc2266dbe807d26d00727931cd4daddb12619;hpb=aee1334ca47ff55c815eee204fe03683a572be0f;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git diff --git a/helpers/music_file.py b/helpers/music_file.py index 810bc22..017fc59 100644 --- a/helpers/music_file.py +++ b/helpers/music_file.py @@ -14,7 +14,7 @@ from .music_effect import GainEffect file_lock = Lock("file") -class MusicFile(Machine): +class MusicFile: def __init__(self, filename, mapping, name=None, gain=1): states = [ 'initial', @@ -22,7 +22,13 @@ class MusicFile(Machine): 'failed', { 'name': 'loaded', - 'children': ['stopped', 'playing', 'paused', 'stopping'] + 'children': [ + 'stopped', + 'playing', + 'paused', + 'stopping', + 'stopped' + ] } ] transitions = [ @@ -69,8 +75,9 @@ class MusicFile(Machine): } ] - Machine.__init__(self, states=states, - transitions=transitions, initial='initial') + Machine(model=self, states=states, + transitions=transitions, initial='initial', + ignore_invalid_triggers=True) self.volume = 100 self.mapping = mapping @@ -125,22 +132,29 @@ class MusicFile(Machine): return 0 def play(self, fade_in=0, volume=100, loop=0, start_at=0): + # FIXME: create a "reinitialize" method + self.gain_effects = [] self.set_gain(gain(volume) + self.mapping.master_gain, absolute=True) self.volume = volume - self.loop = loop + self.current_loop = 0 + if loop < 0: + self.last_loop = float('inf') + else: + self.last_loop = loop - ms = int(start_at * 1000) - ms_fi = int(fade_in * 1000) with self.music_lock: self.current_audio_segment = self.audio_segment self.current_frame = int(start_at * self.audio_segment.frame_rate) - if ms_fi > 0: - self.a_s_with_effect = self \ - .current_audio_segment[ms : ms+ms_fi] \ - .fade_in(ms_fi) - self.current_frame_with_effect = 0 - else: - self.a_s_with_effect = None + if fade_in > 0: + db_gain = gain(self.volume, 0)[0] + self.set_gain(-db_gain) + self.gain_effects.append(GainEffect( + "fade", + self.current_audio_segment, + self.current_loop, + self.sound_position, + self.sound_position + fade_in, + gain=db_gain)) self.start_playing() @@ -164,15 +178,16 @@ class MusicFile(Machine): with self.music_lock: [data, nb_frames] = self.get_next_sample(frame_count) if nb_frames < frame_count: - if self.is_loaded_playing() and self.loop != 0: - self.loop -= 1 + if self.is_loaded_playing() and\ + self.current_loop < self.last_loop: + self.current_loop += 1 self.current_frame = 0 [new_data, new_nb_frames] = self.get_next_sample( frame_count - nb_frames) data += new_data nb_frames += new_nb_frames elif nb_frames == 0: - # FIXME: too slow + # FIXME: too slow when mixing multiple streams threading.Thread( name="MSFinishedCallback", target=self.finished_callback).start() @@ -184,25 +199,6 @@ class MusicFile(Machine): data = b"" nb_frames = 0 - if self.a_s_with_effect is not None: - segment = self.a_s_with_effect - max_val = int(segment.frame_count()) - - start_i = max(self.current_frame_with_effect, 0) - end_i = min(self.current_frame_with_effect + frame_count, max_val) - - data += segment._data[start_i*fw : end_i*fw] - - frame_count = max( - 0, - self.current_frame_with_effect + frame_count - max_val) - - self.current_frame_with_effect += end_i - start_i - self.current_frame += end_i - start_i - nb_frames += end_i - start_i - - if frame_count > 0: - self.a_s_with_effect = None segment = self.current_audio_segment max_val = int(segment.frame_count()) @@ -213,7 +209,6 @@ class MusicFile(Machine): nb_frames += end_i - start_i self.current_frame += end_i - start_i - # FIXME: self.effects_next_gain should take into account the loop number volume_factor = self.volume_factor(self.effects_next_gain(nb_frames)) data = audioop.mul(data, Config.sample_width, volume_factor) @@ -226,18 +221,33 @@ class MusicFile(Machine): return with self.music_lock: self.abandon_all_effects() - self.a_s_with_effect = None - self.current_frame = max( - 0, - int(delta) * self.current_frame - + int(value * self.audio_segment.frame_rate)) - # FIXME: si on fait un seek + delta, adapter le "loop" + if delta: + frame_count = int(self.audio_segment.frame_count()) + frame_diff = int(value * self.audio_segment.frame_rate) + self.current_frame += frame_diff + while self.current_frame < 0: + self.current_loop -= 1 + self.current_frame += frame_count + while self.current_frame > frame_count: + self.current_loop += 1 + self.current_frame -= frame_count + if self.current_loop < 0: + self.current_loop = 0 + self.current_frame = 0 + if self.current_loop > self.last_loop: + self.current_loop = self.last_loop + self.current_frame = frame_count + else: + self.current_frame = max( + 0, + int(value * self.audio_segment.frame_rate)) def effects_next_gain(self, frame_count): db_gain = 0 for gain_effect in self.gain_effects: [new_gain, last_gain] = gain_effect.get_next_gain( self.current_frame, + self.current_loop, frame_count) if last_gain: self.set_gain(new_gain) @@ -255,7 +265,7 @@ class MusicFile(Machine): self.gain_effects = [] self.set_gain(db_gain) - def stop(self, fade_out=0, wait=False): + def stop(self, fade_out=0, wait=False, set_wait_id=None): if self.is_loaded_playing(): ms = int(self.sound_position * 1000) ms_fo = max(1, int(fade_out * 1000)) @@ -266,6 +276,8 @@ class MusicFile(Machine): self.current_audio_segment = new_audio_segment self.stop_playing() if wait: + if set_wait_id is not None: + self.mapping.add_wait_id(set_wait_id, self.wait_event) self.wait_end() else: self.stop_playing() @@ -285,10 +297,14 @@ class MusicFile(Machine): value + int(delta) * self.volume, self.volume) + if not (self.is_loaded_playing() or self.is_loaded_paused()): + return + if fade > 0: self.gain_effects.append(GainEffect( "fade", self.current_audio_segment, + self.current_loop, self.sound_position, self.sound_position + fade, gain=db_gain))