X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.py;h=714598a37f06a7b3b1a863560cd563fa7f19eb35;hb=63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e;hp=c10b6349701210a2ce583bb88543559a6fb0dd4f;hpb=b17aed6aba689f484a4932d99b30aff1bdee7176;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.py b/music_sampler.py
index c10b634..714598a 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,6 +1,6 @@
-import helpers
+import music_sampler
 
-helpers.parse_args()
+music_sampler.parse_args()
 
 import kivy
 kivy.require("1.9.1")
@@ -11,8 +11,10 @@ from kivy.properties import ListProperty, StringProperty
 from kivy.clock import Clock
 from kivy.core.window import Window
 from kivy.lang import Builder
-from helpers.key import Key
-from helpers.mapping import Mapping
+from music_sampler.key import Key
+from music_sampler.mapping import Mapping
+
+music_sampler.register_fonts()
 
 class KeyList(RelativeLayout):
     keylist = ListProperty([])
@@ -49,8 +51,8 @@ class PlayList(RelativeLayout):
                 continue
 
             text = "{}/{}".format(
-                    helpers.duration_to_min_sec(music_file.sound_position),
-                    helpers.duration_to_min_sec(music_file.sound_duration))
+                    music_sampler.duration_to_min_sec(music_file.sound_position),
+                    music_sampler.duration_to_min_sec(music_file.sound_duration))
 
             if music_file.is_loaded_paused():
                 self.playlist.append(["⏸", music_file.name, text, False])
@@ -85,5 +87,5 @@ class MusicSamplerApp(App):
         return Screen()
 
 if __name__ == '__main__':
-    Builder.load_file(helpers.path() + "/music_sampler.kv")
+    Builder.load_file(music_sampler.path() + "/music_sampler.kv")
     MusicSamplerApp().run()