Skip to content

Commit ab4bd6e

Browse files
committed
Pass midi timestamp to color_mode
1 parent 8f7382f commit ab4bd6e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/color_mode.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def LoadSettings(self, ledsettings):
4040
"""Called whenever settings change"""
4141
pass
4242

43-
def NoteOn(self, midi_event, midi_state, note_position):
43+
def NoteOn(self, midi_event, midi_time, midi_state, note_position):
4444
"""Primary high-level function for ColorMode
4545
4646
Called on midi note-on
@@ -74,7 +74,7 @@ def LoadSettings(self, ledsettings):
7474
self.green = ledsettings.get_color("Green")
7575
self.blue = ledsettings.get_color("Blue")
7676

77-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
77+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
7878
return (self.red, self.green, self.blue)
7979

8080

@@ -85,7 +85,7 @@ def LoadSettings(self, ledsettings):
8585
self.multicolor_index = 0
8686
self.multicolor_iteration = ledsettings.multicolor_iteration
8787

88-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
88+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
8989
chosen_color = self.get_random_multicolor_in_range(midi_event.note)
9090
return chosen_color
9191

@@ -141,7 +141,7 @@ def LoadSettings(self, ledsettings):
141141
self.timeshift = int(ledsettings.rainbow_timeshift)
142142
self.timeshift_start = time.time()
143143

144-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
144+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
145145
shift = (time.time() - self.timeshift_start) * self.timeshift
146146
return self.calculate_rainbow_colors(note_position, shift)
147147

@@ -165,7 +165,7 @@ def LoadSettings(self, ledsettings):
165165
self.speed_period_in_seconds = ledsettings.speed_period_in_seconds
166166
self.speed_max_notes = ledsettings.speed_max_notes
167167

168-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
168+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
169169
current_time = time.time()
170170
self.notes_in_last_period.append(current_time)
171171
return self.speed_get_colors()
@@ -204,7 +204,7 @@ def LoadSettings(self, ledsettings):
204204
"green": int(ledsettings.usersettings.get_setting_value("gradient_end_green")),
205205
"blue": int(ledsettings.usersettings.get_setting_value("gradient_end_blue"))}
206206

207-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
207+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
208208
return self.gradient_get_colors(note_position)
209209

210210
def gradient_get_colors(self, position):
@@ -224,7 +224,7 @@ def LoadSettings(self, ledsettings):
224224
self.key_in_scale = ledsettings.key_in_scale
225225
self.key_not_in_scale = ledsettings.key_not_in_scale
226226

227-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position):
227+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
228228
scale_colors = get_scale_color(self.scale_key, midi_event.note, self.key_in_scale, self.key_not_in_scale)
229229
return scale_colors
230230

@@ -235,7 +235,7 @@ def LoadSettings(self, ledsettings):
235235
self.scale = int(ledsettings.velocityrainbow_scale)
236236
self.curve = int(ledsettings.velocityrainbow_curve)
237237

238-
def NoteOn(self, midi_event: mido.Message, midi_state, note_position=None):
238+
def NoteOn(self, midi_event: mido.Message, midi_time, midi_state, note_position):
239239
x = int(((255 * powercurve(midi_event.velocity / 127, self.curve / 100)
240240
* (self.scale / 100) % 256) + self.offset) % 256)
241241
x2 = colorsys.hsv_to_rgb(x / 255, 1, (midi_event.velocity / 127) * 0.3 + 0.7)

visualizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def start_webserver():
413413
if note_position >= ledstrip.led_number or note_position < 0:
414414
continue
415415

416-
color = color_mode.NoteOn(msg, None, note_position)
416+
color = color_mode.NoteOn(msg, msg_timestamp, None, note_position)
417417
if color is not None:
418418
red, green, blue = color
419419
else:

0 commit comments

Comments
 (0)