X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=9f549e968b7eb173f872d55fc316f7c1982ccc3e;hb=525665b0f6639686dad77785e81f31a5a9d87bc8;hp=6ed62113ff4f775edfb3e110be77db8f7a136bf5;hpb=7ac4f511034b3a69be8cf1344fd8c2693eeeee4c;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 6ed6211..9f549e9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -475,6 +475,24 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 	audio_mixer.set_display_name(device, card->capture->get_description());
 	audio_mixer.trigger_state_changed_callback();
 
+	// Unregister old metrics, if any.
+	if (!card->labels.empty()) {
+		const vector<pair<string, string>> &labels = card->labels;
+		global_metrics.remove("input_received_frames", labels);
+		global_metrics.remove("input_dropped_frames_jitter", labels);
+		global_metrics.remove("input_dropped_frames_error", labels);
+		global_metrics.remove("input_dropped_frames_resets", labels);
+
+		global_metrics.remove("input_has_signal_bool", labels);
+		global_metrics.remove("input_is_connected_bool", labels);
+		global_metrics.remove("input_interlaced_bool", labels);
+		global_metrics.remove("input_width_pixels", labels);
+		global_metrics.remove("input_height_pixels", labels);
+		global_metrics.remove("input_frame_rate_nom", labels);
+		global_metrics.remove("input_frame_rate_den", labels);
+		global_metrics.remove("input_sample_rate_hz", labels);
+	}
+
 	// Register metrics.
 	vector<pair<string, string>> labels;
 	char card_name[64];
@@ -508,6 +526,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 	global_metrics.add("input_frame_rate_nom", labels, &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE);
 	global_metrics.add("input_frame_rate_den", labels, &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE);
 	global_metrics.add("input_sample_rate_hz", labels, &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE);
+	card->labels = labels;
 }
 
 void Mixer::set_output_card_internal(int card_index)
@@ -1084,6 +1103,7 @@ start:
 		// and then restart.
 		assert(cards[master_card_index].capture->get_disconnected());
 		handle_hotplugged_cards();
+		lock.unlock();
 		goto start;
 	}