Fix a crash if exiting while we are still trying to re-find an ALSA card from a loade...

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 572b26fcf97ef54179edddec6bcb8489ad3683bf..89676bddf86c9299826651dc68f5a7c887db906a 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -399,6 +399,10 @@ public:
                display_timecode_on_stdout = enable;
        }
 
+       int64_t get_num_connected_clients() const {
+               return httpd.get_num_connected_clients();
+       }
+
 private:
        struct CaptureCard;
 
@@ -592,16 +596,8 @@ private:
        std::vector<uint32_t> mode_scanlist[MAX_VIDEO_CARDS];
        unsigned mode_scanlist_index[MAX_VIDEO_CARDS]{ 0 };
        std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS];
-
-       // Metrics.
-       std::atomic<int64_t> metric_frames_output_total{0};
-       std::atomic<int64_t> metric_frames_output_dropped{0};
-       std::atomic<double> metric_start_time_seconds{0.0 / 0.0};
-       std::atomic<int64_t> metrics_memory_used_bytes{0};
-       std::atomic<double> metrics_memory_locked_limit_bytes{0.0 / 0.0};
 };
 
 extern Mixer *global_mixer;
-extern bool uses_mlock;
 
 #endif  // !defined(_MIXER_H)