X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmusic_file.py;h=892519d2e843be9423b98399aad37de6ce7060f4;hb=87f211fb622ef640249628b65d0bc8daca889f2c;hp=10784596a38db66cbde3594aab0adcac3b2231fb;hpb=b58b8220c1f3f20e97ca806cf8db0e334b920f4c;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/music_file.py b/helpers/music_file.py
index 1078459..892519d 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -1,13 +1,15 @@
 import threading
 import pydub
 import pygame
+import math
 
 class MusicFile:
-    def __init__(self, filename, lock, channel_id, name = None):
+    def __init__(self, filename, lock, channel_id, name = None, gain = 1):
         self.filename = filename
         self.channel_id = channel_id
         self.name = name or filename
         self.raw_data = None
+        self.gain = gain
 
         self.loaded = False
         self.flag_paused = False
@@ -16,7 +18,8 @@ class MusicFile:
     def load_sound(self, lock):
         lock.acquire()
         print("Loading « {} »".format(self.name))
-        audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(44100)
+        volume_factor = 20 * math.log10(self.gain)
+        audio_segment = pydub.AudioSegment.from_file(self.filename).set_frame_rate(44100).apply_gain(volume_factor)
         self.sound_duration = audio_segment.duration_seconds
         self.raw_data = audio_segment.raw_data
         print("Loaded « {} »".format(self.name))
@@ -42,7 +45,7 @@ class MusicFile:
         else:
             sound = pygame.mixer.Sound(self.raw_data)
 
-        self.channel().play(sound, fade_ms = fade_in * 1000)
+        self.channel().play(sound, fade_ms = int(fade_in * 1000))
         self.flag_paused = False
 
     def pause(self):
@@ -55,7 +58,7 @@ class MusicFile:
 
     def stop(self, fade_out = 0):
         if fade_out > 0:
-            self.channel().fadeout(fade_out * 1000)
+            self.channel().fadeout(int(fade_out * 1000))
         else:
             self.channel().stop()