fprintf(stderr, "%s: Probed successfully.\n", address);
reset_device(internal_dev_index); // Restarts it if it is held (ie., we just replaced a dead card).
+ if (global_audio_mixer) {
+ global_audio_mixer->trigger_state_changed_callback();
+ }
return ALSAPool::ProbeResult::SUCCESS;
}
bool silence = (state != ALSAPool::Device::State::RUNNING);
while (!global_audio_mixer->silence_card(spec, silence))
;
+ global_audio_mixer->trigger_state_changed_callback();
}
unsigned ALSAPool::find_free_device_index(const string &name, const string &info, unsigned num_channels, const string &address)
while (!global_audio_mixer->silence_card(spec, true))
;
- lock_guard<mutex> lock(mu);
- if (devices[index].held) {
- devices[index].state = Device::State::DEAD;
- } else {
- devices[index].state = Device::State::EMPTY;
- inputs[index].reset();
- }
- while (!devices.empty() && devices.back().state == Device::State::EMPTY) {
- devices.pop_back();
- inputs.pop_back();
+ {
+ lock_guard<mutex> lock(mu);
+ if (devices[index].held) {
+ devices[index].state = Device::State::DEAD;
+ } else {
+ devices[index].state = Device::State::EMPTY;
+ inputs[index].reset();
+ }
+ while (!devices.empty() && devices.back().state == Device::State::EMPTY) {
+ devices.pop_back();
+ inputs.pop_back();
+ }
}
+
+ global_audio_mixer->trigger_state_changed_callback();
}
// EMPTY or DEAD state. Only for ALSAInput and for internal use.
void free_card(unsigned index);
- // TODO: Add accessors and/or callbacks about changed state, so that
- // the UI actually stands a chance in using that information.
-
private:
mutable std::mutex mu;
std::vector<Device> devices; // Under mu.
audio_level_callback = callback;
}
+ typedef std::function<void()> state_changed_callback_t;
+ void set_state_changed_callback(state_changed_callback_t callback)
+ {
+ state_changed_callback = callback;
+ }
+
+ state_changed_callback_t get_state_changed_callback() const
+ {
+ return state_changed_callback;
+ }
+
+ void trigger_state_changed_callback()
+ {
+ if (state_changed_callback != nullptr) {
+ state_changed_callback();
+ }
+ }
+
private:
struct AudioDevice {
std::unique_ptr<ResamplingQueue> resampling_queue;
std::atomic<float> eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{{ 0.0f }}};
audio_level_callback_t audio_level_callback = nullptr;
+ state_changed_callback_t state_changed_callback = nullptr;
mutable std::mutex audio_measure_mutex;
Ebu_r128_proc r128; // Under audio_measure_mutex.
CorrelationMeasurer correlation; // Under audio_measure_mutex.
#include "input_mapping_dialog.h"
+#include "post_to_main_thread.h"
#include "ui_input_mapping.h"
#include <QComboBox>
update_button_state();
connect(ui->table, &QTableWidget::itemSelectionChanged, this, &InputMappingDialog::update_button_state);
+
+ saved_callback = global_audio_mixer->get_state_changed_callback();
+ global_audio_mixer->set_state_changed_callback([this]{
+ post_to_main_thread([this]{
+ devices = global_audio_mixer->get_devices();
+ for (unsigned row = 0; row < mapping.buses.size(); ++row) {
+ fill_row_from_bus(row, mapping.buses[row]);
+ }
+ });
+ });
+}
+
+InputMappingDialog::~InputMappingDialog()
+{
+ global_audio_mixer->set_state_changed_callback(saved_callback);
}
void InputMappingDialog::fill_ui_from_mapping(const InputMapping &mapping)
QString name(QString::fromStdString(bus.name));
ui->table->setItem(row, 0, new QTableWidgetItem(name));
- // Card choices.
- QComboBox *card_combo = new QComboBox;
+ // Card choices. If there's already a combobox here, we try to modify
+ // the elements in-place, so that the UI doesn't go away under the user's feet
+ // if they are in the process of choosing an item.
+ QComboBox *card_combo = static_cast<QComboBox *>(ui->table->cellWidget(row, 1));
+ if (card_combo == nullptr) {
+ card_combo = new QComboBox;
+ }
unsigned current_index = 0;
- card_combo->addItem(QString("(none) "));
+ if (card_combo->count() == 0) {
+ card_combo->addItem(QString("(none) "));
+ }
for (const auto &spec_and_info : devices) {
QString label(QString::fromStdString(spec_and_info.second.name));
if (spec_and_info.first.type == InputSourceType::ALSA_INPUT) {
}
}
++current_index;
- card_combo->addItem(
- label + " ",
- qulonglong(DeviceSpec_to_key(spec_and_info.first)));
+ if (unsigned(card_combo->count()) > current_index) {
+ card_combo->setItemText(current_index, label + " ");
+ card_combo->setItemData(current_index, qulonglong(DeviceSpec_to_key(spec_and_info.first)));
+ } else {
+ card_combo->addItem(
+ label + " ",
+ qulonglong(DeviceSpec_to_key(spec_and_info.first)));
+ }
if (bus.device == spec_and_info.first) {
card_combo->setCurrentIndex(current_index);
}
}
+ // Remove any excess items from earlier. (This is only for paranoia;
+ // they should be held, so it shouldn't matter.)
+ while (unsigned(card_combo->count()) > current_index + 1) {
+ card_combo->removeItem(current_index + 1);
+ }
connect(card_combo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
bind(&InputMappingDialog::card_selected, this, card_combo, row, _1));
ui->table->setCellWidget(row, 1, card_combo);
void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const InputMapping::Bus &bus)
{
// Left and right channel.
+ // TODO: If there's already a widget here, modify it instead of creating a new one,
+ // as we do with card choices.
for (unsigned channel = 0; channel < 2; ++channel) {
QComboBox *channel_combo = new QComboBox;
channel_combo->addItem(QString("(none)"));
void InputMappingDialog::ok_clicked()
{
+ global_audio_mixer->set_state_changed_callback(saved_callback);
global_audio_mixer->set_input_mapping(mapping);
accept();
}
void InputMappingDialog::cancel_clicked()
{
+ global_audio_mixer->set_state_changed_callback(saved_callback);
global_audio_mixer->set_input_mapping(old_mapping);
reject();
}
#include <vector>
#include <sys/time.h>
+#include "audio_mixer.h"
#include "mixer.h"
namespace Ui {
public:
InputMappingDialog();
+ ~InputMappingDialog();
private:
void fill_ui_from_mapping(const InputMapping &mapping);
// held forever).
InputMapping old_mapping;
- const std::map<DeviceSpec, DeviceInfo> devices;
+ std::map<DeviceSpec, DeviceInfo> devices;
+
+ AudioMixer::state_changed_callback_t saved_callback;
};
#endif // !defined(_INPUT_MAPPING_DIALOG_H)
setup_audio_miniview();
setup_audio_expanded_view();
+ global_audio_mixer->set_state_changed_callback(bind(&MainWindow::audio_state_changed, this));
slave_knob(ui->locut_cutoff_knob, ui->locut_cutoff_knob_2);
slave_knob(ui->limiter_threshold_knob, ui->limiter_threshold_knob_2);
global_mixer->set_wb(Mixer::OUTPUT_INPUT0 + channel_number, r, g, b);
previews[channel_number]->display->updateGL();
}
+
+void MainWindow::audio_state_changed()
+{
+ post_to_main_thread([this]{
+ InputMapping mapping = global_audio_mixer->get_input_mapping();
+ for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
+ const InputMapping::Bus &bus = mapping.buses[bus_index];
+ string suffix;
+ if (bus.device.type == InputSourceType::ALSA_INPUT) {
+ ALSAPool::Device::State state = global_audio_mixer->get_alsa_card_state(bus.device.index);
+ if (state == ALSAPool::Device::State::STARTING) {
+ suffix = " (busy)";
+ } else if (state == ALSAPool::Device::State::DEAD) {
+ suffix = " (dead)";
+ }
+ }
+
+ audio_miniviews[bus_index]->bus_desc_label->setFullText(
+ QString::fromStdString(bus.name + suffix));
+ audio_expanded_views[bus_index]->bus_desc_label->setFullText(
+ QString::fromStdString(bus.name + suffix));
+ }
+ });
+}
void audio_level_callback(float level_lufs, float peak_db, std::vector<AudioMixer::BusLevel> 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;
+ void audio_state_changed();
+
Ui::MainWindow *ui;
QLabel *disk_free_label;
QPushButton *transition_btn1, *transition_btn2, *transition_btn3;
DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
audio_mixer.reset_resampler(device);
audio_mixer.set_name(device, card->capture->get_description());
+ audio_mixer.trigger_state_changed_callback();
}