Hook up the exit menu item.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 76aec682c5d71773c7d3909de60ed2d9a58a76a8..db6db15155bacb85fd0fe011296cf770422039f5 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -34,6 +34,7 @@
 #include "timebase.h"
 #include "stereocompressor.h"
 #include "filter.h"
+#include "input_state.h"
 
 class H264Encoder;
 class QSurface;
@@ -168,6 +169,11 @@ public:
                compressor_enabled = enabled;
        }
 
+       void schedule_cut()
+       {
+               should_cut = true;
+       }
+
        void reset_meters();
 
 private:
@@ -210,7 +216,8 @@ private:
                bool should_quit = false;
                RefCountedFrame new_frame;
                int64_t new_frame_length;  // In TIMEBASE units.
-               unsigned new_frame_field;  // Which field (0 or 1) of the frame to use.
+               bool new_frame_interlaced;
+               unsigned new_frame_field;  // Which field (0 or 1) of the frame to use. Always 0 for progressive.
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
                unsigned dropped_frames = 0;  // Before new_frame.
@@ -226,7 +233,7 @@ private:
        };
        CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
 
-       RefCountedFrame bmusb_current_rendering_frame[MAX_CARDS];
+       InputState input_state;
 
        class OutputChannel {
        public:
@@ -250,9 +257,11 @@ private:
        std::thread mixer_thread;
        std::thread audio_thread;
        std::atomic<bool> should_quit{false};
+       std::atomic<bool> should_cut{false};
 
        audio_level_callback_t audio_level_callback = nullptr;
-       Ebu_r128_proc r128;
+       std::mutex r128_mutex;
+       Ebu_r128_proc r128;  // Under r128_mutex.
 
        Resampler peak_resampler;
        std::atomic<float> peak{0.0f};