Actually activate the faders.

[nageru] / audio_mixer.cpp

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 764d7a2217fbbdfa6a7122960beb29668b5e207d..06c7f870fcae75203eb75749ebf8c568e44d5bf9 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -134,13 +134,15 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
                                num_samples,
                                rate_adjustment_policy);
                }
+
+               float volume = from_db(cards[card_index].fader_volume_db);
                if (card_index == 0) {
                        for (unsigned i = 0; i < num_samples * 2; ++i) {
-                               samples_out[i] = samples_card[i];
+                               samples_out[i] = samples_card[i] * volume;
                        }
                } else {
                        for (unsigned i = 0; i < num_samples * 2; ++i) {
-                               samples_out[i] += samples_card[i];
+                               samples_out[i] += samples_card[i] * volume;
                        }
                }
        }