X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=aa3baac2fff99e90b1113f61af65e7f82761f42e;hb=d3e48df512d9476d3849227067792a3537bb094e;hp=89676bddf86c9299826651dc68f5a7c887db906a;hpb=70e175fb0deb01e4664213686491c49bff85faf6;p=nageru

diff --git a/mixer.h b/mixer.h
index 89676bd..aa3baac 100644
--- a/mixer.h
+++ b/mixer.h
@@ -428,6 +428,8 @@ private:
 	void release_display_frame(DisplayFrame *frame);
 	double pts() { return double(pts_int) / TIMEBASE; }
 	void trim_queue(CaptureCard *card, size_t safe_queue_length);
+	std::pair<std::string, std::string> get_channels_json();
+	std::pair<std::string, std::string> get_channel_color_http(unsigned channel_idx);
 
 	HTTPD httpd;
 	unsigned num_cards, num_video_inputs;
@@ -548,7 +550,7 @@ private:
 	class OutputChannel {
 	public:
 		~OutputChannel();
-		void output_frame(DisplayFrame frame);
+		void output_frame(DisplayFrame &&frame);
 		bool get_display_frame(DisplayFrame *frame);
 		void add_frame_ready_callback(void *key, new_frame_ready_callback_t callback);
 		void remove_frame_ready_callback(void *key);