Remove the now unused preview size setting.

diff --git a/glwidget.cpp b/glwidget.cpp
index 9088742bdf0e7085fc19bb1e70cb1dca9b2e6090..9725210622ea04150b4b85386a7d55112abfbc72 100644 (file)
--- 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 1ac5d53ee03e40484194f8f3039c10233f547f12..651b4596daeb84c6cf6e32d9d74f4cfe79d43ae0 100644 (file)
--- 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 f2f9f7aecef7570fe1ccb47ae8adff56ef2a76be..cde9a2fef11ff613c660da3134343715161be83f 100644 (file)
--- 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 <frame_mutex>
                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];