X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=b61a3c300009eda219179863617914325517ba1e;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=a534aace6b656196df8343062e203ae00435f339;hpb=a2be9904c7c96986d27a98c2fd75eca87d46ae8d;p=nageru

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index a534aac..b61a3c3 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -120,7 +120,7 @@ void AudioMixer::reset_device_mutex_held(DeviceSpec device_spec)
 	} else {
 		// TODO: ResamplingQueue should probably take the full device spec.
 		// (It's only used for console output, though.)
-		device->resampling_queue.reset(new ResamplingQueue(device_spec.index, OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, device->interesting_channels.size()));
+		device->resampling_queue.reset(new ResamplingQueue(device_spec.index, device->capture_frequency, OUTPUT_FREQUENCY, device->interesting_channels.size()));
 	}
 	device->next_local_pts = 0;
 }
@@ -252,6 +252,9 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
 	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];
 		if (!device->interesting_channels.empty()) {
@@ -396,15 +399,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 DeviceSpec spec{ InputSourceType::CAPTURE_CARD, card_index };
 		const AudioDevice *device = &cards[card_index];
-		names.push_back(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)
@@ -419,13 +426,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 +439,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) {
+		DeviceSpec device_spec{InputSourceType::CAPTURE_CARD, card_index};
 		AudioDevice *device = &cards[card_index];
-		if (device->interesting_channels != interesting_channels[card_index]) {
-			device->interesting_channels = interesting_channels[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});
 		}
 	}