From 38e5cfaf187dac0cc31e46eb18bf3e6575587c42 Mon Sep 17 00:00:00 2001 From: ashley Date: Fri, 25 Aug 2023 13:34:28 -0400 Subject: [PATCH] Compact sequences of delays globally instead of locally per row --- src/reskit/soundtrack/engines/echo.rs | 10 +++++----- src/reskit/soundtrack/formats/dmf.rs | 13 +++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/reskit/soundtrack/engines/echo.rs b/src/reskit/soundtrack/engines/echo.rs index 8a678af..eb2c51c 100644 --- a/src/reskit/soundtrack/engines/echo.rs +++ b/src/reskit/soundtrack/engines/echo.rs @@ -385,7 +385,7 @@ fn apply_effects_to_channel( channel: &mut Channel, effects: &LinkedHashSet ) -> Result, Box> { +pub fn compact_delays( events: Vec ) -> Result, Box> { let mut new_events: Vec = Vec::new(); let mut current_sequence: Vec = Vec::new(); @@ -435,8 +435,8 @@ fn compact_delays( events: Vec ) -> Result, Box Result, Box> { - let mut events: Vec = Vec::new(); +fn get_delays( events: Vec, channels: &mut [Channel], ticks_to_wait: u8 ) -> Result, Box> { + let mut events: Vec = events; // All portamento effects deploy per tick, not per row. So we need to aggregate all portamentos across all // channels for this row, then flush them once per `ticks_to_wait` for this row. @@ -469,7 +469,7 @@ fn get_delays( channels: &mut [Channel], ticks_to_wait: u8 ) -> Result, events.extend( get_events_for_channel( &mut channels[ i ], subrows[ i ] )? ); } - Ok( get_delays( channels, ticks_to_wait )? ) + Ok( get_delays( events, channels, ticks_to_wait )? ) } \ No newline at end of file diff --git a/src/reskit/soundtrack/formats/dmf.rs b/src/reskit/soundtrack/formats/dmf.rs index a791a50..abc23b2 100644 --- a/src/reskit/soundtrack/formats/dmf.rs +++ b/src/reskit/soundtrack/formats/dmf.rs @@ -3,7 +3,7 @@ use flate2::read::ZlibDecoder; use linked_hash_set::LinkedHashSet; use samplerate::convert; use uuid::Uuid; -use crate::reskit::{utility::{get_string, get_u8, skip, get_u32, get_i8, get_i32, get_u16, get_i16, Ring, print_warning, print_info}, soundtrack::{types::{SampleFormat, PsgEnvelope, Note, Sample, PsgSettings, PatternRow, Effect, DcsgChannelMode, NoiseType, Channel}, engines::echo::{EchoFormat, EchoEvent, ESF_FM_1, ESF_FM_2, ESF_FM_3, ESF_FM_4, ESF_FM_5, ESF_PSG_1, ESF_FM_6, ESF_PSG_2, ESF_PSG_3, ESF_PSG_4, get_events_for_row}}}; +use crate::reskit::{utility::{get_string, get_u8, skip, get_u32, get_i8, get_i32, get_u16, get_i16, Ring, print_warning, print_info}, soundtrack::{types::{SampleFormat, PsgEnvelope, Note, Sample, PsgSettings, PatternRow, Effect, DcsgChannelMode, NoiseType, Channel}, engines::echo::{EchoFormat, EchoEvent, ESF_FM_1, ESF_FM_2, ESF_FM_3, ESF_FM_4, ESF_FM_5, ESF_PSG_1, ESF_FM_6, ESF_PSG_2, ESF_PSG_3, ESF_PSG_4, get_events_for_row, compact_delays}}}; const DMF_MAGIC_NUMBER: &'static str = ".DelekDefleMask."; const DMF_SUPPORTED_VERSION: u8 = 27; @@ -942,6 +942,7 @@ impl EchoFormat for DmfModule { // Iterate for each row, for each channel // Recall items are stored as self.channel_patterns[ channel ][ row_number ] + let mut all_events: Vec = Vec::new(); for row_number in 0..self.rows_per_pattern { let events_this_row: Vec = get_events_for_row( &mut channels, @@ -961,9 +962,13 @@ impl EchoFormat for DmfModule { )?; // Transfer ESF events to the main stream - for event in events_this_row { - esf.extend( event ); - } + all_events.extend( events_this_row ); + } + + // Compact sequences of delays to save rom space + let all_events = compact_delays( all_events )?; + for event in all_events { + esf.extend( event ); } Ok( esf )