From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 15 Sep 2016 17:50:36 +0000 (+0200)
Subject: Rename “name” to “display name”.
X-Git-Tag: 1.4.0~51
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=9f7791f6dc6ef7cba926e0b36432a096947fb38a;hp=1bd39979930888eaa6061d17cc5122f970d3d66e

Rename “name” to “display name”.

This makes for less confusion when AudioDevice's “name” doesn't
match what's in ALSA's “name” (it is composed of name+info).
---

diff --git a/alsa_input.cpp b/alsa_input.cpp
index 7594bbb..c53b241 100644
--- a/alsa_input.cpp
+++ b/alsa_input.cpp
@@ -454,6 +454,7 @@ ALSAPool::ProbeResult ALSAPool::probe_device_once(unsigned card_index, unsigned
 	string info = snd_pcm_info_get_name(pcm_info);
 
 	unsigned internal_dev_index;
+	string display_name;
 	{
 		lock_guard<mutex> lock(mu);
 		internal_dev_index = find_free_device_index(name, info, num_channels, address);
@@ -462,6 +463,8 @@ ALSAPool::ProbeResult ALSAPool::probe_device_once(unsigned card_index, unsigned
 		devices[internal_dev_index].info = info;
 		devices[internal_dev_index].num_channels = num_channels;
 		// Note: Purposefully does not overwrite held.
+
+		display_name = devices[internal_dev_index].display_name();
 	}
 
 	fprintf(stderr, "%s: Probed successfully.\n", address);
@@ -469,7 +472,7 @@ ALSAPool::ProbeResult ALSAPool::probe_device_once(unsigned card_index, unsigned
 	reset_device(internal_dev_index);  // Restarts it if it is held (ie., we just replaced a dead card).
 
 	DeviceSpec spec{InputSourceType::ALSA_INPUT, internal_dev_index};
-	global_audio_mixer->set_name(spec, name + " (" + info + ")");
+	global_audio_mixer->set_display_name(spec, display_name);
 	global_audio_mixer->trigger_state_changed_callback();
 
 	return ALSAPool::ProbeResult::SUCCESS;
diff --git a/alsa_input.h b/alsa_input.h
index f1216de..bac13be 100644
--- a/alsa_input.h
+++ b/alsa_input.h
@@ -119,6 +119,8 @@ public:
 		// at any given time as a result of an error or hotplug event;
 		// a card that is held will go to the DEAD state instead.
 		bool held = false;
+
+		std::string display_name() const { return name + " (" + info + ")"; }
 	};
 
 	void init();
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)
diff --git a/audio_mixer.h b/audio_mixer.h
index 2e73ebd..21ea371 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -48,7 +48,7 @@ struct DeviceSpec {
 	}
 };
 struct DeviceInfo {
-	std::string name;
+	std::string display_name;
 	unsigned num_channels;
 };
 
@@ -115,7 +115,7 @@ public:
 		return alsa_pool.get_card_state(index);
 	}
 
-	void set_name(DeviceSpec device_spec, const std::string &name);
+	void set_display_name(DeviceSpec device_spec, const std::string &name);
 
 	void set_input_mapping(const InputMapping &input_mapping);
 	InputMapping get_input_mapping() const;
@@ -284,7 +284,7 @@ private:
 	struct AudioDevice {
 		std::unique_ptr<ResamplingQueue> resampling_queue;
 		int64_t next_local_pts = 0;
-		std::string name;
+		std::string display_name;
 		unsigned capture_frequency = OUTPUT_FREQUENCY;
 		// Which channels we consider interesting (ie., are part of some input_mapping).
 		std::set<unsigned> interesting_channels;
diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index 0496d95..6fcf7a8 100644
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -77,7 +77,7 @@ void InputMappingDialog::fill_row_from_bus(unsigned row, const InputMapping::Bus
 		card_combo->addItem(QString("(none)   "));
 	}
 	for (const auto &spec_and_info : devices) {
-		QString label(QString::fromStdString(spec_and_info.second.name));
+		QString label(QString::fromStdString(spec_and_info.second.display_name));
 		if (spec_and_info.first.type == InputSourceType::ALSA_INPUT) {
 			ALSAPool::Device::State state = global_audio_mixer->get_alsa_card_state(spec_and_info.first.index);
 			if (state == ALSAPool::Device::State::EMPTY) {
diff --git a/mixer.cpp b/mixer.cpp
index d7f8655..43afea4 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -280,7 +280,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, bool
 
 	DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
 	audio_mixer.reset_resampler(device);
-	audio_mixer.set_name(device, card->capture->get_description());
+	audio_mixer.set_display_name(device, card->capture->get_description());
 	audio_mixer.trigger_state_changed_callback();
 }