Switch to getting bmusb from a submodule.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index b2561d15c0b395f2d82e2a5d92b682b7ab634942..6098222c390d9b059561900f8c826aeb5f2ffcb4 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -9,12 +9,13 @@
 #include <movit/flat_input.h>
 #include <functional>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "h264encode.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 #include "theme.h"
+#include "resampler.h"
 
 #define NUM_CARDS 2
 
@@ -112,10 +113,13 @@ private:
                QSurface *surface;
                QOpenGLContext *context;
 
-               bool new_data_ready = false;  // Whether new_frame contains anything.
+               bool new_data_ready = false;  // Whether new_frame and new_frame_audio contains anything.
+               bool should_quit = false;
                RefCountedFrame new_frame;
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
+               std::vector<float> new_frame_audio;
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
+               Resampler *resampler = nullptr;
        };
        CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>