Formatted code (#1007)

* Updated style

* Updated files

* fixed new line

* Updated spacing

* File fix WIP

* Updated to clang 13

* updated comment style

* Removed old comment code
This commit is contained in:
jLynx 2023-05-19 08:16:05 +12:00 committed by GitHub
parent 7aca7ce74d
commit 033c4e9a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
599 changed files with 70746 additions and 66896 deletions

View file

@ -23,160 +23,159 @@
#include "io_wave.hpp"
bool WAVFileReader::open(const std::filesystem::path& path) {
size_t i = 0;
char ch;
const uint8_t tag_INAM[4] = { 'I', 'N', 'A', 'M' };
char title_buffer[32];
uint32_t riff_size, data_end, title_size;
size_t search_limit = 0;
// Already open ?
if (path.string() == last_path.string()) {
rewind();
return true;
}
auto error = file.open(path);
size_t i = 0;
char ch;
const uint8_t tag_INAM[4] = {'I', 'N', 'A', 'M'};
char title_buffer[32];
uint32_t riff_size, data_end, title_size;
size_t search_limit = 0;
if (!error.is_valid()) {
file.read((void*)&header, sizeof(header)); // Read header (RIFF and WAVE)
riff_size = header.cksize + 8;
data_start = header.fmt.cksize + 28;
data_size_ = header.data.cksize;
data_end = data_start + data_size_ + 1;
// Look for INAM (title) tag
if (data_end < riff_size) {
file.seek(data_end);
while(file.read((void*)&ch, 1).is_ok()) {
if (ch == tag_INAM[i++]) {
if (i == 4) {
// Tag found, copy title
file.read((void*)&title_size, sizeof(uint32_t));
if (title_size > 32) title_size = 32;
file.read((void*)&title_buffer, title_size);
title_string = title_buffer;
break;
}
} else {
if (ch == tag_INAM[0])
i = 1;
else
i = 0;
}
if (search_limit == 256)
break;
else
search_limit++;
}
}
sample_rate_ = header.fmt.nSamplesPerSec;
bytes_per_sample = header.fmt.wBitsPerSample / 8;
rewind();
last_path = path;
return true;
} else {
return false;
}
// Already open ?
if (path.string() == last_path.string()) {
rewind();
return true;
}
auto error = file.open(path);
if (!error.is_valid()) {
file.read((void*)&header, sizeof(header)); // Read header (RIFF and WAVE)
riff_size = header.cksize + 8;
data_start = header.fmt.cksize + 28;
data_size_ = header.data.cksize;
data_end = data_start + data_size_ + 1;
// Look for INAM (title) tag
if (data_end < riff_size) {
file.seek(data_end);
while (file.read((void*)&ch, 1).is_ok()) {
if (ch == tag_INAM[i++]) {
if (i == 4) {
// Tag found, copy title
file.read((void*)&title_size, sizeof(uint32_t));
if (title_size > 32) title_size = 32;
file.read((void*)&title_buffer, title_size);
title_string = title_buffer;
break;
}
} else {
if (ch == tag_INAM[0])
i = 1;
else
i = 0;
}
if (search_limit == 256)
break;
else
search_limit++;
}
}
sample_rate_ = header.fmt.nSamplesPerSec;
bytes_per_sample = header.fmt.wBitsPerSample / 8;
rewind();
last_path = path;
return true;
} else {
return false;
}
}
void WAVFileReader::rewind() {
file.seek(data_start);
file.seek(data_start);
}
std::string WAVFileReader::title() {
return title_string;
return title_string;
}
uint32_t WAVFileReader::ms_duration() {
return ((data_size_ * 1000) / sample_rate_) / bytes_per_sample;
return ((data_size_ * 1000) / sample_rate_) / bytes_per_sample;
}
void WAVFileReader::data_seek(const uint64_t Offset) {
file.seek(data_start + (Offset * bytes_per_sample));
file.seek(data_start + (Offset * bytes_per_sample));
}
/*int WAVFileReader::seek_mss(const uint16_t minutes, const uint8_t seconds, const uint32_t samples) {
const auto result = file.seek(data_start + ((((minutes * 60) + seconds) * sample_rate_) + samples) * bytes_per_sample);
if (result.is_error())
return 0;
return 1;
/*int WAVFileReader::seek_mss(const uint16_t minutes, const uint8_t seconds, const uint32_t samples) {
const auto result = file.seek(data_start + ((((minutes * 60) + seconds) * sample_rate_) + samples) * bytes_per_sample);
if (result.is_error())
return 0;
return 1;
}*/
uint16_t WAVFileReader::channels() {
return header.fmt.nChannels;
return header.fmt.nChannels;
}
uint32_t WAVFileReader::sample_rate() {
return sample_rate_;
return sample_rate_;
}
uint32_t WAVFileReader::data_size() {
return data_size_;
return data_size_;
}
uint32_t WAVFileReader::sample_count() {
return data_size_ / bytes_per_sample;
return data_size_ / bytes_per_sample;
}
uint16_t WAVFileReader::bits_per_sample() {
return header.fmt.wBitsPerSample;
return header.fmt.wBitsPerSample;
}
Optional<File::Error> WAVFileWriter::create(
const std::filesystem::path& filename,
size_t sampling_rate_set,
const std::string& title_set
) {
sampling_rate = sampling_rate_set;
title = title_set;
const auto create_error = FileWriter::create(filename);
if( create_error.is_valid() ) {
return create_error;
} else {
return update_header();
}
const std::filesystem::path& filename,
size_t sampling_rate_set,
const std::string& title_set) {
sampling_rate = sampling_rate_set;
title = title_set;
const auto create_error = FileWriter::create(filename);
if (create_error.is_valid()) {
return create_error;
} else {
return update_header();
}
}
Optional<File::Error> WAVFileWriter::update_header() {
header_t header { sampling_rate, (uint32_t)bytes_written - sizeof(header_t), info_chunk_size };
const auto seek_0_result = file.seek(0);
if( seek_0_result.is_error() ) {
return seek_0_result.error();
}
const auto old_position = seek_0_result.value();
const auto write_result = file.write(&header, sizeof(header));
if( write_result.is_error() ) {
return write_result.error();
}
const auto seek_old_result = file.seek(old_position);
if( seek_old_result.is_error() ) {
return seek_old_result.error();
}
return { };
header_t header{sampling_rate, (uint32_t)bytes_written - sizeof(header_t), info_chunk_size};
const auto seek_0_result = file.seek(0);
if (seek_0_result.is_error()) {
return seek_0_result.error();
}
const auto old_position = seek_0_result.value();
const auto write_result = file.write(&header, sizeof(header));
if (write_result.is_error()) {
return write_result.error();
}
const auto seek_old_result = file.seek(old_position);
if (seek_old_result.is_error()) {
return seek_old_result.error();
}
return {};
}
Optional<File::Error> WAVFileWriter::write_tags() {
tags_t tags { title };
const auto write_result = file.write(&tags, sizeof(tags));
if( write_result.is_error() ) {
return write_result.error();
}
info_chunk_size = sizeof(tags);
return { };
tags_t tags{title};
const auto write_result = file.write(&tags, sizeof(tags));
if (write_result.is_error()) {
return write_result.error();
}
info_chunk_size = sizeof(tags);
return {};
}