mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Conflicts:
      src/driver/screenshot.h
      src/driver/screenshot.cpp
      acinclude.m4
This commit is contained in:
M. Liebmann
2017-03-17 12:43:25 +01:00
parent b190e0c4ff ad47a5d5e9
commit e83a255e95
4 changed files with 87 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/screenshot.h
View File

@@ -2,6 +2,7 @@
Neutrino-GUI - DBoxII-Project
Copyright (C) 2011 CoolStream International Ltd
Copyright (C) 2017 M. Liebmann (micha-bbg)
License: GPLv2
@@ -22,9 +23,9 @@
#ifndef __screenshot_h_
#define __screenshot_h_
#include <OpenThreads/Thread>
#include <pthread.h>
class CScreenShot : public OpenThreads::Thread
class CScreenShot
{
public:
typedef enum {
@@ -44,6 +45,9 @@ class CScreenShot : public OpenThreads::Thread
bool get_video;
bool scale_to_video;
FILE *fd;
pthread_t scs_thread;
pthread_mutex_t thread_mutex;
pthread_mutex_t getData_mutex;
bool GetData();
bool OpenFile();
@@ -52,7 +56,12 @@ class CScreenShot : public OpenThreads::Thread
bool SavePng();
bool SaveJpg();
bool SaveBmp();
void run();
bool startThread();
static void* initThread(void *arg);
void runThread();
static void cleanupThread(void *arg);
#ifdef BOXMODEL_CS_HD2
bool mergeOsdScreen(uint32_t dx, uint32_t dy, fb_pixel_t* osdData);
#endif