Make sure AudioDevice::name is set for ALSA cards, not just video capture cards.

[nageru] / audio_mixer.cpp

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 87a99bddc3c732dc81b29c044306bb739976815b..cf2c9441203f00f672c0e8ed1be90467fdb603e0 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -162,6 +162,8 @@ AudioMixer::AudioMixer(unsigned num_cards)
          limiter(OUTPUT_FREQUENCY),
          correlation(OUTPUT_FREQUENCY)
 {
+       global_audio_mixer = this;
+
        for (unsigned bus_index = 0; bus_index < MAX_BUSES; ++bus_index) {
                locut[bus_index].init(FILTER_HPF, 2);
                locut_enabled[bus_index] = global_flags.locut_enabled;
@@ -742,7 +744,7 @@ map<DeviceSpec, DeviceInfo> AudioMixer::get_devices()
                const AudioDevice *device = &video_cards[card_index];
                DeviceInfo info;
                info.name = device->name;
-               info.num_channels = 8;  // FIXME: This is wrong for fake cards.
+               info.num_channels = 8;
                devices.insert(make_pair(spec, info));
        }
        vector<ALSAPool::Device> available_alsa_devices = alsa_pool.get_devices();