X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=2c96cf4cfab6668f93f34e190f37b75d3e59891e;hb=3116ceec101f73796bea6ea2bef637c43d64f46a;hp=dee45cd13bc4e99fafd1313265d353c3a707e02f;hpb=4f9314a311de379b105741273a15821da62a75cc;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index dee45cd13..2c96cf4cf 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -194,12 +194,12 @@ static constexpr char fragment_source[] =
 "in vec2 TexCoord;\n"
 "\n"
 "uniform sampler2D texture_sampler;\n"
-/* type = 0: draw border
+/* type = 0: draw outline content rectangle
  * type = 1: draw XYZ image
  * type = 2: draw RGB image
  */
 "uniform int type = 0;\n"
-"uniform vec4 border_colour;\n"
+"uniform vec4 outline_content_colour;\n"
 "uniform mat4 colour_conversion;\n"
 "\n"
 "out vec4 FragColor;\n"
@@ -258,7 +258,7 @@ static constexpr char fragment_source[] =
 "{\n"
 "	switch (type) {\n"
 "		case 0:\n"
-"			FragColor = border_colour;\n"
+"			FragColor = outline_content_colour;\n"
 "			break;\n"
 "		case 1:\n"
 "			FragColor = texture_bicubic(texture_sampler, TexCoord);\n"
@@ -295,18 +295,18 @@ GLVideoView::ensure_context ()
 static constexpr int indices_video_texture = 0;
 /* Offset of subtitle texture triangles in indices */
 static constexpr int indices_subtitle_texture = 6;
-/* Offset of border lines in indices */
-static constexpr int indices_border = 12;
+/* Offset of content outline lines in indices */
+static constexpr int indices_outline_content = 12;
 
 static constexpr unsigned int indices[] = {
 	0, 1, 3, // video texture triangle #1
 	1, 2, 3, // video texture triangle #2
 	4, 5, 7, // subtitle texture triangle #1
 	5, 6, 7, // subtitle texture triangle #2
-	8, 9,    // border line #1
-	9, 10,   // border line #2
-	10, 11,  // border line #3
-	11, 8,   // border line #4
+	8, 9,    // outline content line #1
+	9, 10,   // outline content line #2
+	10, 11,  // outline content line #3
+	11, 8,   // outline content line #4
 };
 
 
@@ -424,7 +424,7 @@ GLVideoView::setup_shaders ()
 
 	_fragment_type = glGetUniformLocation (program, "type");
 	check_gl_error ("glGetUniformLocation");
-	set_border_colour (program);
+	set_outline_content_colour (program);
 
 	auto conversion = dcp::ColourConversion::rec709_to_xyz();
 	boost::numeric::ublas::matrix<double> matrix = conversion.xyz_to_rgb ();
@@ -453,9 +453,9 @@ GLVideoView::setup_shaders ()
 
 
 void
-GLVideoView::set_border_colour (GLuint program)
+GLVideoView::set_outline_content_colour (GLuint program)
 {
-	auto uniform = glGetUniformLocation (program, "border_colour");
+	auto uniform = glGetUniformLocation (program, "outline_content_colour");
 	check_gl_error ("glGetUniformLocation");
 	auto colour = outline_content_colour ();
 	glUniform4f (uniform, colour.Red() / 255.0f, colour.Green() / 255.0f, colour.Blue() / 255.0f, 1.0f);
@@ -494,7 +494,7 @@ GLVideoView::draw ()
 	}
 	if (_viewer->outline_content()) {
 		glUniform1i(_fragment_type, 0);
-		glDrawElements (GL_LINES, 8, GL_UNSIGNED_INT, reinterpret_cast<void*>(indices_border * sizeof(int)));
+		glDrawElements (GL_LINES, 8, GL_UNSIGNED_INT, reinterpret_cast<void*>(indices_outline_content * sizeof(int)));
 		check_gl_error ("glDrawElements");
 	}
 
@@ -517,7 +517,7 @@ GLVideoView::set_image (shared_ptr<const PlayerVideo> pv)
 
 	/** If _optimise_for_j2k is true we render a XYZ image, doing the colourspace
 	 *  conversion, scaling and video range conversion in the GL shader.
-	 *  Othewise we render a RGB image without any shader-side processing.
+	 *  Otherwise we render a RGB image without any shader-side processing.
 	 */
 
 	/* XXX: video range conversion */
@@ -626,9 +626,9 @@ GLVideoView::set_image (shared_ptr<const PlayerVideo> pv)
 		glBufferSubData (GL_ARRAY_BUFFER, 0, video.size(), video.vertices());
 		check_gl_error ("glBufferSubData (video)");
 
-		const auto border = Rectangle(canvas_size, inter_position.x + x_offset, inter_position.y + y_offset, inter_size);
-		glBufferSubData (GL_ARRAY_BUFFER, 8 * 5 * sizeof(float), border.size(), border.vertices());
-		check_gl_error ("glBufferSubData (border)");
+		const auto outline_content = Rectangle(canvas_size, inter_position.x + x_offset, inter_position.y + y_offset, inter_size);
+		glBufferSubData (GL_ARRAY_BUFFER, 8 * 5 * sizeof(float), outline_content.size(), outline_content.vertices());
+		check_gl_error ("glBufferSubData (outline_content)");
 	}
 
 	if (_have_subtitle_to_render) {