Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions libntxm/arm9/source/wav.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,24 @@ bool Wav::load(const char *filename)
// Read the data
if(bit_per_sample > bit_per_sample_) {
int skip_bytes = (bit_per_sample - bit_per_sample_) / 8;
u32 i = 0;
for(; i < n_samples_; i++) {
fseek(fileh, skip_bytes, SEEK_CUR);
if(fread(audio_data_ + i * 2, 2, 1, fileh) <= 0) {
break;
}
int byte_per_sample = bit_per_sample_/8;

u8 *audio_data_tmp = (u8*)ntxm_umalloc(chunk_size);
if (audio_data_tmp == 0) {
ntxm_dprintf("Could not alloc mem(%ld) for wav.\n", chunk_size);
ntxm_free(audio_data_);
fclose(fileh);
return false;
}
if(i < n_samples_) {
memset(audio_data_ + i * 2, 0, chunk_size - i * 2);
fread(audio_data_tmp, 1, chunk_size, fileh);

u32 i=0;
for(; i < n_samples_; i++) {
memcpy(audio_data_ + i * byte_per_sample, audio_data_tmp + i * byte_per_sample + skip_bytes,
(bit_per_sample_ / 8));
}

ntxm_free(audio_data_tmp);
} else {
size_t bytes_read = fread(audio_data_, 1, chunk_size, fileh);
if (bytes_read < chunk_size) {
Expand Down