From 4380d627aecf9f4dbe4dff524dacd4b550b07f14 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Tue, 23 Aug 2016 21:16:57 +0200 Subject: [PATCH] Small refactoring in the audio level callback API. --- audio_mixer.cpp | 10 +++++----- audio_mixer.h | 9 +++++++-- mainwindow.cpp | 22 +++++++++++----------- mainwindow.h | 2 +- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/audio_mixer.cpp b/audio_mixer.cpp index 3b7d3e5..40470f3 100644 --- a/audio_mixer.cpp +++ b/audio_mixer.cpp @@ -555,15 +555,15 @@ void AudioMixer::send_audio_level_callback() double loudness_range_low = r128.range_min(); double loudness_range_high = r128.range_max(); - vector bus_loudness; - bus_loudness.resize(input_mapping.buses.size()); + vector bus_levels; + bus_levels.resize(input_mapping.buses.size()); for (unsigned bus_index = 0; bus_index < bus_r128.size(); ++bus_index) { - bus_loudness[bus_index] = bus_r128[bus_index]->loudness_S(); + bus_levels[bus_index].loudness_lufs = bus_r128[bus_index]->loudness_S(); + bus_levels[bus_index].gain_staging_db = gain_staging_db[bus_index]; } - audio_level_callback(loudness_s, to_db(peak), bus_loudness, + audio_level_callback(loudness_s, to_db(peak), bus_levels, loudness_i, loudness_range_low, loudness_range_high, - vector(gain_staging_db, gain_staging_db + MAX_BUSES), to_db(final_makeup_gain), correlation.get_correlation()); } diff --git a/audio_mixer.h b/audio_mixer.h index d00e8ec..dbc3309 100644 --- a/audio_mixer.h +++ b/audio_mixer.h @@ -201,10 +201,15 @@ public: return final_makeup_gain_auto; } + struct BusLevel { + float loudness_lufs; + float gain_staging_db; + }; + typedef std::function bus_level_lufs, + std::vector bus_levels, float global_level_lufs, float range_low_lufs, float range_high_lufs, - std::vector gain_staging_db, float final_makeup_gain_db, + float final_makeup_gain_db, float correlation)> audio_level_callback_t; void set_audio_level_callback(audio_level_callback_t callback) { diff --git a/mainwindow.cpp b/mainwindow.cpp index 0837cc6..573cc0e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -283,7 +283,7 @@ void MainWindow::mixer_created(Mixer *mixer) global_mixer->get_audio_mixer()->set_limiter_enabled(state == Qt::Checked); }); connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked); - mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8, _9)); + mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8)); struct sigaction act; memset(&act, 0, sizeof(act)); @@ -528,10 +528,10 @@ void MainWindow::reset_meters_button_clicked() ui->peak_display->setStyleSheet(""); } -void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector bus_level_lufs, +void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector bus_levels, float global_level_lufs, float range_low_lufs, float range_high_lufs, - vector gain_staging_db, float final_makeup_gain_db, + float final_makeup_gain_db, float correlation) { steady_clock::time_point now = steady_clock::now(); @@ -546,19 +546,19 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vectorvu_meter->set_level(level_lufs); - for (unsigned bus_index = 0; bus_index < bus_level_lufs.size(); ++bus_index) { + for (unsigned bus_index = 0; bus_index < bus_levels.size(); ++bus_index) { if (bus_index < audio_miniviews.size()) { - audio_miniviews[bus_index]->vu_meter_meter->set_level( - bus_level_lufs[bus_index]); + const AudioMixer::BusLevel &level = bus_levels[bus_index]; + audio_miniviews[bus_index]->vu_meter_meter->set_level(level.loudness_lufs); Ui::AudioExpandedView *view = audio_expanded_views[bus_index]; - view->vu_meter_meter->set_level(bus_level_lufs[bus_index]); + view->vu_meter_meter->set_level(level.loudness_lufs); view->gainstaging_knob->blockSignals(true); - view->gainstaging_knob->setValue(lrintf(gain_staging_db[bus_index] * 10.0f)); + view->gainstaging_knob->setValue(lrintf(level.gain_staging_db * 10.0f)); view->gainstaging_knob->blockSignals(false); view->gainstaging_db_display->setText( QString("Gain: ") + - QString::fromStdString(format_db(gain_staging_db[bus_index], DB_WITH_SIGN))); + QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN))); } } ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs); @@ -573,10 +573,10 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vectorgainstaging_knob->blockSignals(true); - ui->gainstaging_knob->setValue(lrintf(gain_staging_db[0] * 10.0f)); + ui->gainstaging_knob->setValue(lrintf(bus_levels[0].gain_staging_db * 10.0f)); ui->gainstaging_knob->blockSignals(false); ui->gainstaging_db_display->setText( - QString::fromStdString(format_db(gain_staging_db[0], DB_WITH_SIGN))); + QString::fromStdString(format_db(bus_levels[0].gain_staging_db, DB_WITH_SIGN))); ui->makeup_gain_knob->blockSignals(true); ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f)); diff --git a/mainwindow.h b/mainwindow.h index 41c9fe7..73a6235 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -66,7 +66,7 @@ private: void report_disk_space(off_t free_bytes, double estimated_seconds_left); // Called from the mixer. - void audio_level_callback(float level_lufs, float peak_db, std::vector bus_level_lufs, float global_level_lufs, float range_low_lufs, float range_high_lufs, std::vector gain_staging_db, float final_makeup_gain_db, float correlation); + void audio_level_callback(float level_lufs, float peak_db, std::vector bus_levels, float global_level_lufs, float range_low_lufs, float range_high_lufs, float final_makeup_gain_db, float correlation); std::chrono::steady_clock::time_point last_audio_level_callback; Ui::MainWindow *ui; -- 2.39.2