Prepare InputMappingDialog for arbitrary kinds of input source types, by storing...

[nageru] / audio_mixer.cpp

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index db4b24d9bb0fdd6d3186b56daf968572911c2b26..93d59f4cc6f4017d9d43bc5ab45ff09b4710fe9f 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -396,13 +396,14 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
        return samples_out;
 }
 
-vector<string> AudioMixer::get_names() const
+map<DeviceSpec, string> AudioMixer::get_names() const
 {
        lock_guard<mutex> lock(audio_mutex);
-       vector<string> names;
+       map<DeviceSpec, string> names;
        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.push_back(device->name);
+               names.insert(make_pair(spec, device->name));
        }
        return names;
 }