Consistently use “video card” instead of “card”.

[nageru] / audio_mixer.cpp

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 88ca8c617a8559ce771e21f1e337133bba51296c..c4f6f0b52c9f055414f5d06542502727aeec2de1 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -195,8 +195,7 @@ AudioMixer::AudioDevice *AudioMixer::find_audio_device(DeviceSpec device)
 {
        switch (device.type) {
        case InputSourceType::CAPTURE_CARD:
-               return &cards[device.index];
-               break;
+               return &video_cards[device.index];
        case InputSourceType::SILENCE:
        default:
                assert(false);
@@ -246,14 +245,17 @@ void AudioMixer::fill_audio_bus(const vector<float> *samples_card, const InputMa
 
 vector<float> AudioMixer::get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy)
 {
-       vector<float> samples_card[MAX_CARDS];  // TODO: Needs room for other kinds of capture cards.
+       vector<float> samples_card[MAX_VIDEO_CARDS];  // TODO: Needs room for other kinds of capture cards.
        vector<float> samples_bus;
 
        lock_guard<mutex> lock(audio_mutex);
 
        // Pick out all the interesting channels from all the cards.
+       // TODO: If the card has been hotswapped, the number of channels
+       // might have changed; if so, we need to do some sort of remapping
+       // to silence.
        for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
-               AudioDevice *device = &cards[card_index];
+               AudioDevice *device = &video_cards[card_index];
                if (!device->interesting_channels.empty()) {
                        samples_card[card_index].resize(num_samples * device->interesting_channels.size());
                        device->resampling_queue->get_output_samples(
@@ -396,15 +398,19 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
        return samples_out;
 }
 
-vector<string> AudioMixer::get_names() const
+map<DeviceSpec, DeviceInfo> AudioMixer::get_devices() const
 {
        lock_guard<mutex> lock(audio_mutex);
-       vector<string> names;
+       map<DeviceSpec, DeviceInfo> devices;
        for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
-               const AudioDevice *device = &cards[card_index];
-               names.push_back(device->name);
+               const DeviceSpec spec{ InputSourceType::CAPTURE_CARD, card_index };
+               const AudioDevice *device = &video_cards[card_index];
+               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)
@@ -419,13 +425,12 @@ void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)
 {
        lock_guard<mutex> lock(audio_mutex);
 
-       // FIXME: This needs to be keyed on DeviceSpec.
-       map<unsigned, set<unsigned>> interesting_channels;
+       map<DeviceSpec, set<unsigned>> interesting_channels;
        for (const InputMapping::Bus &bus : new_input_mapping.buses) {
                if (bus.device.type == InputSourceType::CAPTURE_CARD) {
                        for (unsigned channel = 0; channel < 2; ++channel) {
                                if (bus.source_channel[channel] != -1) {
-                                       interesting_channels[bus.device.index].insert(bus.source_channel[channel]);
+                                       interesting_channels[bus.device].insert(bus.source_channel[channel]);
                                }
                        }
                }
@@ -433,9 +438,10 @@ void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)
 
        // Reset resamplers for all cards that don't have the exact same state as before.
        for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
-               AudioDevice *device = &cards[card_index];
-               if (device->interesting_channels != interesting_channels[card_index]) {
-                       device->interesting_channels = interesting_channels[card_index];
+               DeviceSpec device_spec{InputSourceType::CAPTURE_CARD, card_index};
+               AudioDevice *device = &video_cards[card_index];
+               if (device->interesting_channels != interesting_channels[device_spec]) {
+                       device->interesting_channels = interesting_channels[device_spec];
                        reset_device_mutex_held(DeviceSpec{InputSourceType::CAPTURE_CARD, card_index});
                }
        }