]> git.sesse.net Git - nageru/commitdiff
Actually set the fader positions when making the views for each audio bus.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 20 Sep 2016 21:50:34 +0000 (23:50 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 19 Oct 2016 22:55:44 +0000 (00:55 +0200)
audio_mixer.h
mainwindow.cpp

index 3a1334a66656e9979cc8ca3148f3c7761acced5e..faa0cc52b025b23e6fe541e993e6ee1e085427a0 100644 (file)
@@ -63,6 +63,7 @@ public:
 
        std::vector<float> get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy);
 
+       float get_fader_volume(unsigned bus_index) const { return fader_volume_db[bus_index]; }
        void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
 
        // Note: This operation holds all ALSA devices (see ALSAPool::get_devices()).
index 0fad15a785fe115f04c0f978bb3b002645bbaeae..3245fdde0254c75e8505e52bbfa0a4fcd568449c 100644 (file)
@@ -339,7 +339,8 @@ void MainWindow::setup_audio_miniview()
                peak_meter->set_max_level(0.0f);
                peak_meter->set_ref_level(0.0f);
 
-               // TODO: Set the fader position.
+               ui_audio_miniview->fader->setDbValue(global_audio_mixer->get_fader_volume(bus_index));
+
                ui->faders->addWidget(channel);
 
                connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
@@ -373,7 +374,7 @@ void MainWindow::setup_audio_expanded_view()
                update_eq_label(bus_index, EQ_BAND_TREBLE, global_audio_mixer->get_eq(bus_index, EQ_BAND_TREBLE));
                update_eq_label(bus_index, EQ_BAND_MID, global_audio_mixer->get_eq(bus_index, EQ_BAND_MID));
                update_eq_label(bus_index, EQ_BAND_BASS, global_audio_mixer->get_eq(bus_index, EQ_BAND_BASS));
-               // TODO: Set the fader position.
+               ui_audio_expanded_view->fader->setDbValue(global_audio_mixer->get_fader_volume(bus_index));
                ui->buses->addWidget(channel);
 
                ui_audio_expanded_view->locut_enabled->setChecked(global_audio_mixer->get_locut_enabled(bus_index));