From 059470db30e685b8f90809873aadb122f2eebbc3 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Tue, 6 Oct 2015 20:42:35 +0200 Subject: [PATCH] Remove the now unused preview size setting. --- glwidget.cpp | 1 - mixer.cpp | 6 ------ mixer.h | 9 --------- 3 files changed, 16 deletions(-) diff --git a/glwidget.cpp b/glwidget.cpp index 9088742..9725210 100644 --- a/glwidget.cpp +++ b/glwidget.cpp @@ -56,7 +56,6 @@ void GLWidget::initializeGL() void GLWidget::resizeGL(int width, int height) { glViewport(0, 0, width, height); - global_mixer->set_preview_size(output, width, height); } void GLWidget::paintGL() diff --git a/mixer.cpp b/mixer.cpp index 1ac5d53..651b459 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -638,9 +638,3 @@ void Mixer::OutputChannel::set_frame_ready_callback(Mixer::new_frame_ready_callb new_frame_ready_callback = callback; has_new_frame_ready_callback = true; } - -void Mixer::OutputChannel::set_size(int width, int height) -{ - this->width = width; - this->height = height; -} diff --git a/mixer.h b/mixer.h index f2f9f7a..cde9a2f 100644 --- a/mixer.h +++ b/mixer.h @@ -76,12 +76,6 @@ public: output_channel[output].set_frame_ready_callback(callback); } - // Ignored for OUTPUT_LIVE. - void set_preview_size(Output output, int width, int height) - { - output_channel[output].set_size(width, height); - } - private: void bm_frame(int card_index, uint16_t timecode, FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format, @@ -137,7 +131,6 @@ private: void output_frame(DisplayFrame frame); bool get_display_frame(DisplayFrame *frame); void set_frame_ready_callback(new_frame_ready_callback_t callback); - void set_size(int width, int height); // Ignored for OUTPUT_LIVE. private: friend class Mixer; @@ -148,8 +141,6 @@ private: bool has_current_frame = false, has_ready_frame = false; // protected by new_frame_ready_callback_t new_frame_ready_callback; bool has_new_frame_ready_callback = false; - - int width = 1280, height = 720; }; OutputChannel output_channel[NUM_OUTPUTS]; -- 2.39.2