diff --git a/tracker/agb-tracker-interop/src/lib.rs b/tracker/agb-tracker-interop/src/lib.rs index 5932452b..bfd9a091 100644 --- a/tracker/agb-tracker-interop/src/lib.rs +++ b/tracker/agb-tracker-interop/src/lib.rs @@ -22,7 +22,7 @@ pub struct Sample<'a> { pub should_loop: bool, pub restart_point: u32, pub volume: Num, - pub envelope: Option, + pub volume_envelope: Option, } #[derive(Debug)] @@ -176,10 +176,10 @@ impl<'a> quote::ToTokens for Sample<'a> { should_loop, restart_point, volume, - envelope, + volume_envelope, } = self; - let envelope = match envelope { + let volume_envelope = match volume_envelope { Some(index) => quote!(Some(#index)), None => quote!(None), }; @@ -198,7 +198,7 @@ impl<'a> quote::ToTokens for Sample<'a> { should_loop: #should_loop, restart_point: #restart_point, volume: agb_tracker::__private::Num::from_raw(#volume), - envelope: #envelope, + volume_envelope: #volume_envelope, } } }); diff --git a/tracker/agb-xm-core/src/lib.rs b/tracker/agb-xm-core/src/lib.rs index 02cfcc93..2588003c 100644 --- a/tracker/agb-xm-core/src/lib.rs +++ b/tracker/agb-xm-core/src/lib.rs @@ -377,7 +377,7 @@ pub fn parse_module(module: &Module) -> TokenStream { should_loop: sample.should_loop, restart_point: sample.restart_point, volume: sample.volume, - envelope: None, + volume_envelope: None, }) .collect();