diff options
Diffstat (limited to 'audio/src/data.rs')
| -rw-r--r-- | audio/src/data.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/audio/src/data.rs b/audio/src/data.rs index f130c2d..934e186 100644 --- a/audio/src/data.rs +++ b/audio/src/data.rs @@ -2,21 +2,21 @@ use crate::program::Track; use std::fs; macro_rules! load_asm { - ($looping:tt, $path:tt) => {{ + ($path:tt) => {{ let res = if cfg!(any(feature = "static", target_arch = "wasm32")) { let src = include_str!(concat!("../../", $path)); - Track::parse(src, $looping) + Track::parse(src) } else { let src = fs::read_to_string($path)?; - Track::parse(&src, $looping) + Track::parse(&src) }; res.map_err(|mut err| { err.file = Some(String::from($path)); err })? }}; - ($looping:tt, $first:tt, $($arg:tt),*) => { - load_asm!($looping, $first)$(.merge(load_asm!($looping, $arg)))* + ($first:tt, $($arg:tt),*) => { + load_asm!($first)$(.merge(load_asm!($arg)))* }; } @@ -28,17 +28,15 @@ pub struct Data { impl Data { pub fn load() -> crate::Result<Self> { let explore = load_asm!( - true, "assets/asm/explore_melody.asm", "assets/asm/explore_harmony1.asm", "assets/asm/explore_harmony2.asm" ); let megalovania = load_asm!( - true, "assets/asm/megalovania_melody.asm", "assets/asm/megalovania_base.asm" ); - let test = load_asm!(false, "assets/asm/test.asm"); + let test = load_asm!("assets/asm/test.asm"); Ok(Self { explore, megalovania, |