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

Use 32768Hz for the tracker

Browse source
This commit is contained in:
Gwilym Inzani 2023-09-05 23:22:50 +01:00
parent ff4154699a
commit 0c19988699
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/the-dungeon-puzzlers-lament/src/lib.rs
View file

@ -109,7 +109,7 @@ pub fn entry(mut gba: agb::Gba) -> ! {
let _ = save::save_max_level(&mut gba.save, 0); let _ = save::save_max_level(&mut gba.save, 0);
} }
let mut mixer = gba.mixer.mixer(Frequency::Hz18157); let mut mixer = gba.mixer.mixer(Frequency::Hz32768);
let sfx = Sfx::new(&mut mixer); let sfx = Sfx::new(&mut mixer);
let mut g = Agb { let mut g = Agb {

23
examples/the-dungeon-puzzlers-lament/src/sfx.rs
View file

@ -1,4 +1,5 @@
use agb::{ use agb::{
fixnum::num,
include_wav, include_wav,
sound::mixer::{Mixer, SoundChannel}, sound::mixer::{Mixer, SoundChannel},
}; };
@ -37,38 +38,38 @@ impl<'a> Sfx<'a> {
} }
pub fn bad_selection(&mut self) { pub fn bad_selection(&mut self) {
self.mixer.play_sound(SoundChannel::new(BAD_SELECTION)); self.play_effect(BAD_SELECTION);
} }
pub fn select(&mut self) { pub fn select(&mut self) {
self.mixer.play_sound(SoundChannel::new(SELECT)); self.play_effect(SELECT);
} }
pub fn place(&mut self) { pub fn place(&mut self) {
self.mixer.play_sound(SoundChannel::new(PLACE)); self.play_effect(PLACE);
} }
pub fn play_sound_effect(&mut self, effect: Option<SoundEffect>) { pub fn play_sound_effect(&mut self, effect: Option<SoundEffect>) {
if let Some(effect) = effect { if let Some(effect) = effect {
match effect { match effect {
SoundEffect::WallHit => { SoundEffect::WallHit => {
self.mixer.play_sound(SoundChannel::new(WALL_HIT)); self.play_effect(WALL_HIT);
} }
SoundEffect::SlimeDie => { SoundEffect::SlimeDie => {
self.mixer.play_sound(SoundChannel::new(SLIME_DEATH)); self.play_effect(SLIME_DEATH);
} }
SoundEffect::HeroDie => {} SoundEffect::HeroDie => {}
SoundEffect::SquidDie => {} SoundEffect::SquidDie => {}
SoundEffect::SwordPickup => { SoundEffect::SwordPickup => {
self.mixer.play_sound(SoundChannel::new(SWORD_PICKUP)); self.play_effect(SWORD_PICKUP);
} }
SoundEffect::SwordKill => {} SoundEffect::SwordKill => {}
SoundEffect::KeyPickup => {} SoundEffect::KeyPickup => {}
SoundEffect::DoorOpen => { SoundEffect::DoorOpen => {
self.mixer.play_sound(SoundChannel::new(DOOR_OPEN)); self.play_effect(DOOR_OPEN);
} }
SoundEffect::SwitchToggle => { SoundEffect::SwitchToggle => {
self.mixer.play_sound(SoundChannel::new(SWICTH_TOGGLES[0])); self.play_effect(SWICTH_TOGGLES[0]);
} }
SoundEffect::KeyDrop => {} SoundEffect::KeyDrop => {}
SoundEffect::SwordDrop => {} SoundEffect::SwordDrop => {}
@ -77,6 +78,12 @@ impl<'a> Sfx<'a> {
} }
} }
} }
fn play_effect(&mut self, effect: &'static [u8]) {
let mut channel = SoundChannel::new(effect);
channel.playback(num!(0.5));
self.mixer.play_sound(channel);
}
} }
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)] #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]

2
tracker/agb-tracker/examples/basic.rs
View file

@ -12,7 +12,7 @@ const DB_TOFFE: Track = include_xm!("examples/db_toffe.xm");
fn main(mut gba: Gba) -> ! { fn main(mut gba: Gba) -> ! {
let vblank_provider = agb::interrupt::VBlank::get(); let vblank_provider = agb::interrupt::VBlank::get();
let mut mixer = gba.mixer.mixer(Frequency::Hz18157); let mut mixer = gba.mixer.mixer(Frequency::Hz32768);
mixer.enable(); mixer.enable();
let mut tracker = Tracker::new(&DB_TOFFE); let mut tracker = Tracker::new(&DB_TOFFE);

2
tracker/agb-tracker/examples/timing.rs
View file

@ -18,7 +18,7 @@ fn main(mut gba: Gba) -> ! {
timer.set_enabled(true); timer.set_enabled(true);
timer2.set_cascade(true).set_enabled(true); timer2.set_cascade(true).set_enabled(true);
let mut mixer = gba.mixer.mixer(Frequency::Hz18157); let mut mixer = gba.mixer.mixer(Frequency::Hz32768);
mixer.enable(); mixer.enable();
let mut tracker = Tracker::new(&DB_TOFFE); let mut tracker = Tracker::new(&DB_TOFFE);

2
tracker/agb-xm-core/src/lib.rs
View file

@ -475,7 +475,7 @@ fn note_to_speed(
FrequencyType::AmigaFrequencies => note_to_frequency_amega(note, fine_tune, relative_note), FrequencyType::AmigaFrequencies => note_to_frequency_amega(note, fine_tune, relative_note),
}; };
let gba_audio_frequency = 18157f64; let gba_audio_frequency = 32768f64;
let speed = frequency / gba_audio_frequency; let speed = frequency / gba_audio_frequency;
Num::from_f64(speed) Num::from_f64(speed)