mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
This commit is contained in:
vanhofen
2017-09-25 11:41:44 +02:00
parent 0d9a80486a 05d2a7b8b1
commit 3b0222d2d5
15 changed files with 55 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/fb_accel_glfb.cpp
View File

@@ -31,6 +31,7 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <inttypes.h>
#include <glfb.h>
extern GLFramebuffer *glfb;
@@ -115,18 +116,18 @@ void CFbAccelGLFB::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
void CFbAccelGLFB::run()
{
printf(LOGTAG "run start\n");
time_t last_blit = 0;
int64_t last_blit = 0;
blit_pending = false;
blit_thread = true;
blit_mutex.lock();
set_threadname("glfb::autoblit");
while (blit_thread) {
blit_cond.wait(&blit_mutex, blit_pending ? BLIT_INTERVAL_MIN : BLIT_INTERVAL_MAX);
time_t now = time_monotonic_ms();
int64_t now = time_monotonic_ms();
if (now - last_blit < BLIT_INTERVAL_MIN)
{
blit_pending = true;
//printf(LOGTAG "run: skipped, time %ld\n", now - last_blit);
//printf(LOGTAG "run: skipped, time %" PRId64 "\n", now - last_blit);
}
else
{