From 02d46cc522c6a479f165f606e46b9a43584ff58e Mon Sep 17 00:00:00 2001 From: Alex Charlton Date: Sun, 2 Apr 2023 21:32:25 -0700 Subject: [PATCH] Update to m8-files 0.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- core/src/song_to_midi.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56c6a38..56b7220 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "m8-files" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4f221488295b915f9cbc60da9d2743f741f5f243e5bc1665dbcba386ae3ffd" +checksum = "c0aa68cdb443cf5c8d7cdb68a21465e84325cc77a79c4984336b9595ba2d9cce" dependencies = [ "arr_macro", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 3228082..4ff7a0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,4 +18,4 @@ members = ["core"] [workspace.dependencies] midi-msg = "0.4" -m8-files = "0.1.3" \ No newline at end of file +m8-files = "0.2" \ No newline at end of file diff --git a/core/src/song_to_midi.rs b/core/src/song_to_midi.rs index 0568e9a..3eddc6b 100644 --- a/core/src/song_to_midi.rs +++ b/core/src/song_to_midi.rs @@ -61,13 +61,13 @@ impl TrackCtx { } fn change_groove(&mut self, step: &Step, song: &Song) { - if step.fx1.command == FXCommand::GRV { + if step.fx1.command_eq("GRV", song.version) { self.groove = song.grooves[step.fx1.value as usize].clone(); } - if step.fx2.command == FXCommand::GRV { + if step.fx2.command_eq("GRV", song.version) { self.groove = song.grooves[step.fx2.value as usize].clone(); } - if step.fx3.command == FXCommand::GRV { + if step.fx3.command_eq("GRV", song.version) { self.groove = song.grooves[step.fx3.value as usize].clone(); } }