X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=3b40955ef1e43b6604fd2d212e3da1e2c225ff3a;hb=9f7791f6dc6ef7cba926e0b36432a096947fb38a;hp=cf2c9441203f00f672c0e8ed1be90467fdb603e0;hpb=1bd39979930888eaa6061d17cc5122f970d3d66e;p=nageru

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index cf2c944..3b40955 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -743,7 +743,7 @@ map<DeviceSpec, DeviceInfo> AudioMixer::get_devices()
 		const DeviceSpec spec{ InputSourceType::CAPTURE_CARD, card_index };
 		const AudioDevice *device = &video_cards[card_index];
 		DeviceInfo info;
-		info.name = device->name;
+		info.display_name = device->display_name;
 		info.num_channels = 8;
 		devices.insert(make_pair(spec, info));
 	}
@@ -752,19 +752,19 @@ map<DeviceSpec, DeviceInfo> AudioMixer::get_devices()
 		const DeviceSpec spec{ InputSourceType::ALSA_INPUT, card_index };
 		const ALSAPool::Device &device = available_alsa_devices[card_index];
 		DeviceInfo info;
-		info.name = device.name + " (" + device.info + ")";
+		info.display_name = device.display_name();
 		info.num_channels = device.num_channels;
 		devices.insert(make_pair(spec, info));
 	}
 	return devices;
 }
 
-void AudioMixer::set_name(DeviceSpec device_spec, const string &name)
+void AudioMixer::set_display_name(DeviceSpec device_spec, const string &name)
 {
 	AudioDevice *device = find_audio_device(device_spec);
 
 	lock_guard<timed_mutex> lock(audio_mutex);
-	device->name = name;
+	device->display_name = name;
 }
 
 void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)