X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftimecode_renderer.cpp;h=745e6cab1dbea22678654fb7f1e2c5b00339197d;hb=HEAD;hp=2ada19abb910e2381c9fa2eeaf19f56625dd9740;hpb=ebd973909f6985622c1e77753291f84919f5fdf5;p=nageru

diff --git a/nageru/timecode_renderer.cpp b/nageru/timecode_renderer.cpp
index 2ada19a..23d0f00 100644
--- a/nageru/timecode_renderer.cpp
+++ b/nageru/timecode_renderer.cpp
@@ -1,14 +1,20 @@
 #include "timecode_renderer.h"
 
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <time.h>
+#include <epoxy/gl.h>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include <QFont>
 #include <QImage>
+#include <QPaintDevice>
 #include <QPainter>
 
 #include <epoxy/gl.h>
-#include <movit/effect_util.h>
 #include <movit/resource_pool.h>
 #include <movit/util.h>
 #include <sys/time.h>
@@ -25,7 +31,7 @@ TimecodeRenderer::TimecodeRenderer(movit::ResourcePool *resource_pool, unsigned
 {
 	string vert_shader = read_file("timecode.vert", _binary_timecode_vert_data, _binary_timecode_vert_size);
 	string frag_shader;
-	if (global_flags.ten_bit_output) {
+	if (global_flags.bit_depth > 8) {
 		frag_shader = read_file("timecode_10bit.frag", _binary_timecode_10bit_frag_data, _binary_timecode_10bit_frag_size);
 	} else {
 		frag_shader = read_file("timecode.frag", _binary_timecode_frag_data, _binary_timecode_frag_size);
@@ -59,11 +65,11 @@ TimecodeRenderer::TimecodeRenderer(movit::ResourcePool *resource_pool, unsigned
 TimecodeRenderer::~TimecodeRenderer()
 {
 	resource_pool->release_2d_texture(tex);
-        check_error();
+	check_error();
 	resource_pool->release_glsl_program(program_num);
-        check_error();
+	check_error();
 	glDeleteBuffers(1, &vbo);
-        check_error();
+	check_error();
 }
 
 string TimecodeRenderer::get_timecode_text(double pts, unsigned frame_num)
@@ -94,7 +100,7 @@ string TimecodeRenderer::get_timecode_text(double pts, unsigned frame_num)
 	unsigned stream_time_hour = stream_time / 60;
 
 	char timecode_text[512];
-	snprintf(timecode_text, sizeof(timecode_text), "Nageru - %s.%03u UTC - Stream time %02u:%02u:%02u.%03u (frame %u)",
+	snprintf(timecode_text, sizeof(timecode_text), "Nageru " NAGERU_VERSION " - %s.%03u UTC - Stream time %02u:%02u:%02u.%03u (frame %u)",
 		clock_text, msecs, stream_time_hour, stream_time_min, stream_time_sec, stream_time_ms, frame_num);
 	return timecode_text;
 }
@@ -112,6 +118,7 @@ void TimecodeRenderer::render_string_to_buffer(const string &text)
 
 	painter.setPen(Qt::white);
 	QFont font = painter.font();
+	font.setFamily("Noto Sans");
 	font.setPointSize(16);
 	painter.setFont(font);
 
@@ -145,15 +152,15 @@ void TimecodeRenderer::render_buffer_to_fbo(GLuint fbo)
 	check_error();
 
 	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, display_width, height, GL_RED, GL_UNSIGNED_BYTE, image->bits());
-        check_error();
+	check_error();
 
 	glUseProgram(program_num);
 	check_error();
 	glUniform1i(texture_sampler_uniform, 0);
-        check_error();
+	check_error();
 
-        glBindBuffer(GL_ARRAY_BUFFER, vbo);
-        check_error();
+	glBindBuffer(GL_ARRAY_BUFFER, vbo);
+	check_error();
 
 	for (GLint attr_index : { position_attribute_index, texcoord_attribute_index }) {
 		if (attr_index == -1) continue;