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

Merge branch 'master' into pu/fb-modules

Browse Source
This commit is contained in:
M. Liebmann
2017-02-12 09:24:08 +01:00
parent 9fdbe0bc68 0d66899cbd
commit 0cb26e6e98
32 changed files with 112 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver/fade.cpp
View File

@@ -55,14 +55,14 @@ void COSDFader::StartFadeIn()
fadeIn = true;
fadeOut = false;
fadeValue = 100;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
#endif
frameBuffer->setBlendLevel(fadeValue);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -79,7 +79,7 @@ bool COSDFader::StartFadeOut()
if ((!fadeOut) && g_settings.widget_fade) {
fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
@@ -93,12 +93,12 @@ void COSDFader::StopFade()
{
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
fadeIn = fadeOut = false;
@@ -124,12 +124,12 @@ bool COSDFader::FadeDone()
fadeValue = max_alpha;
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
} else

6
src/driver/framebuffer.cpp
View File

@@ -63,7 +63,7 @@ extern CPictureViewer * g_PicViewer;
#define BACKGROUNDIMAGEWIDTH 720
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#ifndef FB_HW_ACCELERATION
#define FB_HW_ACCELERATION
#endif
@@ -582,7 +582,7 @@ void CFrameBuffer::setBlendLevel(int level)
if (ioctl(fd, FBIO_SETOPACITY, value))
printf("FBIO_SETOPACITY failed.\n");
#ifndef BOXMODEL_APOLLO
#ifndef BOXMODEL_CS_HD2
if(level == 100) // TODO: sucks.
usleep(20000);
#endif
@@ -735,7 +735,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
int w_align;
int offs_align;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (_dx%4 != 0) {
w_align = GetWidth4FB_HW_ACC(x, _dx, true);
if (w_align < _dx)

2
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -856,7 +856,7 @@ bool CPictureViewer::checkfreemem(size_t bufsize)
{
struct sysinfo info;
sysinfo( &info );
if(bufsize + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
if(bufsize*2 + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: Out of memory\n", __func__, __LINE__);
return false;
}

2
src/driver/rcinput.h
View File

@@ -39,7 +39,7 @@
#include <string>
#include <vector>
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
#include <cs_ir_generic.h>
#endif

2
src/driver/screenshot.cpp
View File

@@ -218,7 +218,7 @@ bool CScreenShot::SavePng()
png_set_compression_level(png_ptr, Z_BEST_SPEED);
png_set_bgr(png_ptr);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
png_set_invert_alpha(png_ptr);
#endif
png_write_info(png_ptr, info_ptr);

8
src/driver/vfd.cpp
View File

@@ -71,7 +71,7 @@ CVFD::CVFD()
has_led_segment = false;
}
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (fd >= 0) {
int ret = ioctl(fd, IOC_FP_GET_DISPLAY_CAPS, &caps);
if (ret < 0) {
@@ -372,7 +372,7 @@ void CVFD::showTime(bool force)
ShowText(timestr);
} else if (support_numbers && has_led_segment) {
ShowNumber((t->tm_hour*100) + t->tm_min);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
ioctl(fd, IOC_FP_SET_COLON, 0x01);
#endif
}
@@ -564,7 +564,7 @@ void CVFD::setMode(const MODES m, const char * const title)
if(fd < 0) return;
// Clear colon in display if it is still there
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (support_numbers && has_led_segment)
ioctl(fd, IOC_FP_SET_COLON, 0x00);
#endif
@@ -815,7 +815,7 @@ void CVFD::ShowNumber(int number)
if (number < 0)
return;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
int ret = ioctl(fd, IOC_FP_SET_NUMBER, number);
if(ret < 0) {
support_numbers = false;

2
src/driver/vfd.h
View File

@@ -76,7 +76,7 @@ class CVFD
private:
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
fp_display_caps_t caps;
#endif
MODES mode;