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

diff --git a/music_sampler.py b/music_sampler.py
index d91e150..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([])
@@ -45,14 +47,14 @@ class PlayList(RelativeLayout):
         open_files = self.parent.ids['Mapping'].open_files
         self.playlist = []
         for music_file in open_files.values():
-            if not music_file.is_not_stopped():
+            if not music_file.is_in_use():
                 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_paused():
+            if music_file.is_loaded_paused():
                 self.playlist.append(["⏸", music_file.name, text, False])
             else:
                 self.playlist.append(["⏵", music_file.name, text, True])
@@ -62,21 +64,18 @@ class ActionList(RelativeLayout):
     action_title = StringProperty("")
     action_list = ListProperty([])
 
-    def update_list(self, key, action_number = 0):
+    def update_list(self, key, action_descriptions):
         self.action_title = "actions linked to key {}:".format(key.key_sym)
         self.action_list = []
 
-        action_descriptions = [action.description() for action in key.actions]
-
-        for index, description in enumerate(action_descriptions):
-            if index < int(action_number):
+        for [action, status] in action_descriptions:
+            if status == "done":
                 icon = "✓"
-            elif index + 0.5 == action_number:
+            elif status == "current":
                 icon = "✅"
             else:
                 icon = " "
-
-            self.action_list.append([icon, description])
+            self.action_list.append([icon, action])
 
 class Screen(FloatLayout):
     pass
@@ -88,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()