simon/brd
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Try to use second sound if sound not found

Browse source 
In wave banks with two entries the second sound should be the full song.
This commit is contained in:
Simon Bruder 2020-06-23 14:34:49 +02:00
parent a1ba24bc87
commit 8556a4390f
No known key found for this signature in database
GPG key ID: 6F03E0000CC5B62F
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -4,7 +4,7 @@ use std::path::PathBuf;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use clap::Clap; use clap::Clap;
use log::{debug, error, info}; use log::{debug, error, info, warn};
use brd::converter; use brd::converter;
use brd::ddr::ssq::SSQ; use brd::ddr::ssq::SSQ;
@ -161,9 +161,15 @@ fn main() -> Result<()> {
let audio_data = if wave_bank.sounds.contains_key(sound_name) { let audio_data = if wave_bank.sounds.contains_key(sound_name) {
wave_bank.sounds.get(sound_name).unwrap().to_wav()? wave_bank.sounds.get(sound_name).unwrap().to_wav()?
} else if wave_bank.sounds.contains_key("1") {
warn!(
"Sound {} not found in wave bank, using second entry",
sound_name
);
wave_bank.sounds.get("1").unwrap().to_wav()?
} else { } else {
return error(format!( return error(format!(
"Could not find sound with chart name {} in wave bank", "Could not find sound with chart name {} or second numbered entry in wave bank",
sound_name, sound_name,
)); ));
}; };