Switch to getting bmusb from a submodule.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 9b631e4766071d35e6f0d215cd3f4442f46cdf2e..6098222c390d9b059561900f8c826aeb5f2ffcb4 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -9,7 +9,7 @@
 #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"
@@ -114,6 +114,7 @@ private:
                QOpenGLContext *context;
 
                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;