cleanup. french manual

ColorsMK2.py

@@ -116,7 +116,7 @@ class Rgb:
 	PURPLE_PULSE = Pulse(48)
 	PURPLE_HALF_PULSE = Pulse(49)
 	PURPLE_THIRD_PULSE = Pulse(50)
- 	
+
 
 CLIP_COLOR_TABLE = {
  15549221: 60,
@@ -180,7 +180,7 @@ class Rgb:
  14673637: 118,
  16777215: 119
 }
- 
+
 RGB_COLOR_TABLE = (
  (0, 0),
  (1, 1973790),

ConfigurableButtonElement.py

@@ -1,5 +1,5 @@
 from _Framework.Skin import SkinColorMissingError
-from _Framework.ButtonElement import ButtonElement, ON_VALUE, OFF_VALUE, ButtonValue
+from _Framework.ButtonElement import ButtonElement, ON_VALUE, OFF_VALUE
 
 class ConfigurableButtonElement(ButtonElement):
 	"""
@@ -80,7 +80,7 @@ def send_value(self, value, **k):
 			super(ConfigurableButtonElement, self).send_value(value, **k)
 		else:
 			self._draw_skin(value)
- 	
+
 	def force_next_send(self):
 		"""
 		Enforces sending the next value regardless of wether the

DefChannelStripComponent.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import Live
 from _Framework.ChannelStripComponent import ChannelStripComponent
 from ConfigurableButtonElement import ConfigurableButtonElement

DeviceComponent.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from consts import *  # noqa
 from _Framework.DeviceComponent import DeviceComponent as LiveDeviceComponent
 from _Framework.ButtonElement import ButtonElement
 from DeviceControllerStrip import DeviceControllerStrip

DeviceControllerStrip.py

@@ -1,9 +1,5 @@
-# -*- coding: utf-8 -*-
 
 from _Framework.ButtonSliderElement import ButtonSliderElement
-from _Framework.InputControlElement import *  # noqa
-from consts import *  # noqa
-import math
 
 SLIDER_MODE_OFF = 0
 SLIDER_MODE_TOGGLE = 1
@@ -75,13 +71,13 @@ def _is_quantized(self):
 		if self._parameter_to_map_to != None:	
 			return self._parameter_to_map_to.is_quantized
 		else:
-			return false
+			return False
 
 	@property
 	def _mode(self):
 		if self._parameter_to_map_to != None:	
 			if self._is_quantized:
-			 	if self._range == 1:
+				if self._range == 1:
 					return SLIDER_MODE_TOGGLE
 				elif self._range<=self._num_buttons:
 					return SLIDER_MODE_SMALL_ENUM
@@ -126,7 +122,7 @@ def _update_off(self):
 	def _update_toggle(self):
 		v =  ["DefaultButton.Disabled" for index in range(len(self._buttons))]
 		if self._value==self._max:
-		 	v[0]="Device.Toggle.On"
+			v[0]="Device.Toggle.On"
 		else:
 			v[0]="Device.Toggle.Off"
 		self._update_buttons(tuple(v))

InstrumentControllerComponent.py

@@ -1,15 +1,11 @@
-# -*- coding: utf-8 -*-
-
 import Live
 from _Framework.CompoundComponent import CompoundComponent
 from _Framework.SubjectSlot import subject_slot
 from _Framework.ButtonElement import ButtonElement
 from _Framework.Util import find_if
 from itertools import imap
 from TrackControllerComponent import TrackControllerComponent
-from ScaleComponent import *  # noqa
-from StepSequencerComponent import StepSequencerComponent
-from consts import *  # noqa
+from ScaleComponent import *
 import Settings
 
 class InstrumentControllerComponent(CompoundComponent):

Launchpad.py

@@ -1,7 +1,7 @@
 from __future__ import with_statement
 import Live
 from _Framework.ControlSurface import ControlSurface
-from _Framework.InputControlElement import *  # noqa
+from _Framework.InputControlElement import *
 from _Framework.ButtonElement import ButtonElement
 from _Framework.ButtonMatrixElement import ButtonMatrixElement
 from ConfigurableButtonElement import ConfigurableButtonElement
@@ -26,7 +26,6 @@ def __init__(self, c_instance):
 		with self.component_guard():
 			self._suppress_send_midi = True
 			self._suppress_session_highlight = True
-			is_momentary = True
 			self._suggested_input_port = ("Launchpad", "Launchpad Mini", "Launchpad S", "Launchpad MK2")
 			self._suggested_output_port = ("Launchpad", "Launchpad Mini", "Launchpad S", "Launchpad MK2")				
 			self._control_is_with_automap = False
@@ -72,7 +71,7 @@ def init(self):
 				for column in range(8):
 					if self._mk2_rgb:
 						# for mk2 buttons are assigned "top to bottom"
- 						midi_note = (81 - (10 * row)) + column
+						midi_note = (81 - (10 * row)) + column
 					else:
 						midi_note = row * 16 + column
 					button = ConfigurableButtonElement(is_momentary, MIDI_NOTE_TYPE, 0, midi_note, skin = self._skin, control_surface = self)

M4LInterface.py

@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
-
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
 
-
 class M4LInterface(ControlSurfaceComponent):
 
 	def __init__(self):

MainSelectorComponent.py

@@ -3,15 +3,14 @@
 from _Framework.ModeSelectorComponent import ModeSelectorComponent
 from _Framework.ButtonElement import ButtonElement
 from _Framework.ButtonMatrixElement import ButtonMatrixElement
-from _Framework.SessionZoomingComponent import * # noqa
+from _Framework.SessionZoomingComponent import *
 from DeviceComponent import DeviceComponent
 from SpecialSessionComponent import SpecialSessionComponent
 from InstrumentControllerComponent import InstrumentControllerComponent
-from SubSelectorComponent import *  # noqa
+from SubSelectorComponent import *
 from StepSequencerComponent import StepSequencerComponent
 from StepSequencerComponent2 import StepSequencerComponent2
 import Settings
-import traceback
 
 class MainSelectorComponent(ModeSelectorComponent):
 

NoteEditorComponent.py

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 
-from consts import *  # noqa
+from consts import *
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
 from _Framework.ButtonElement import ButtonElement
-from _Framework.ButtonMatrixElement import ButtonMatrixElement
 import time
 
 
@@ -22,7 +20,7 @@ def __init__(self, stepsequencer = None, matrix = None, control_surface = None):
 		self.display_metronome = True
 		self.metronome_color = "StepSequencer.NoteEditor.Metronome"
 
-		# Velocity colour map. this must remain of lengh 3.
+		# Velocity colour map. this must remain of length 3.
 		self.velocity_map = [70, 90, 110]
 		self.velocity_color_map = ["StepSequencer.NoteEditor.Velocity0", "StepSequencer.NoteEditor.Velocity1", "StepSequencer.NoteEditor.Velocity2"]
 		# other colors

PreciseButtonSliderElement.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from _Framework.ButtonSliderElement import ButtonSliderElement
-from _Framework.InputControlElement import *  # noqa
 SLIDER_MODE_SINGLE = 0
 SLIDER_MODE_VOLUME = 1
 SLIDER_MODE_PAN = 2
@@ -25,10 +24,10 @@ def set_mode(self, mode):
 		if (mode != self._mode):
 			self._mode = mode
 
-	def set_value_map(self, map):
-		assert isinstance(map, (tuple, type(None)))
-		assert len(map) == len(self._buttons)
-		self._value_map = map
+	def set_value_map(self, mapp):
+		assert isinstance(mapp, (tuple, type(None)))
+		assert len(mapp) == len(self._buttons)
+		self._value_map = mapp
 
 	def send_value(self, value):
 		if (not self._disabled):

ScaleComponent.py

@@ -1,6 +1,4 @@
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
-from _Framework.ToggleComponent import ToggleComponent
-#from _Framework.Control import PlayableControl, ButtonControl, ToggleButtonControl, control_matrix
 
 KEY_NAMES = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"]
 CIRCLE_OF_FIFTHS = [7 * k % 12 for k in range(12)]
@@ -206,7 +204,7 @@ def update(self):
 							if self._key == self._white_notes_index[col]+1:
 								button.set_light("Scale.Key.On")
 							else:
-								 button.set_light("Scale.Key.Off")
+								button.set_light("Scale.Key.Off")
 						elif col==2:
 							button.set_light("Scale.RelativeScale")
 						elif col==6:
@@ -224,7 +222,7 @@ def update(self):
 							if self._key == self._white_notes_index[col]:
 								button.set_light("Scale.Key.On")
 							else:
-								 button.set_light("Scale.Key.Off")
+								button.set_light("Scale.Key.Off")
 						else:
 							button.set_light("Scale.CircleOfFifths")
 				elif row==3:
@@ -274,7 +272,7 @@ def update(self):
 	#@matrix.pressed
 	def _matrix_pressed(self, value, x, y, is_momentary):
 		if self.is_enabled() and value>0:
-		 	#y, x = pad.coordinate
+			#y, x = pad.coordinate
 			# modes
 			if y == 0:
 				if not self.is_drumrack:
@@ -537,7 +535,7 @@ def _octave_and_note(self, x, y):
 	def note(self, x, y):
 		octave, note = self._octave_and_note(x, y)
 		index = self.base_note + 12 * octave + note 
-	 	root = note == self.scale[0]
+		root = note == self.scale[0]
 		highlight =  note == self.scale[2] or note == self.scale[4]
 		in_scale = note in self.scale
 		valid = index in self.valid_notes

SkinMK1.py

@@ -1,6 +1,5 @@
 from _Framework.Skin import Skin
 from .ColorsMK1 import Rgb
-from _Framework.ButtonElement import Color
 
 class Colors:
 

SkinMK2.py

@@ -1,6 +1,6 @@
 from _Framework.Skin import Skin
 from .ColorsMK2 import Rgb
-from _Framework.ButtonElement import Color
+
 
 class Colors:
 

SpecialMixerComponent.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-# import Live
 from _Framework.MixerComponent import MixerComponent
 from DefChannelStripComponent import DefChannelStripComponent
 from _Framework.ButtonElement import ButtonElement

StepSequencerComponent.py

@@ -221,7 +221,7 @@ def _update_matrix(self):
 							self._offset_buttons[i].set_on_off_values("DrumGroup.PadSelected", "DrumGroup.PadEmpty")
 					else:
 						if self._scale != None:
-						 	if i % 12 == self._scale[0]:
+							if i % 12 == self._scale[0]:
 								self._offset_buttons[i].set_on_off_values("StepSequencer.NoteSelector.Selected", "Note.Pads.Root")
 							elif i % 12 == self._scale[2] or i % 12 == self._scale[4]:
 								self._offset_buttons[i].set_on_off_values("StepSequencer.NoteSelector.Selected", "Note.Pads.Highlight")
@@ -324,30 +324,30 @@ def move(self, steps):
 		if self.can_move(steps):
 			if self.is_diatonic:
 				# find the next note in scale in that direction
-				oct = 0
+				octave = 0
 				if steps > 0:
 					while self._offset + steps >= 12:
 						steps = steps - 12
-						oct = oct + 1
+						octave = octave + 1
 					while steps != 0 and self._offset + steps not in self._scale:
 						steps = steps + 1
 						while self._offset + steps > 12:
 							steps = steps - 12
-							oct = oct + 1
+							octave = octave + 1
 				elif steps < 0:
 					while self._offset + steps < 0:
 						steps = steps + 12
-						oct = oct - 1
+						octave = octave - 1
 					while steps != 0 and self._offset + steps not in self._scale:
 						steps = steps - 1
 						if self._offset + steps < 0:
 							steps = steps + 12
-							oct = oct - 1
+							octave = octave - 1
 				try:
 					idx = self._scale.index(self._offset + steps)
 				except ValueError:
 					idx = -1
-				self.set_selected_note(self._root_note + oct * 12 + self._scale[idx])
+				self.set_selected_note(self._root_note + octave * 12 + self._scale[idx])
 			else:
 				self.set_selected_note(self._root_note + self._offset + steps)
 
@@ -364,25 +364,6 @@ def set_selected_note(self, selected_note):
 	def set_key(self, key):
 		self._key = key
 
-	def note_is_available(self, key):
-		if self.is_drumrack:
-			if self._drum_group_device.drum_pads[key].chains:
-				return True
-			else:
-				return False
-		else:
-			for note in scale:
-				if key % 12 == (self.root_note + note) % 12:
-					return True
-				else:
-					return False
-
-	def note_is_used(self, key):
-		if clip != None:
-			for note in self._clip_notes:
-				if note[0] == key:  # key: 0-127 MIDI note #
-					return True
-		return False
 
 	@property
 	def selected_note(self):
@@ -848,9 +829,9 @@ def _update_OSD(self):
 	def _is_velocity_shifted(self):
 		return self._note_editor._is_velocity_shifted
 
-	def index_of(self, list, elt):
-		for i in range(0, len(list)):
-			if (list[i] == elt):
+	def index_of(self, aList, elt):
+		for i in range(0, len(aList)):
+			if (aList[i] == elt):
 				return i
 		return(-1)
 
@@ -1291,15 +1272,15 @@ def set_mute_shift_button(self, button):
 
 
 	def _update_mute_shift_button(self):
-	 		if self.is_enabled() and self._mute_shift_button != None:
-	 			if self._clip != None and self._clip.is_midi_clip:
-	 				self._mute_shift_button.set_on_off_values("StepSequencer.Mute")
-	 				if self._is_mute_shifted:
-	 					self._mute_shift_button.turn_on()
-	 				else:
-	 					self._mute_shift_button.turn_off()
-	 			else:
-	 				self._mute_shift_button.set_light("DefaultButton.Disabled")
+			if self.is_enabled() and self._mute_shift_button != None:
+				if self._clip != None and self._clip.is_midi_clip:
+					self._mute_shift_button.set_on_off_values("StepSequencer.Mute")
+					if self._is_mute_shifted:
+						self._mute_shift_button.turn_on()
+					else:
+						self._mute_shift_button.turn_off()
+				else:
+					self._mute_shift_button.set_light("DefaultButton.Disabled")
 
 	def _mute_shift_button_value(self, value, sender):
 		assert (self._mute_shift_button != None)

StepSequencerComponent2.py

@@ -1,9 +1,9 @@
-from consts import *  # noqa
+from consts import *
 from _Framework.ControlSurfaceComponent import ControlSurfaceComponent
 from _Framework.ButtonElement import ButtonElement
 from _Framework.ButtonMatrixElement import ButtonMatrixElement
-from StepSequencerComponent import *  # noqa
-from ScaleComponent import *  # noqa
+from StepSequencerComponent import *
+from ScaleComponent import *
 from TrackControllerComponent import TrackControllerComponent
 from random import randrange
 import time