]> git.immae.eu Git - perso/Immae/Projets/Python/MusicSampler.git/commitdiff
Rename 'add' to 'delta'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 14 Jul 2016 21:05:55 +0000 (23:05 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 14 Jul 2016 21:05:55 +0000 (23:05 +0200)
helpers/action.py
helpers/mapping.py
helpers/music_file.py

index 28afceeb6e66c3cc193428e88c28e06959cca29d..2f294a01d1c83e3c3ad50e0aad1fe2e50f05ec0e 100644 (file)
@@ -87,11 +87,11 @@ class Action:
     def stop_all_actions(self, **kwargs):
         self.mapping.stop_all_running()
 
-    def volume(self, music = None, value = 100, add = False, **kwargs):
+    def volume(self, music = None, value = 100, delta = False, **kwargs):
         if music is not None:
-            music.set_volume(value, add = add)
+            music.set_volume(value, delta = delta)
         else:
-            self.mapping.set_master_volume(value, add = add)
+            self.mapping.set_master_volume(value, delta = delta)
 
     def wait(self, duration = 0, music = None, **kwargs):
         self.sleep_event = threading.Event()
@@ -156,8 +156,8 @@ class Action:
     def stop_all_actions_print(self, **kwargs):
         return "stopping all actions"
 
-    def volume_print(self, music = None, value = 100, add = False, **kwargs):
-        if add:
+    def volume_print(self, music = None, value = 100, delta = False, **kwargs):
+        if delta:
             if music is not None:
                 return "{:+d}% to volume of « {} »".format(value, music.name)
             else:
index d9b7ba0e242d50bab6271a0964e622638b3db803..84845fc641dfd5ee262874dce2625b41e0acda9d 100644 (file)
@@ -28,8 +28,8 @@ class Mapping(RelativeLayout):
     def master_gain(self):
         return gain(self.master_volume)
 
-    def set_master_volume(self, value, add = False):
-        [db_gain, self.master_volume] = gain(value + int(add) * self.master_volume, self.master_volume)
+    def set_master_volume(self, value, delta = False):
+        [db_gain, self.master_volume] = gain(value + int(delta) * self.master_volume, self.master_volume)
         for music in self.open_files.values():
             music.set_gain(db_gain)
 
index 6a28d620f69c043019a8e964e3c5a8b2a81aec74..b926c64c63a20e1adcc689a70c0e15d69a32ca1b 100644 (file)
@@ -152,8 +152,8 @@ class MusicFile(Machine):
         with self.music_lock:
             self.current_audio_segment = new_audio_segment
 
-    def set_volume(self, value, add = False):
-        [db_gain, self.volume] = gain(value + int(add) * self.volume, self.volume)
+    def set_volume(self, value, delta = False):
+        [db_gain, self.volume] = gain(value + int(delta) * self.volume, self.volume)
 
         self.set_gain(db_gain)