X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=6098222c390d9b059561900f8c826aeb5f2ffcb4;hb=5bc2d4de98e960f40a11cd2991a25ea7d1d5a143;hp=de95eef1765cbb1f07feae2a4a5ce2693ee6e3e6;hpb=0d8bf7e55ec28eef5d46ac2920d0de5b04534ff3;p=nageru

diff --git a/mixer.h b/mixer.h
index de95eef..6098222 100644
--- 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
 
@@ -33,12 +34,15 @@ public:
 	void quit();
 
 	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
 	};
 
@@ -74,6 +78,11 @@ public:
 		output_channel[output].set_frame_ready_callback(callback);
 	}
 
+	std::vector<std::string> get_transition_names()
+	{
+		return theme->get_transition_names(frame / 60.0);
+	}
+
 private:
 	void bm_frame(int card_index, uint16_t timecode,
 		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
@@ -100,15 +109,17 @@ 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;
 
-		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>