From c2d7e36c8f00f24716f5320315532a21b3ee4841 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 25 Jan 2017 21:25:03 -0500
Subject: [PATCH] Ensured logic for whether composite output is in use is
 consistent.

---
 Outputs/CRT/Internals/CRTOpenGL.cpp | 14 +++++++-------
 Outputs/CRT/Internals/CRTOpenGL.hpp |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Outputs/CRT/Internals/CRTOpenGL.cpp b/Outputs/CRT/Internals/CRTOpenGL.cpp
index 82aba1980..2b471fa3d 100644
--- a/Outputs/CRT/Internals/CRTOpenGL.cpp
+++ b/Outputs/CRT/Internals/CRTOpenGL.cpp
@@ -83,6 +83,11 @@ OpenGLOutputBuilder::~OpenGLOutputBuilder()
 	free(rgb_shader_);
 }
 
+bool OpenGLOutputBuilder::get_is_television_output()
+{
+	return output_device_ == Television || !rgb_input_shader_program_;
+}
+
 void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int output_height, bool only_if_dirty)
 {
 	// lock down any other draw_frames
@@ -171,7 +176,7 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
 		{nullptr}
 	};
 
-	RenderStage *active_pipeline = (output_device_ == Television || !rgb_input_shader_program_) ? composite_render_stages : rgb_render_stages;
+	RenderStage *active_pipeline = get_is_television_output() ? composite_render_stages : rgb_render_stages;
 
 	if(array_submission.input_size || array_submission.output_size)
 	{
@@ -428,12 +433,7 @@ void OpenGLOutputBuilder::set_output_shader_width()
 {
 	if(output_shader_program_)
 	{
-		float width = 1.0f;
-		switch(output_device_)
-		{
-			case Television:	width = get_composite_output_width();	break;
-			case Monitor:		width = 1.0f;							break;
-		}
+		const float width = get_is_television_output() ? get_composite_output_width() : 1.0f;
 		output_shader_program_->set_input_width_scaler(width);
 	}
 }
diff --git a/Outputs/CRT/Internals/CRTOpenGL.hpp b/Outputs/CRT/Internals/CRTOpenGL.hpp
index 6341b43bb..b14d49e28 100644
--- a/Outputs/CRT/Internals/CRTOpenGL.hpp
+++ b/Outputs/CRT/Internals/CRTOpenGL.hpp
@@ -96,6 +96,7 @@ class OpenGLOutputBuilder {
 		GLsync fence_;
 		float get_composite_output_width() const;
 		void set_output_shader_width();
+		bool get_is_television_output();
 
 	public:
 		// These two are protected by output_mutex_.