falso
/
voctool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use number_type for magic numbers.

This commit is contained in:
Pedro de Oliveira 2023-04-23 01:38:51 +01:00
parent 295631802d
commit d8b5d0d948
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/voc/blocks.rs
View File

@ -111,7 +111,7 @@ impl SoundData {
pub fn from_stream(file: &mut File, start_address: u64, end_address: u64) -> Self { pub fn from_stream(file: &mut File, start_address: u64, end_address: u64) -> Self {
let mut frequency_divisor_buffer: [u8; 1] = [0]; let mut frequency_divisor_buffer: [u8; 1] = [0];
file.read_exact(&mut frequency_divisor_buffer).unwrap(); file.read_exact(&mut frequency_divisor_buffer).unwrap();
let sample_rate: u32 = 1000000u32 / (256u32 - frequency_divisor_buffer[0] as u32); let sample_rate: u32 = 1000000_u32 / (256_u32 - frequency_divisor_buffer[0] as u32);
let mut codec_buffer: [u8; 1] = [0]; let mut codec_buffer: [u8; 1] = [0];
file.read_exact(&mut codec_buffer).unwrap(); file.read_exact(&mut codec_buffer).unwrap();
@ -148,7 +148,7 @@ impl SoundData {
impl Block for SoundData { impl Block for SoundData {
fn to_bytes(&self) -> Vec<u8> { fn to_bytes(&self) -> Vec<u8> {
let size_bytes: [u8; 4] = (self.data.len() as u32 + 2).to_le_bytes(); let size_bytes: [u8; 4] = (self.data.len() as u32 + 2).to_le_bytes();
let frequency_divisor: u8 = (256u32 - 1000000u32 / self.sample_rate) as u8; let frequency_divisor: u8 = (256_u32 - 1000000_u32 / self.sample_rate) as u8;
let mut result: Vec<u8> = vec![ let mut result: Vec<u8> = vec![
self.block_type as u8, self.block_type as u8,
@ -262,7 +262,7 @@ impl Silence {
let mut frequency_divisor_buffer: [u8; 1] = [0]; let mut frequency_divisor_buffer: [u8; 1] = [0];
file.read_exact(&mut frequency_divisor_buffer).unwrap(); file.read_exact(&mut frequency_divisor_buffer).unwrap();
let sample_rate: u32 = 1000000u32 / (256u32 - frequency_divisor_buffer[0] as u32); let sample_rate: u32 = 1000000_u32 / (256_u32 - frequency_divisor_buffer[0] as u32);
Self { Self {
info: Some(BlockInfo { info: Some(BlockInfo {
@ -279,9 +279,9 @@ impl Silence {
impl Block for Silence { impl Block for Silence {
fn to_bytes(&self) -> Vec<u8> { fn to_bytes(&self) -> Vec<u8> {
let size_bytes: [u8; 4] = 3u32.to_le_bytes(); let size_bytes: [u8; 4] = 3_u32.to_le_bytes();
let length_bytes: [u8; 2] = (self.length - 1).to_le_bytes(); let length_bytes: [u8; 2] = (self.length - 1).to_le_bytes();
let frequency_divisor: u8 = (256u32 - 1000000u32 / self.sample_rate) as u8; let frequency_divisor: u8 = (256_u32 - 1000000_u32 / self.sample_rate) as u8;
let result: Vec<u8> = vec![ let result: Vec<u8> = vec![
self.block_type as u8, self.block_type as u8,
@ -344,7 +344,7 @@ impl Marker {
impl Block for Marker { impl Block for Marker {
fn to_bytes(&self) -> Vec<u8> { fn to_bytes(&self) -> Vec<u8> {
let size_bytes: [u8; 4] = 2u32.to_le_bytes(); let size_bytes: [u8; 4] = 2_u32.to_le_bytes();
let value_bytes: [u8; 2] = self.value.to_le_bytes(); let value_bytes: [u8; 2] = self.value.to_le_bytes();
let result: Vec<u8> = vec![ let result: Vec<u8> = vec![
@ -467,7 +467,7 @@ impl RepeatStart {
impl Block for RepeatStart { impl Block for RepeatStart {
fn to_bytes(&self) -> Vec<u8> { fn to_bytes(&self) -> Vec<u8> {
let size_bytes: [u8; 4] = 2u32.to_le_bytes(); let size_bytes: [u8; 4] = 2_u32.to_le_bytes();
let count_bytes: [u8; 2] = (self.count - 1).to_le_bytes(); let count_bytes: [u8; 2] = (self.count - 1).to_le_bytes();
let result: Vec<u8> = vec![ let result: Vec<u8> = vec![