Skip to content

Commit faf07a6

Browse files
committed
fretboard: make lookup table 128 bits
1 parent e5203c4 commit faf07a6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/backend/muxml/fretboard.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ pub fn get_fretboard_note2(string: char, fret: u8) -> Option<MuxmlNote2> {
4646
/// cache line
4747
/// Generated by tools/gen_note_lookup.rs
4848
#[rustfmt::skip]
49-
const STRING_BASE_NOTES: [Option<NonZeroU8>;256] = unsafe {[None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(45).unwrap_unchecked()), Some(NonZeroU8::new(59).unwrap_unchecked()), None, Some(NonZeroU8::new(50).unwrap_unchecked()), Some(NonZeroU8::new(40).unwrap_unchecked()), None, Some(NonZeroU8::new(55).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(62).unwrap_unchecked()), Some(NonZeroU8::new(64).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]};
49+
const STRING_BASE_NOTES: [Option<NonZeroU8>;128] = unsafe {[None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(45).unwrap_unchecked()), Some(NonZeroU8::new(59).unwrap_unchecked()), None, Some(NonZeroU8::new(50).unwrap_unchecked()), Some(NonZeroU8::new(40).unwrap_unchecked()), None, Some(NonZeroU8::new(55).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(62).unwrap_unchecked()), Some(NonZeroU8::new(64).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]};

tools/gen_note_lookup.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
use std::fmt::Write;
22
use std::num::NonZeroU8;
33
fn main() {
4-
let mut lookup = vec![String::from("None"); 256];
4+
let mut lookup = vec![String::from("None"); 128];
55
let mut set_lookup = |c: char, value: u8| {
66
lookup[c as usize] = format!("Some(NonZeroU8::new({value}).unwrap_unchecked())");
77
};
88
// octave * 12 + offset in the 12-scale
9-
// (so octave 0, C = 0)
9+
// (so octave 0, C = 0).
10+
// Incidentally, this is also the encoding used by MIDI.
1011
set_lookup('E', 3 * 12 + 4);
1112
set_lookup('A', 3 * 12 + 9);
1213
set_lookup('D', 4 * 12 + 2);

0 commit comments

Comments
 (0)