diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-07-27 21:33:09 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-07-27 21:33:09 +0200 |
commit | 63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e (patch) | |
tree | f043ab215425aca3434bf178029dad9f9e62dbe9 | |
parent | 35bde798b6cda13579337b0ec5a803fdd5eab19a (diff) | |
download | MusicSampler-63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e.tar.gz MusicSampler-63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e.tar.zst MusicSampler-63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e.zip |
Rename helpers to music_sampler
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | music_sampler.kv | 2 | ||||
-rw-r--r-- | music_sampler.py | 16 | ||||
-rw-r--r-- | music_sampler.spec | 2 | ||||
-rw-r--r-- | music_sampler/__init__.py (renamed from helpers/__init__.py) | 0 | ||||
-rw-r--r-- | music_sampler/action.py (renamed from helpers/action.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/__init__.py (renamed from helpers/actions/__init__.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/interrupt_wait.py (renamed from helpers/actions/interrupt_wait.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/pause.py (renamed from helpers/actions/pause.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/play.py (renamed from helpers/actions/play.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/run_command.py (renamed from helpers/actions/run_command.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/seek.py (renamed from helpers/actions/seek.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/stop.py (renamed from helpers/actions/stop.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/stop_all_actions.py (renamed from helpers/actions/stop_all_actions.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/unpause.py (renamed from helpers/actions/unpause.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/volume.py (renamed from helpers/actions/volume.py) | 0 | ||||
-rw-r--r-- | music_sampler/actions/wait.py (renamed from helpers/actions/wait.py) | 0 | ||||
-rw-r--r-- | music_sampler/key.py (renamed from helpers/key.py) | 0 | ||||
-rw-r--r-- | music_sampler/lock.py (renamed from helpers/lock.py) | 0 | ||||
-rw-r--r-- | music_sampler/mapping.py (renamed from helpers/mapping.py) | 0 | ||||
-rw-r--r-- | music_sampler/mixer.py (renamed from helpers/mixer.py) | 0 | ||||
-rw-r--r-- | music_sampler/music_effect.py (renamed from helpers/music_effect.py) | 0 | ||||
-rw-r--r-- | music_sampler/music_file.py (renamed from helpers/music_file.py) | 0 | ||||
-rw-r--r-- | music_sampler/sysfont.py (renamed from helpers/sysfont.py) | 0 |
24 files changed, 11 insertions, 11 deletions
@@ -1,5 +1,5 @@ | |||
1 | build/ | 1 | build/ |
2 | dist/ | 2 | dist/ |
3 | helpers/__pycache__/ | 3 | music_sampler/__pycache__/ |
4 | __pycache__/ | 4 | __pycache__/ |
5 | .pyinstaller_commit | 5 | .pyinstaller_commit |
diff --git a/music_sampler.kv b/music_sampler.kv index a18eb4e..9057532 100644 --- a/music_sampler.kv +++ b/music_sampler.kv | |||
@@ -1,5 +1,5 @@ | |||
1 | #:import math math | 1 | #:import math math |
2 | #:import h helpers | 2 | #:import h music_sampler |
3 | 3 | ||
4 | <Key>: | 4 | <Key>: |
5 | pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x | 5 | pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x |
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 @@ | |||
1 | import helpers | 1 | import music_sampler |
2 | 2 | ||
3 | helpers.parse_args() | 3 | music_sampler.parse_args() |
4 | 4 | ||
5 | import kivy | 5 | import kivy |
6 | kivy.require("1.9.1") | 6 | kivy.require("1.9.1") |
@@ -11,10 +11,10 @@ from kivy.properties import ListProperty, StringProperty | |||
11 | from kivy.clock import Clock | 11 | from kivy.clock import Clock |
12 | from kivy.core.window import Window | 12 | from kivy.core.window import Window |
13 | from kivy.lang import Builder | 13 | from kivy.lang import Builder |
14 | from helpers.key import Key | 14 | from music_sampler.key import Key |
15 | from helpers.mapping import Mapping | 15 | from music_sampler.mapping import Mapping |
16 | 16 | ||
17 | helpers.register_fonts() | 17 | music_sampler.register_fonts() |
18 | 18 | ||
19 | class KeyList(RelativeLayout): | 19 | class 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 | ||
89 | if __name__ == '__main__': | 89 | if __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() |
diff --git a/music_sampler.spec b/music_sampler.spec index 0d99dca..3794397 100644 --- a/music_sampler.spec +++ b/music_sampler.spec | |||
@@ -5,7 +5,7 @@ from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\ | |||
5 | 5 | ||
6 | import importlib.machinery | 6 | import importlib.machinery |
7 | sysfont = importlib.machinery\ | 7 | sysfont = importlib.machinery\ |
8 | .SourceFileLoader('sysfont', os.getcwd() + '/helpers/sysfont.py') \ | 8 | .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \ |
9 | .load_module() | 9 | .load_module() |
10 | 10 | ||
11 | excluded_and_hidden_modules = get_deps_minimal( | 11 | excluded_and_hidden_modules = get_deps_minimal( |
diff --git a/helpers/__init__.py b/music_sampler/__init__.py index 4827e6c..4827e6c 100644 --- a/helpers/__init__.py +++ b/music_sampler/__init__.py | |||
diff --git a/helpers/action.py b/music_sampler/action.py index 4b5a71d..4b5a71d 100644 --- a/helpers/action.py +++ b/music_sampler/action.py | |||
diff --git a/helpers/actions/__init__.py b/music_sampler/actions/__init__.py index 658cef0..658cef0 100644 --- a/helpers/actions/__init__.py +++ b/music_sampler/actions/__init__.py | |||
diff --git a/helpers/actions/interrupt_wait.py b/music_sampler/actions/interrupt_wait.py index 8f465f0..8f465f0 100644 --- a/helpers/actions/interrupt_wait.py +++ b/music_sampler/actions/interrupt_wait.py | |||
diff --git a/helpers/actions/pause.py b/music_sampler/actions/pause.py index bb27734..bb27734 100644 --- a/helpers/actions/pause.py +++ b/music_sampler/actions/pause.py | |||
diff --git a/helpers/actions/play.py b/music_sampler/actions/play.py index fdba95b..fdba95b 100644 --- a/helpers/actions/play.py +++ b/music_sampler/actions/play.py | |||
diff --git a/helpers/actions/run_command.py b/music_sampler/actions/run_command.py index 1e80c1e..1e80c1e 100644 --- a/helpers/actions/run_command.py +++ b/music_sampler/actions/run_command.py | |||
diff --git a/helpers/actions/seek.py b/music_sampler/actions/seek.py index 467af7d..467af7d 100644 --- a/helpers/actions/seek.py +++ b/music_sampler/actions/seek.py | |||
diff --git a/helpers/actions/stop.py b/music_sampler/actions/stop.py index 88cc66d..88cc66d 100644 --- a/helpers/actions/stop.py +++ b/music_sampler/actions/stop.py | |||
diff --git a/helpers/actions/stop_all_actions.py b/music_sampler/actions/stop_all_actions.py index 4ea875a..4ea875a 100644 --- a/helpers/actions/stop_all_actions.py +++ b/music_sampler/actions/stop_all_actions.py | |||
diff --git a/helpers/actions/unpause.py b/music_sampler/actions/unpause.py index 5fa88c3..5fa88c3 100644 --- a/helpers/actions/unpause.py +++ b/music_sampler/actions/unpause.py | |||
diff --git a/helpers/actions/volume.py b/music_sampler/actions/volume.py index 7dda3c1..7dda3c1 100644 --- a/helpers/actions/volume.py +++ b/music_sampler/actions/volume.py | |||
diff --git a/helpers/actions/wait.py b/music_sampler/actions/wait.py index ea42408..ea42408 100644 --- a/helpers/actions/wait.py +++ b/music_sampler/actions/wait.py | |||
diff --git a/helpers/key.py b/music_sampler/key.py index 66e792d..66e792d 100644 --- a/helpers/key.py +++ b/music_sampler/key.py | |||
diff --git a/helpers/lock.py b/music_sampler/lock.py index 9beafcd..9beafcd 100644 --- a/helpers/lock.py +++ b/music_sampler/lock.py | |||
diff --git a/helpers/mapping.py b/music_sampler/mapping.py index bb20e67..bb20e67 100644 --- a/helpers/mapping.py +++ b/music_sampler/mapping.py | |||
diff --git a/helpers/mixer.py b/music_sampler/mixer.py index 9242b61..9242b61 100644 --- a/helpers/mixer.py +++ b/music_sampler/mixer.py | |||
diff --git a/helpers/music_effect.py b/music_sampler/music_effect.py index 4bdbb26..4bdbb26 100644 --- a/helpers/music_effect.py +++ b/music_sampler/music_effect.py | |||
diff --git a/helpers/music_file.py b/music_sampler/music_file.py index 2d3ba72..2d3ba72 100644 --- a/helpers/music_file.py +++ b/music_sampler/music_file.py | |||
diff --git a/helpers/sysfont.py b/music_sampler/sysfont.py index f47693e..f47693e 100644 --- a/helpers/sysfont.py +++ b/music_sampler/sysfont.py | |||