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

diff --git a/music_sampler.py b/music_sampler/app.py
similarity index 85%
rename from music_sampler.py
rename to music_sampler/app.py
index 714598a..81c47a7 100644
--- a/music_sampler.py
+++ b/music_sampler/app.py
@@ -1,6 +1,6 @@
-import music_sampler
+from .helpers import parse_args, register_fonts, duration_to_min_sec, path
 
-music_sampler.parse_args()
+parse_args()
 
 import kivy
 kivy.require("1.9.1")
@@ -11,10 +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 music_sampler.key import Key
-from music_sampler.mapping import Mapping
+from .key import Key
+from .mapping import Mapping
 
-music_sampler.register_fonts()
+register_fonts()
 
 class KeyList(RelativeLayout):
     keylist = ListProperty([])
@@ -51,8 +51,8 @@ class PlayList(RelativeLayout):
                 continue
 
             text = "{}/{}".format(
-                    music_sampler.duration_to_min_sec(music_file.sound_position),
-                    music_sampler.duration_to_min_sec(music_file.sound_duration))
+                    duration_to_min_sec(music_file.sound_position),
+                    duration_to_min_sec(music_file.sound_duration))
 
             if music_file.is_loaded_paused():
                 self.playlist.append(["⏸", music_file.name, text, False])
@@ -86,6 +86,6 @@ class MusicSamplerApp(App):
 
         return Screen()
 
-if __name__ == '__main__':
-    Builder.load_file(music_sampler.path() + "/music_sampler.kv")
+def main():
+    Builder.load_file(path() + "/music_sampler.kv")
     MusicSamplerApp().run()