Hook up the channel click events.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index b4eaad9b0d2a1338d9c099fe5302edeb6f2c4e48..c6366fdec1a65d5e8f7e909ed788e0c6119d8c73 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -32,13 +32,16 @@ public:
        void start();
        void quit();
 
-       void transition_clicked(int transition_num, float t);
+       void transition_clicked(int transition_num);
+       void channel_clicked(int preview_num);
 
        enum Output {
                OUTPUT_LIVE = 0,
                OUTPUT_PREVIEW,
                OUTPUT_INPUT0,
                OUTPUT_INPUT1,
+               OUTPUT_INPUT2,
+               OUTPUT_INPUT3,
                NUM_OUTPUTS
        };
 
@@ -100,8 +103,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 +118,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);