X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.py;h=41b71be5bd1bd96502b18981c96725bef8554446;hb=c4f4f2a1d330d8e09021619bbb8dcaac4df0a602;hp=7bd7513d738e8c33c33d3a5e6bd9aaed8172bd76;hpb=98ff43054fe94f333e2deda2906cd62593ded1d8;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.py b/music_sampler.py
index 7bd7513..41b71be 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,3 +1,7 @@
+import helpers
+
+helpers.parse_args()
+
 import kivy
 kivy.require("1.9.1")
 from kivy.app import App
@@ -9,7 +13,6 @@ from kivy.core.window import Window
 from kivy.lang import Builder
 from helpers.key import Key
 from helpers.mapping import Mapping
-import helpers
 
 class KeyList(RelativeLayout):
     keylist = ListProperty([])
@@ -42,15 +45,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_playing():
+            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)
-                    )
+                    helpers.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])