X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.py;h=0d9a7a98263e358c99ab578a028da41be0028475;hb=4b2d79ca27dcbb85465829595ad81cec5fc63983;hp=d4fc2a726ee6923772bfd36d782ca5ff0014fc9f;hpb=23b7e0e5daf024e87d967ede3dfe6777a07e7469;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.py b/music_sampler.py
index d4fc2a7..0d9a7a9 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,64 +1,63 @@
-import sys
-import pygame
-import helpers
-import threading
-
-pygame.mixer.pre_init(frequency = 44100)
-pygame.init()
-
-size = width, height = 1024, 600
-screen = pygame.display.set_mode(size)
-screen.fill((250, 250, 250))
-
-draw_lock = helpers.Lock("draw")
-
-mapping = helpers.Mapping(screen, draw_lock)
-helpers.parse_config(mapping)
+from kivy.app import App
+from kivy.uix.floatlayout import FloatLayout
+from kivy.uix.relativelayout import RelativeLayout
+from kivy.properties import ListProperty, StringProperty
+from kivy.clock import Clock
+from kivy.core.window import Window
+
+from helpers.key import Key
+from helpers.mapping import Mapping
+
+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_playing():
+                continue
+            if music_file.is_paused():
+                self.playlist.append(["⏸", music_file.name, False])
+            else:
+                self.playlist.append(["⏵", music_file.name, True])
 
-mapping.draw()
 
-draw_lock.acquire()
-pygame.display.flip()
-draw_lock.release()
+class ActionList(RelativeLayout):
+    action_title = StringProperty("")
+    action_list = ListProperty([])
 
-contexts = [
-    'normal'
-]
+    def update_list(self, key, action_number = 0):
+        self.action_title = "actions linked to key {}:".format(key.key_sym)
+        self.action_list = []
 
-context = 'normal'
+        action_descriptions = [action.description() for action in key.actions]
 
-#### Normal workflow ####
-while 1:
-    event = pygame.event.wait()
+        for index, description in enumerate(action_descriptions):
+            if index < int(action_number):
+                icon = "✓"
+            elif index + 0.5 == action_number:
+                icon = "✅"
+            else:
+                icon = " "
 
-    if event.type == pygame.QUIT or (
-            event.type == pygame.KEYDOWN and 
-            event.mod  == 4160 and
-            event.key  == pygame.K_c):
-        for thread in threading.enumerate():
-            if thread.getName()[0:2] != "MS":
-                continue
-            thread.join()
+            self.action_list.append([icon, description])
 
-        pygame.quit()
-        sys.exit()
+class Screen(FloatLayout):
+    pass
 
-    if context == 'normal':
-        if event.type == pygame.KEYDOWN:
-            key = mapping.find_by_key_num(event.key)
-            if key is not None:
-                threading.Thread(name = "MSKeyAction", target=key.do_actions).start()
-        elif event.type == pygame.MOUSEBUTTONUP:
-            key = mapping.find_by_collidepoint(pygame.mouse.get_pos())
-            if key is not None:
-                threading.Thread(name = "MSClic", target=key.list_actions, args = [screen]).start()
+class MusicSamplerApp(App):
+    def build(self):
+        Window.size = (913, 563)
 
-    draw_lock.acquire()
-    pygame.display.flip()
-    draw_lock.release()
+        return Screen()
 
-#### In Ipython ####
-# for thread in threading.enumerate():
-#     if thread.getName()[0:2] != "MS":
-#         continue
-#     thread.join()
+if __name__ == '__main__':
+    MusicSamplerApp().run()