diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-09-22 21:47:25 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-09-22 21:47:25 +0200 |
commit | d028768179d4fd1555831e26daaa9aae9ac94e85 (patch) | |
tree | c7dc2e8b589c87d50961b60ddfa17b739ef4e9fb /music_sampler/app_blocks/playlist.py | |
parent | d4217fda2ff3991eb1ee9a9bec6acff751798507 (diff) | |
parent | f9aeecf1a00e0e632546db00cb0cfa31b078dbe9 (diff) | |
download | MusicSampler-d028768179d4fd1555831e26daaa9aae9ac94e85.tar.gz MusicSampler-d028768179d4fd1555831e26daaa9aae9ac94e85.tar.zst MusicSampler-d028768179d4fd1555831e26daaa9aae9ac94e85.zip |
Merge branch 'load_action'1.3.0
Diffstat (limited to 'music_sampler/app_blocks/playlist.py')
-rw-r--r-- | music_sampler/app_blocks/playlist.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/music_sampler/app_blocks/playlist.py b/music_sampler/app_blocks/playlist.py index 5894995..706e4fc 100644 --- a/music_sampler/app_blocks/playlist.py +++ b/music_sampler/app_blocks/playlist.py | |||
@@ -2,7 +2,7 @@ from kivy.uix.label import Label | |||
2 | from kivy.uix.stacklayout import StackLayout | 2 | from kivy.uix.stacklayout import StackLayout |
3 | from kivy.uix.relativelayout import RelativeLayout | 3 | from kivy.uix.relativelayout import RelativeLayout |
4 | from kivy.properties import ListProperty | 4 | from kivy.properties import ListProperty |
5 | from kivy.clock import Clock | 5 | from kivy.clock import Clock, mainthread |
6 | from ..helpers import duration_to_min_sec | 6 | from ..helpers import duration_to_min_sec |
7 | from ..lock import Lock | 7 | from ..lock import Lock |
8 | 8 | ||
@@ -20,6 +20,7 @@ class PlayList(RelativeLayout): | |||
20 | super(PlayList, self).__init__(**kwargs) | 20 | super(PlayList, self).__init__(**kwargs) |
21 | Clock.schedule_interval(self.update_playlist, 0.5) | 21 | Clock.schedule_interval(self.update_playlist, 0.5) |
22 | 22 | ||
23 | @mainthread | ||
23 | def update_playlist(self, dt): | 24 | def update_playlist(self, dt): |
24 | if self.parent is None or 'Mapping' not in self.parent.ids: | 25 | if self.parent is None or 'Mapping' not in self.parent.ids: |
25 | return True | 26 | return True |