Rename some mixer metrics.

diff --git a/mixer.cpp b/mixer.cpp
index 4b45b511e686e91be148035deb62caeb7fbd4eb2..ccbbf1a089b27b8a2f9694d63f2d8e8fc31eea7a 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -390,9 +390,9 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
                set_output_card_internal(global_flags.output_card);
        }
 
-       global_metrics.register_int_metric("num_frames", &metrics_num_frames);
-       global_metrics.register_int_metric("dropped_frames", &metrics_dropped_frames);
-       global_metrics.register_double_metric("uptime", &metrics_uptime);
+       global_metrics.register_int_metric("frames_output_total", &metric_frames_output_total);
+       global_metrics.register_int_metric("frames_output_dropped", &metric_frames_output_dropped);
+       global_metrics.register_double_metric("uptime_seconds", &metric_uptime_seconds);
 }
 
 Mixer::~Mixer()
@@ -877,9 +877,9 @@ void Mixer::thread_func()
                now = steady_clock::now();
                double elapsed = duration<double>(now - start).count();
 
-               metrics_num_frames = frame_num;
-               metrics_dropped_frames = stats_dropped_frames;
-               metrics_uptime = elapsed;
+               metric_frames_output_total = frame_num;
+               metric_frames_output_dropped = stats_dropped_frames;
+               metric_uptime_seconds = elapsed;
 
                if (frame_num % 100 == 0) {
                        printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)",

diff --git a/mixer.h b/mixer.h
index c787507f4ebb35b21d2a90c34dfe1078b9b7724d..3a9868d8ea8ffdbe260d97a2b861b3e1ac188ac5 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -520,9 +520,9 @@ private:
        std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS];
 
        // Metrics.
-       std::atomic<int64_t> metrics_num_frames{0};
-       std::atomic<int64_t> metrics_dropped_frames{0};
-       std::atomic<double> metrics_uptime{0.0};
+       std::atomic<int64_t> metric_frames_output_total{0};
+       std::atomic<int64_t> metric_frames_output_dropped{0};
+       std::atomic<double> metric_uptime_seconds{0.0};
 };
 
 extern Mixer *global_mixer;