X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2F__init__.py;h=f1a968b298065dddfebe5c52649507fffd891111;hb=940bb6ad6cbd823ed245577093bd8959e189d43f;hp=9d6663893bc32634b1163f7a525b8b04a7bdf9a5;hpb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/__init__.py b/helpers/__init__.py
index 9d66638..f1a968b 100644
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -33,6 +33,10 @@ def parse_args():
             default="config.yml",
             required=False,
             help="Config file to load")
+    parser.add_argument("-p", "--music-path",
+            default=".",
+            required=False,
+            help="Folder in which to find the music files")
     parser.add_argument("-d", "--debug",
             nargs=0,
             action=DebugModeAction,
@@ -86,7 +90,7 @@ def parse_args():
                     by Kivy. Pass \"-- --help\" to get Kivy's usage.")
 
     from kivy.logger import Logger
-    Logger.setLevel(logging.ERROR)
+    Logger.setLevel(logging.WARN)
 
     args = parser.parse_args(argv)
 
@@ -98,6 +102,10 @@ def parse_args():
     Config.channels = args.channels
     Config.sample_width = args.sample_width
     Config.builtin_mixing = args.builtin_mixing
+    if args.music_path.endswith("/"):
+        Config.music_path = args.music_path
+    else:
+        Config.music_path = args.music_path + "/"
 
 class DebugModeAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
@@ -131,16 +139,20 @@ def duration_to_min_sec(duration):
 
 def gain(volume, old_volume=None):
     if old_volume is None:
-        return 20 * math.log10(volume / 100)
+        return 20 * math.log10(max(volume, 0.1) / 100)
     else:
         return [
                 20 * math.log10(max(volume, 0.1) / max(old_volume, 0.1)),
                 max(volume, 0)]
 
-def debug_print(message):
+def debug_print(message, with_trace=False):
+    from kivy.logger import Logger
+    Logger.debug('MusicSampler: ' + message, exc_info=with_trace)
+
+def error_print(message, with_trace=False):
     from kivy.logger import Logger
-    Logger.debug('MusicSampler: ' + message)
+    Logger.error('MusicSampler: ' + message, exc_info=with_trace)
 
-def error_print(message):
+def warn_print(message, with_trace=False):
     from kivy.logger import Logger
-    Logger.error('MusicSampler: ' + message)
+    Logger.warn('MusicSampler: ' + message, exc_info=with_trace)