X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=5baab7ef36d0bf09b92e888f013554506602b59e;hb=176642649ad18f056675f7d89ea84482084234bc;hp=b926c64c63a20e1adcc689a70c0e15d69a32ca1b;hpb=8e50011c8d5e5f4ac48f0856c9737d62f3e67838;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git diff --git a/helpers/music_file.py b/helpers/music_file.py index b926c64..5baab7e 100644 --- a/helpers/music_file.py +++ b/helpers/music_file.py @@ -3,17 +3,14 @@ import pydub import time from transitions.extensions import HierarchicalMachine as Machine -import pyaudio as pa -import sounddevice as sd import os.path from .lock import Lock -from . import gain +from . import Config, gain +from .mixer import Mixer file_lock = Lock("file") -pyaudio = pa.PyAudio() - class MusicFile(Machine): def __init__(self, filename, mapping, name = None, gain = 1): states = [ @@ -30,17 +27,19 @@ class MusicFile(Machine): { 'trigger': 'pause', 'source': 'loaded_playing', 'dest': 'loaded_paused'}, { 'trigger': 'unpause', 'source': 'loaded_paused', 'dest': 'loaded_playing'}, { 'trigger': 'stop_playing', 'source': ['loaded_playing','loaded_paused'], 'dest': 'loaded_stopping'}, - { 'trigger': 'stopped', 'source': 'loaded_stopping', 'dest': 'loaded_stopped'} + { 'trigger': 'stopped', 'source': 'loaded_stopping', 'dest': 'loaded_stopped', 'after': 'trigger_stopped_events'} ] 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 - self.stream = None self.name = name or filename self.audio_segment = None + self.audio_segment_frame_width = 0 self.volume_factor = gain self.music_lock = Lock("music__" + filename) self.wait_event = threading.Event() @@ -52,7 +51,8 @@ class MusicFile(Machine): try: print("Loading « {} »".format(self.name)) db_gain = gain(self.volume_factor * 100) - self.audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(44100).apply_gain(db_gain) + self.audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(Config.frame_rate).set_channels(Config.channels).set_sample_width(Config.sample_width).apply_gain(db_gain) + self.audio_segment_frame_width = self.audio_segment.frame_width self.sound_duration = self.audio_segment.duration_seconds except Exception as e: print("failed to load « {} »: {}".format(self.name, e)) @@ -78,35 +78,27 @@ class MusicFile(Machine): else: return 0 - def play(self, fade_in = 0, volume = 100, start_at = 0): + def play(self, fade_in = 0, volume = 100, loop = 0, start_at = 0): db_gain = gain(volume) + self.mapping.master_gain self.volume = volume + self.loop = loop ms = int(start_at * 1000) - ms_fi = max(1, int(fade_in * 1000)) - with self.music_lock: - self.current_audio_segment = (self.audio_segment + db_gain).fade(from_gain=-120, duration=ms_fi, start=ms) - self.before_loaded_playing(initial_frame = int(start_at * self.audio_segment.frame_rate)) - self.start_playing() - - def before_loaded_playing(self, initial_frame = 0): - self.current_frame = initial_frame + ms_fi = int(fade_in * 1000) with self.music_lock: - segment = self.current_audio_segment + self.current_audio_segment = (self.audio_segment + db_gain) + self.current_frame = int(start_at * self.audio_segment.frame_rate) + if ms_fi > 0: + # FIXME: apply it to repeated when looping? + 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 - self.stream = sd.RawOutputStream(samplerate=segment.frame_rate, - channels=segment.channels, - dtype='int' + str(8*segment.sample_width), # FIXME: ? - latency=1., - callback=self.play_callback, - finished_callback=self.finished_callback - ) + self.start_playing() def on_enter_loaded_playing(self): - self.stream.start() - - def on_enter_loaded_paused(self): - self.stream.stop() + self.mixer.add_file(self) def finished_callback(self): if self.is_loaded_playing(): @@ -114,29 +106,83 @@ class MusicFile(Machine): if self.is_loaded_stopping(): self.stopped() - def on_enter_loaded_stopped(self): + def trigger_stopped_events(self): + self.mixer.remove_file(self) self.wait_event.set() - def play_callback(self, out_data, frame_count, time_info, status_flags): + def play_callback(self, out_data_length, frame_count): + if self.is_loaded_paused(): + return b'\0' * out_data_length + with self.music_lock: - audio_segment = self.current_audio_segment.get_sample_slice_data( - start_sample=self.current_frame, - end_sample=self.current_frame + frame_count - ) - self.current_frame += frame_count - if len(audio_segment) == 0: - raise sd.CallbackStop + [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 + 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 + threading.Thread(name = "MSFinishedCallback", target=self.finished_callback).start() + + return data.ljust(out_data_length, b'\0') + + def get_next_sample(self, frame_count): + fw = self.audio_segment_frame_width + + 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)] - out_data[:] = audio_segment.ljust(len(out_data), b'\0') + 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()) + + start_i = max(self.current_frame, 0) + end_i = min(self.current_frame + frame_count, max_val) + data += segment._data[(start_i * fw):(end_i * fw)] + nb_frames += end_i - start_i + self.current_frame += end_i - start_i + + return [data, nb_frames] + + def seek(self, value = 0, delta = False): + # We don't want to do that while stopping + if not (self.is_loaded_playing() or self.is_loaded_paused()): + return + with self.music_lock: + 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" def stop(self, fade_out = 0, wait = False): if self.is_loaded_playing(): ms = int(self.sound_position * 1000) ms_fo = max(1, int(fade_out * 1000)) + # FIXME: stop fade_out puis seek -5 -> on abandonne le fade ? (cf + # commentaire dans fonction seek + new_audio_segment = self.current_audio_segment[:ms + ms_fo].fade_out(ms_fo) with self.music_lock: - self.current_audio_segment = self.current_audio_segment[:ms + ms_fo].fade_out(ms_fo) - self.stop_playing() + self.current_audio_segment = new_audio_segment + self.stop_playing() if wait: self.wait_end() else: @@ -149,8 +195,13 @@ class MusicFile(Machine): new_audio_segment = self.current_audio_segment + db_gain + new_a_s_with_effect = None + if self.a_s_with_effect is not None: + new_a_s_with_effect = self.a_s_with_effect + db_gain + with self.music_lock: self.current_audio_segment = new_audio_segment + self.a_s_with_effect = new_a_s_with_effect def set_volume(self, value, delta = False): [db_gain, self.volume] = gain(value + int(delta) * self.volume, self.volume) @@ -161,13 +212,3 @@ class MusicFile(Machine): self.wait_event.clear() self.wait_event.wait() -# Add some more functions to AudioSegments -def get_sample_slice_data(self, start_sample=0, end_sample=float('inf')): - max_val = int(self.frame_count()) - - start_i = max(start_sample, 0) * self.frame_width - end_i = min(end_sample, max_val) * self.frame_width - - return self._data[start_i:end_i] - -pydub.AudioSegment.get_sample_slice_data = get_sample_slice_data