polsevev/BeepSortRust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small sound improvement

Browse source
This commit is contained in:
Rolf Martin Glomsrud 2023-03-05 04:13:02 +01:00
parent 8b89189902
commit 44c04dbdc2
2 changed files with 5 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GuiHookVec.rs
View file

@ -237,7 +237,7 @@ impl SortingList for GuiVec{
if time::get_time() + 0.05 >= self.lastPlayed{ if time::get_time() + 0.05 >= self.lastPlayed{
play_sound(self.sounds[ (self.list[i].position * 1000 / self.list.len()) ], PlaySoundParams{ play_sound(self.sounds[ (self.list[i].position * 1000 / self.list.len()) ], PlaySoundParams{
looped:false, looped:false,
volume:0.5 volume:1.
}); });
self.lastPlayed = time::get_time()+0.05; self.lastPlayed = time::get_time()+0.05;
} }

62
src/soundGenerator.rs
View file

@ -63,11 +63,12 @@ pub async fn generateTone(frequency: f32, duration:f32) -> Sound{
let startAudio = soundFileBytes.len(); let startAudio = soundFileBytes.len();
let mut collect = Vec::new(); let mut collect = Vec::new();
let lim = ((SAMPLE_RATE as f32 * duration) as usize);
for i in 0..((SAMPLE_RATE as f32 * duration) as usize){ for i in 0..((SAMPLE_RATE as f32 * duration) as usize){
let amplitude = 500. * f32::sin((i as f32 - 300.) / 1200.); let amplitude = 500. * f32::sin((i as f32 - 300.) / 1200.);
let value = f32::sin((2. * PI * (i as f32) * (frequency as f32)) / SAMPLE_RATE as f32); let value = f32::sin((2. * PI * (i as f32) * (frequency as f32)) / SAMPLE_RATE as f32);
let channel = (amplitude * value); let channel = (amplitude * if i+100 > lim {0.} else {value});
println!("{}", value);
collect.push(channel); collect.push(channel);
soundFileBytes.append(&mut (channel as i16).to_le_bytes().to_vec()); soundFileBytes.append(&mut (channel as i16).to_le_bytes().to_vec());
@ -91,63 +92,6 @@ pub async fn generateTone(frequency: f32, duration:f32) -> Sound{
let sound = load_sound_from_bytes(&soundFileBytes).await.expect("Failed to load"); let sound = load_sound_from_bytes(&soundFileBytes).await.expect("Failed to load");
play_sound_once(sound);
let frequency = 1200.0;
soundFileBytes.clear();
soundFileBytes.append(&mut CHUNK_ID.clone().as_bytes().to_vec());
soundFileBytes.append(&mut CHUNK_SIZE.clone().as_bytes().to_vec());
soundFileBytes.append(&mut FORMAT.clone().as_bytes().to_vec());
soundFileBytes.append(&mut SUBCHUNK_1_ID.clone().as_bytes().to_vec());
write_as_bytes(&mut soundFileBytes, SUBCHUNK_1_SIZE, 4);
write_as_bytes(&mut soundFileBytes, AUDIO_FORMAT, 2) ;
write_as_bytes(&mut soundFileBytes, NUM_CHANNELS, 2);
write_as_bytes(&mut soundFileBytes, SAMPLE_RATE, 4);
write_as_bytes(&mut soundFileBytes, BYTE_RATE, 4);
write_as_bytes(&mut soundFileBytes, BLOACK_ALIGN, 2);
write_as_bytes(&mut soundFileBytes, BITS_PR_SAMPLE, 2);
soundFileBytes.append(&mut SUBCHUNK_2_ID.clone().as_bytes().to_vec());
soundFileBytes.append(&mut SUBCHUNK_2_SIZE.clone().as_bytes().to_vec());
let startAudio = soundFileBytes.len();
let mut collect = Vec::new();
for i in 0..((SAMPLE_RATE as f32 * duration) as usize){
let amplitude = 500. * f32::sin((i as f32 - 300.) / 1200.);
let value = f32::sin((2. * PI * (i as f32) * (frequency as f32)) / SAMPLE_RATE as f32);
let channel = (amplitude * value);
collect.push(channel);
soundFileBytes.append(&mut (channel as i16).to_le_bytes().to_vec());
}
let endAudio = soundFileBytes.len();
let mut holder = Vec::new();
write_as_bytes(&mut holder, endAudio-startAudio, 4);
for i in 0..4{
soundFileBytes[(startAudio-4)+i] = holder[i];
}
holder.clear();
write_as_bytes(&mut holder, 36+endAudio-startAudio, 4);
for i in 0..4{
soundFileBytes[4+i] = holder[i];
}
play_sound_once(sound);
sound sound
} }