vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

examples: fix `./v -W -Wfatal-errors build-examples`, run vfmt

pull/8281/head
Delyan Angelov 2021-01-22 22:22:27 +02:00
parent 7c7df37abb
commit 12897d1e2b
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/sokol/sounds/wav_player.v
View File

@ -48,16 +48,16 @@ fn audio_player_callback(buffer &f32, num_frames int, num_channels int, mut p Pl
p.finished = true p.finished = true
return return
} }
unsafe {C.memcpy(buffer, &p.samples[p.pos], nsamples * int(sizeof(f32)))} unsafe { C.memcpy(buffer, &p.samples[p.pos], nsamples * int(sizeof(f32))) }
p.pos += nsamples p.pos += nsamples
} }
fn (mut p Player) init() { fn (mut p Player) init() {
audio.setup({ audio.setup(
num_channels: 2 num_channels: 2
stream_userdata_cb: audio_player_callback stream_userdata_cb: audio_player_callback
user_data: p user_data: p
}) )
} }
fn (mut p Player) stop() { fn (mut p Player) stop() {
@ -104,15 +104,15 @@ struct RIFFChunkHeader {
} }
struct RIFFFormat { struct RIFFFormat {
format_tag u16 // PCM = 1; Values other than 1 indicate some form of compression. format_tag u16 // PCM = 1; Values other than 1 indicate some form of compression.
nchannels u16 // Nc ; 1 = mono ; 2 = stereo nchannels u16 // Nc ; 1 = mono ; 2 = stereo
sample_rate u32 // F sample_rate u32 // F
avg_bytes_per_second u32 // F * M*Nc avg_bytes_per_second u32 // F * M*Nc
nblock_align u16 // M*Nc nblock_align u16 // M*Nc
bits_per_sample u16 // 8 * M bits_per_sample u16 // 8 * M
cbsize u16 // Size of the extension: 22 cbsize u16 // Size of the extension: 22
valid_bits_per_sample u16 // at most 8*M valid_bits_per_sample u16 // at most 8*M
channel_mask u32 // Speaker position mask channel_mask u32 // Speaker position mask
sub_format [16]byte // GUID sub_format [16]byte // GUID
} }
@ -140,7 +140,7 @@ fn read_wav_file_samples(fpath string) ?[]f32 {
break break
} }
// //
ch := &RIFFChunkHeader(unsafe {pbytes + offset}) ch := &RIFFChunkHeader(unsafe { pbytes + offset })
offset += 8 + ch.chunk_size offset += 8 + ch.chunk_size
// eprintln('ch: $ch') // eprintln('ch: $ch')
// eprintln('p: $pbytes | offset: $offset | bytes.len: $bytes.len') // eprintln('p: $pbytes | offset: $offset | bytes.len: $bytes.len')
@ -155,7 +155,7 @@ fn read_wav_file_samples(fpath string) ?[]f32 {
// //
if ch.chunk_type == [byte(`f`), `m`, `t`, ` `]! { if ch.chunk_type == [byte(`f`), `m`, `t`, ` `]! {
// eprintln('`fmt ` chunk') // eprintln('`fmt ` chunk')
rf = &RIFFFormat(&ch.chunk_data) rf = unsafe { &RIFFFormat(&ch.chunk_data) }
// eprintln('fmt riff format: $rf') // eprintln('fmt riff format: $rf')
if rf.format_tag != 1 { if rf.format_tag != 1 {
return error('only PCM encoded WAVs are supported') return error('only PCM encoded WAVs are supported')
@ -180,7 +180,7 @@ fn read_wav_file_samples(fpath string) ?[]f32 {
for c := 0; c < rf.nchannels; c++ { for c := 0; c < rf.nchannels; c++ {
mut x := f32(0.0) mut x := f32(0.0)
mut step := 0 mut step := 0
ppos := unsafe {dp + doffset} ppos := unsafe { dp + doffset }
if rf.bits_per_sample == 8 { if rf.bits_per_sample == 8 {
d8 := byteptr(ppos) d8 := byteptr(ppos)
x = (f32(*d8) - 128) / 128.0 x = (f32(*d8) - 128) / 128.0