alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume agb-tracker-interop dependency

Browse source
This commit is contained in:
Gwilym Inzani 2023-07-13 00:04:41 +01:00
parent a8d751a0ef
commit 86db9d15bf
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tracker/agb-tracker-interop/src/lib.rs
View file

@ -52,14 +52,12 @@ impl<'a> quote::ToTokens for Track<'a> {
tokens.append_all(quote! {
{
use agb_tracker_interop::*;
const SAMPLES: &[Sample<'static>] = &[#(#samples),*];
const PATTERN_DATA: &[PatternSlot] = &[#(#pattern_data),*];
const PATTERNS: &[Pattern] = &[#(#patterns),*];
const SAMPLES: &[agb_tracker::__private::agb_tracker_interop::Sample<'static>] = &[#(#samples),*];
const PATTERN_DATA: &[agb_tracker::__private::agb_tracker_interop::PatternSlot] = &[#(#pattern_data),*];
const PATTERNS: &[agb_tracker::__private::agb_tracker_interop::Pattern] = &[#(#patterns),*];
const PATTERNS_TO_PLAY: &[usize] = &[#(#patterns_to_play),*];
Track {
agb_tracker::Track {
samples: SAMPLES,
pattern_data: PATTERN_DATA,
patterns: PATTERNS,
@ -95,13 +93,11 @@ impl<'a> quote::ToTokens for Sample<'a> {
tokens.append_all(quote! {
{
use agb_tracker_interop::*;
#[repr(align(4))]
struct AlignmentWrapper<const N: usize>([u8; N]);
const SAMPLE_DATA: &[u8] = &AlignmentWrapper(*#samples).0;
agb_tracker_interop::Sample { data: SAMPLE_DATA, should_loop: #should_loop }
agb_tracker::__private::agb_tracker_interop::Sample { data: SAMPLE_DATA, should_loop: #should_loop }
}
});
}
@ -124,17 +120,12 @@ impl quote::ToTokens for PatternSlot {
let panning = panning.to_raw();
tokens.append_all(quote! {
{
use agb_tracker::__private::*;
use agb::fixnum::Num;
PatternSlot {
volume: Num::from_raw(#volume),
speed: Num::from_raw(#speed),
panning: Num::from_raw(#panning),
agb_tracker::__private::agb_tracker_interop::PatternSlot {
volume: agb_tracker::__private::Num::from_raw(#volume),
speed: agb_tracker::__private::Num::from_raw(#speed),
panning: agb_tracker::__private::Num::from_raw(#panning),
sample: #sample,
}
}
});
}
}
@ -150,14 +141,10 @@ impl quote::ToTokens for Pattern {
} = self;
tokens.append_all(quote! {
{
use agb_tracker_interop::*;
Pattern {
agb_tracker::__private::agb_tracker_interop::Pattern {
length: #length,
start_position: #start_position,
}
}
})
}
}

7
tracker/agb-tracker/src/lib.rs
View file

@ -14,9 +14,12 @@ use agb::sound::mixer::{ChannelId, Mixer, SoundChannel};
#[cfg(feature = "xm")]
pub use agb_xm::import_xm;
pub use agb_tracker_interop as __private;
pub mod __private {
pub use agb::fixnum::Num;
pub use agb_tracker_interop;
}
pub use __private::Track;
pub use agb_tracker_interop::Track;
pub struct Tracker {
track: &'static Track<'static>,