X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftimecode_renderer.cpp;h=745e6cab1dbea22678654fb7f1e2c5b00339197d;hb=HEAD;hp=7c9db2d7e38a6bdd9c98dcb2130317cfa74ff53c;hpb=8781ee96803331bbfc6d5e4d8d006a215261baea;p=nageru diff --git a/nageru/timecode_renderer.cpp b/nageru/timecode_renderer.cpp index 7c9db2d..23d0f00 100644 --- a/nageru/timecode_renderer.cpp +++ b/nageru/timecode_renderer.cpp @@ -1,14 +1,20 @@ #include "timecode_renderer.h" +#include +#include +#include +#include +#include #include #include #include +#include #include +#include #include #include -#include #include #include #include @@ -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; } @@ -146,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;