aboutsummaryrefslogtreecommitdiff
path: root/music_sampler.py
diff options
context:
space:
mode:
Diffstat (limited to 'music_sampler.py')
-rw-r--r--music_sampler.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/music_sampler.py b/music_sampler.py
index f5df2bf..714598a 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,6 +1,6 @@
1import helpers 1import music_sampler
2 2
3helpers.parse_args() 3music_sampler.parse_args()
4 4
5import kivy 5import kivy
6kivy.require("1.9.1") 6kivy.require("1.9.1")
@@ -11,10 +11,10 @@ from kivy.properties import ListProperty, StringProperty
11from kivy.clock import Clock 11from kivy.clock import Clock
12from kivy.core.window import Window 12from kivy.core.window import Window
13from kivy.lang import Builder 13from kivy.lang import Builder
14from helpers.key import Key 14from music_sampler.key import Key
15from helpers.mapping import Mapping 15from music_sampler.mapping import Mapping
16 16
17helpers.register_fonts() 17music_sampler.register_fonts()
18 18
19class KeyList(RelativeLayout): 19class KeyList(RelativeLayout):
20 keylist = ListProperty([]) 20 keylist = ListProperty([])
@@ -51,8 +51,8 @@ class PlayList(RelativeLayout):
51 continue 51 continue
52 52
53 text = "{}/{}".format( 53 text = "{}/{}".format(
54 helpers.duration_to_min_sec(music_file.sound_position), 54 music_sampler.duration_to_min_sec(music_file.sound_position),
55 helpers.duration_to_min_sec(music_file.sound_duration)) 55 music_sampler.duration_to_min_sec(music_file.sound_duration))
56 56
57 if music_file.is_loaded_paused(): 57 if music_file.is_loaded_paused():
58 self.playlist.append(["⏸", music_file.name, text, False]) 58 self.playlist.append(["⏸", music_file.name, text, False])
@@ -87,5 +87,5 @@ class MusicSamplerApp(App):
87 return Screen() 87 return Screen()
88 88
89if __name__ == '__main__': 89if __name__ == '__main__':
90 Builder.load_file(helpers.path() + "/music_sampler.kv") 90 Builder.load_file(music_sampler.path() + "/music_sampler.kv")
91 MusicSamplerApp().run() 91 MusicSamplerApp().run()