Hook up a third input, the SBS mix. Required hooking up ResizeEffect.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 97bae3057e87e60151f4ba87f96d57ab4d66e107..3411a50217d42d683671e596759acba8f7d8a909 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -39,6 +39,8 @@ public:
                OUTPUT_PREVIEW,
                OUTPUT_INPUT0,
                OUTPUT_INPUT1,
+               OUTPUT_INPUT2,
+               OUTPUT_INPUT3,
                NUM_OUTPUTS
        };
 
@@ -100,8 +102,7 @@ private:
                BMUSBCapture *usb;
                std::unique_ptr<PBOFrameAllocator> frame_allocator;
 
-               // Threading stuff
-               bool thread_initialized = false;
+               // Stuff for the OpenGL context (for texture uploading).
                QSurface *surface;
                QOpenGLContext *context;
 
@@ -116,6 +117,7 @@ private:
 
        class OutputChannel {
        public:
+               ~OutputChannel();
                void output_frame(DisplayFrame frame);
                bool get_display_frame(DisplayFrame *frame);
                void set_frame_ready_callback(new_frame_ready_callback_t callback);