diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-19 21:30:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-20 00:31:10 +0200 |
| commit | 01e708d612585f96a4de35f325087718a0008f36 (patch) | |
| tree | d8890c422b5d48ec9cbd7df86714577f017b699e /src | |
| parent | a2a25845242b3057347a829fbc8537fa7479b106 (diff) | |
A few more small cleanups.
Diffstat (limited to 'src')
| -rw-r--r-- | src/leqm-nrt.cc | 20 | ||||
| -rw-r--r-- | src/leqm-nrt.h | 10 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/leqm-nrt.cc b/src/leqm-nrt.cc index ba4485f..4b034b4 100644 --- a/src/leqm-nrt.cc +++ b/src/leqm-nrt.cc @@ -327,14 +327,9 @@ Result calculate_function( auto ir = calculate_ir(number_of_filter_interpolation_points, sample_rate, bits_per_sample); - // read through the entire file - Sum totsum; - Result result; - - // Main loop through audio file - std::vector<std::shared_ptr<Worker>> worker_args; + std::vector<std::shared_ptr<Worker>> workers; int const buffer_size_samples = (sample_rate * channels * buffer_size_ms) / 1000; std::vector<double> buffer(buffer_size_samples); @@ -344,7 +339,7 @@ Result calculate_function( break; } - worker_args.push_back( + workers.push_back( std::make_shared<Worker>( buffer, samples_read, @@ -356,17 +351,14 @@ Result calculate_function( ) ); - if (static_cast<int>(worker_args.size()) == num_cpu) { - worker_args.clear(); + if (static_cast<int>(workers.size()) == num_cpu) { + workers.clear(); } } - worker_args.clear(); + workers.clear(); - result.leq_nw = totsum.rms(); - result.leq_m = totsum.leqm(); - - return result; + return {totsum.leqm(), totsum.rms()}; } diff --git a/src/leqm-nrt.h b/src/leqm-nrt.h index c8e7730..fd1aba1 100644 --- a/src/leqm-nrt.h +++ b/src/leqm-nrt.h @@ -4,14 +4,16 @@ struct Result { - Result() - : status(0) - {} - Result(int status_) : status(status_) {} + Result(double leq_m_, double leq_nw_) + : status(0) + , leq_m(leq_m_) + , leq_nw(leq_nw_) + {} + /** 0 on success, or * * -100: Either channel_corrections contained a different number of |