diff options
Diffstat (limited to 'src/player.rs')
| -rw-r--r-- | src/player.rs | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/src/player.rs b/src/player.rs index d33b622..6afc17a 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,6 +1,6 @@ use crate::utils::Rational; use crate::itfile::ITFile; -use crate::portmod::Effect; +use crate::portmod::{Effect, NoteCommand}; pub struct PlayerState { skip_row: Option<u8>, @@ -53,6 +53,21 @@ pub struct BasePlayer<'itfile> { impl<'itfile> BasePlayer<'itfile> { pub fn new(it: &ITFile) -> BasePlayer { BasePlayer{it} } + fn process_voice_commands(&self, state: &PlayerState, chmem: [ChannelMemory; 64]) -> [ChannelMemory; 64] { + let pat = self.it.orders[state.current_ord as usize] as usize; + std::array::from_fn(|ch| { + let itcell = self.it.patterns[pat].cell_at(state.current_row, ch as u8); + let cell = crate::portmod::Cell::from_it_cell(itcell); + let (note, pitch) = if let Some(ncmd) = cell.note { + match ncmd { + NoteCommand::NoteOn(n) => (Some(n), Some(n.into())), + _ => (None, None) + } + } else { (chmem[ch].note, chmem[ch].pitch) }; + let inst = if cell.inst.is_some() { cell.inst } else { chmem[ch].inst }; + ChannelMemory{note, inst, pitch} + }) + } fn process_transport_commands(&self, state: PlayerState) -> PlayerState { let pat = self.it.orders[state.current_ord as usize] as usize; (0..64).fold(state, |state, ch| { @@ -101,8 +116,17 @@ impl<'itfile> BasePlayer<'itfile> { } } +//TODO: proper voice system in the future +#[derive(Default)] +pub struct ChannelMemory { + pub note: Option<u8>, + pub inst: Option<u8>, + pub pitch: Option<Rational>, +} + pub struct BasePlayerStateEx { - loop_detected: bool + loop_detected: bool, + channel_mems: [ChannelMemory; 64] } impl<'itfile> Player for BasePlayer<'itfile> { @@ -122,9 +146,11 @@ impl<'itfile> Player for BasePlayer<'itfile> { loop_ctr: u8::MAX, row_extension: 0, in_rep: false - }, BasePlayerStateEx{ loop_detected: false}) + }, BasePlayerStateEx{ loop_detected: false, channel_mems: std::array::from_fn(|_| Default::default()) }) } fn process_row(&self, state: PlayerState, statex: Self::PlayerStateExtension) -> (PlayerState, Self::PlayerStateExtension) { + let chmem_next = self.process_voice_commands(&state, statex.channel_mems); + let statex = BasePlayerStateEx{channel_mems: chmem_next, ..statex}; let state = self.process_transport_commands(state); let (state_next, statex) = if state.current_tick + 1 < state.speed + state.row_extension { // still within the current row @@ -134,14 +160,14 @@ impl<'itfile> Player for BasePlayer<'itfile> { let (state, statex) = match (state.skip_row, state.skip_ord) { (Some(skip_row), Some(skip_ord)) => { (PlayerState{current_row: skip_row, current_ord: skip_ord, ..state}, - BasePlayerStateEx{loop_detected: skip_ord < state.current_ord && !state.loop_ctr == 0}) + BasePlayerStateEx{loop_detected: skip_ord < state.current_ord && !state.loop_ctr == 0, ..statex}) }, (Some(skip_row), None) => { // this is also handled in Player::skip_to... only keep one of them? (PlayerState{current_row: skip_row, current_ord: state.current_ord + 1, ..state}, statex) }, (None, Some(skip_ord)) => { (PlayerState{current_row: 0, current_ord: skip_ord, ..state}, - BasePlayerStateEx{loop_detected: skip_ord < state.current_ord && !state.loop_ctr == 0}) + BasePlayerStateEx{loop_detected: skip_ord < state.current_ord && !state.loop_ctr == 0, ..statex}) }, (None, None) => { let (row, ord) = if state.current_row + 1 < self.it.patterns[self.it.orders[state.current_ord as usize] as usize].nrows { |