X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler%2Fapp.py;h=510cb4492c5d86d286678f7a96cefe899531164a;hb=d734981b5145f1798f3301c135dc577b7aef293e;hp=81c47a7bcf65a206cf435e3f23b1060ee9c05cb7;hpb=d7d6f2bebfc9eb4f3f8233eb70577e4c2ff31bd3;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler/app.py b/music_sampler/app.py
index 81c47a7..510cb44 100644
--- a/music_sampler/app.py
+++ b/music_sampler/app.py
@@ -1,4 +1,4 @@
-from .helpers import parse_args, register_fonts, duration_to_min_sec, path
+from .helpers import parse_args, register_fonts, path
 
 parse_args()
 
@@ -6,9 +6,9 @@ import kivy
 kivy.require("1.9.1")
 from kivy.app import App
 from kivy.uix.floatlayout import FloatLayout
+from kivy.uix.stacklayout import StackLayout
 from kivy.uix.relativelayout import RelativeLayout
 from kivy.properties import ListProperty, StringProperty
-from kivy.clock import Clock
 from kivy.core.window import Window
 from kivy.lang import Builder
 from .key import Key
@@ -16,6 +16,8 @@ from .mapping import Mapping
 
 register_fonts()
 
+from .app_blocks.playlist import *
+
 class KeyList(RelativeLayout):
     keylist = ListProperty([])
     first_key = StringProperty("")
@@ -33,33 +35,6 @@ class KeyList(RelativeLayout):
         if len(self.keylist) > 2:
             self.third_key  = self.keylist[2]
 
-class PlayList(RelativeLayout):
-    playlist = ListProperty([])
-
-    def __init__(self, **kwargs):
-        super(PlayList, self).__init__(**kwargs)
-        Clock.schedule_interval(self.update_playlist, 0.5)
-
-    def update_playlist(self, dt):
-        if self.parent is None or 'Mapping' not in self.parent.ids:
-            return True
-
-        open_files = self.parent.ids['Mapping'].open_files
-        self.playlist = []
-        for music_file in open_files.values():
-            if not music_file.is_in_use():
-                continue
-
-            text = "{}/{}".format(
-                    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])
-            else:
-                self.playlist.append(["⏵", music_file.name, text, True])
-
-
 class ActionList(RelativeLayout):
     action_title = StringProperty("")
     action_list = ListProperty([])