From 525665b0f6639686dad77785e81f31a5a9d87bc8 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 24 Jun 2017 19:42:02 +0200 Subject: [PATCH] Remove old card metrics when reinitializing cards. --- mixer.cpp | 19 +++++++++++++++++++ mixer.h | 1 + 2 files changed, 20 insertions(+) diff --git a/mixer.cpp b/mixer.cpp index 302a97c..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> &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> 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) diff --git a/mixer.h b/mixer.h index e142a76..9b14dc2 100644 --- a/mixer.h +++ b/mixer.h @@ -455,6 +455,7 @@ private: int last_timecode = -1; // Unwrapped. // Metrics. + std::vector> labels; std::atomic metric_input_received_frames{0}; std::atomic metric_input_dropped_frames_jitter{0}; std::atomic metric_input_dropped_frames_error{0}; -- 2.39.2