Add a global variable for the audio mixer; it was getting too tedious.

[nageru] / input_mapping_dialog.cpp

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index 9c8180cce6321750894c1b4547b6c6f991cbca37..0a301d77cd749d244e1256d08eab69c312adcd32 100644 (file)
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -9,9 +9,9 @@ using namespace std::placeholders;
 
 InputMappingDialog::InputMappingDialog()
        : ui(new Ui::InputMappingDialog),
-         mapping(global_mixer->get_audio_mixer()->get_input_mapping()),
+         mapping(global_audio_mixer->get_input_mapping()),
          old_mapping(mapping),
-         devices(global_mixer->get_audio_mixer()->get_devices())
+         devices(global_audio_mixer->get_devices())
 {
        ui->setupUi(this);
        ui->table->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -97,13 +97,13 @@ void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const Inpu
 
 void InputMappingDialog::ok_clicked()
 {
-       global_mixer->get_audio_mixer()->set_input_mapping(mapping);
+       global_audio_mixer->set_input_mapping(mapping);
        accept();
 }
 
 void InputMappingDialog::cancel_clicked()
 {
-       global_mixer->get_audio_mixer()->set_input_mapping(old_mapping);
+       global_audio_mixer->set_input_mapping(old_mapping);
        reject();
 }