X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=b61a3c300009eda219179863617914325517ba1e;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=426125f888061a17546de06c4d3338b90098892a;hpb=99fe9fd44f57c9872eae24745da9c7a422ab0c98;p=nageru diff --git a/audio_mixer.cpp b/audio_mixer.cpp index 426125f..b61a3c3 100644 --- a/audio_mixer.cpp +++ b/audio_mixer.cpp @@ -399,16 +399,19 @@ vector AudioMixer::get_output(double pts, unsigned num_samples, Resamplin return samples_out; } -map AudioMixer::get_names() const +map AudioMixer::get_devices() const { lock_guard lock(audio_mutex); - map names; + map devices; for (unsigned card_index = 0; card_index < num_cards; ++card_index) { const DeviceSpec spec{ InputSourceType::CAPTURE_CARD, card_index }; const AudioDevice *device = &cards[card_index]; - names.insert(make_pair(spec, device->name)); + DeviceInfo info; + info.name = device->name; + info.num_channels = 8; // FIXME: This is wrong for fake cards. + devices.insert(make_pair(spec, info)); } - return names; + return devices; } void AudioMixer::set_name(DeviceSpec device_spec, const string &name)