From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 27 Jul 2016 13:50:33 +0000 (+0200)
Subject: Fix absolute path when using music_path
X-Git-Tag: 1.0.0~6
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=commitdiff_plain;h=dd2887c2db888065f11534b2fe180d1ca7deb191

Fix absolute path when using music_path
---

diff --git a/helpers/music_file.py b/helpers/music_file.py
index 916b955..2d3ba72 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -101,10 +101,15 @@ class MusicFile:
     def reload_music_file(self):
         with file_lock:
             try:
+                if self.filename.startswith("/"):
+                    filename = self.filename
+                else:
+                    filename = Config.music_path + self.filename
+
                 debug_print("Reloading « {} »".format(self.name))
                 initial_db_gain = gain(self.initial_volume_factor * 100)
                 self.audio_segment = pydub.AudioSegment \
-                        .from_file(Config.music_path + self.filename) \
+                        .from_file(filename) \
                         .set_frame_rate(Config.frame_rate) \
                         .set_channels(Config.channels) \
                         .set_sample_width(Config.sample_width) \
@@ -121,11 +126,16 @@ class MusicFile:
     def on_enter_loading(self):
         with file_lock:
             try:
+                if self.filename.startswith("/"):
+                    filename = self.filename
+                else:
+                    filename = Config.music_path + self.filename
+
                 debug_print("Loading « {} »".format(self.name))
                 self.mixer = self.mapping.mixer or Mixer()
                 initial_db_gain = gain(self.initial_volume_factor * 100)
                 self.audio_segment = pydub.AudioSegment \
-                        .from_file(Config.music_path + self.filename) \
+                        .from_file(filename) \
                         .set_frame_rate(Config.frame_rate) \
                         .set_channels(Config.channels) \
                         .set_sample_width(Config.sample_width) \