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

- rename BOXMODEL_CS => BOXMODEL_CST

Browse Source 
Conflicts:
	data/scripts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/imageinfo_ni.cpp
	src/gui/osd_setup.cpp
	src/gui/update.cpp
	src/gui/update.h
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-03 22:07:12 +02:00
committed by Thilo Graf
parent d29c98d7d5
commit a9882cdc22
34 changed files with 121 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/Makefile.am
View File

@@ -59,7 +59,7 @@ endif
if BOXTYPE_COOL
libneutrino_driver_a_SOURCES += \
fb_accel_cs_hdx.cpp
if BOXMODEL_CS_HD2
if BOXMODEL_CST_HD2
libneutrino_driver_a_SOURCES += \
fb_accel_cs_hd2.cpp \
vfd.cpp

6
src/driver/fade.cpp
View File

@@ -58,7 +58,7 @@ void COSDFader::StartFadeIn()
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue);
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
usleep(60000);
#endif
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -86,7 +86,7 @@ void COSDFader::StopFade()
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
usleep(60000);
#endif
fadeIn = fadeOut = false;
@@ -113,7 +113,7 @@ bool COSDFader::FadeDone()
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
usleep(60000);
#endif
} else

6
src/driver/fb_generic.cpp
View File

@@ -130,10 +130,10 @@ CFrameBuffer* CFrameBuffer::getInstance()
frameBuffer = new CFbAccelSTi();
#endif
#if HAVE_CST_HARDWARE
#ifdef BOXMODEL_CS_HD1
#ifdef BOXMODEL_CST_HD1
frameBuffer = new CFbAccelCSHD1();
#endif
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
frameBuffer = new CFbAccelCSHD2();
#endif
#endif
@@ -542,7 +542,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
int w_align;
int offs_align;
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (_dx%4 != 0) {
w_align = getWidth4FB_HW_ACC(x, _dx, true);
if (w_align < _dx)

2
src/driver/rcinput.cpp
View File

@@ -1796,7 +1796,7 @@ void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms)
std::string path = (*it).path;
if (path == "/tmp/neutrino.input")
continue; /* setting repeat rate does not work here */
#ifdef BOXMODEL_CS_HD1
#ifdef BOXMODEL_CST_HD1
/* this is ugly, but the driver does not support anything advanced... */
if (path == "/dev/input/nevis_ir") {
d_printf("[rcinput:%s] %s(fd %d) using proprietary ioctl\n", __func__, path.c_str(), fd);

2
src/driver/rcinput.h
View File

@@ -42,7 +42,7 @@
#include <OpenThreads/Mutex>
#include <OpenThreads/ScopedLock>
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
#ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
#include <cs_ir_generic.h>
#endif

14
src/driver/screenshot.cpp
View File

@@ -135,7 +135,7 @@ bool CScreenShot::StartSync()
}
#else // SCREENSHOT_INTERNAL
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
bool CScreenShot::mergeOsdScreen(uint32_t dx, uint32_t dy, fb_pixel_t* osdData)
{
@@ -174,7 +174,7 @@ bool CScreenShot::mergeOsdScreen(uint32_t dx, uint32_t dy, fb_pixel_t* osdData)
/* try to get video frame data in ARGB format, restore GXA state */
bool CScreenShot::GetData()
{
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
/* Workaround for broken osd screenshot with new fb driver and 1280x720 resolution */
CFrameBuffer* frameBuffer = CFrameBuffer::getInstance();
fb_pixel_t* screenBuf = NULL;
@@ -198,12 +198,12 @@ bool CScreenShot::GetData()
bool res = false;
pthread_mutex_lock(&getData_mutex);
#ifdef BOXMODEL_CS_HD1
#ifdef BOXMODEL_CST_HD1
CFrameBuffer::getInstance()->setActive(false);
#endif
if (videoDecoder->getBlank())
get_video = false;
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (extra_osd && !get_video) {
uint32_t memSize = xres * yres * sizeof(fb_pixel_t) * 2;
pixel_data = (uint8_t*)cs_malloc_uncached(memSize);
@@ -221,7 +221,7 @@ bool CScreenShot::GetData()
res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
#endif
#ifdef BOXMODEL_CS_HD1
#ifdef BOXMODEL_CST_HD1
/* sort of hack. GXA used to transfer/convert live image to RGB,
* so setup GXA back */
CFrameBuffer::getInstance()->setupGXA();
@@ -234,7 +234,7 @@ bool CScreenShot::GetData()
return false;
}
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (extra_osd && screenBuf) {
printf("[CScreenShot::%s:%d] Merge osd screen to screenshot...", __func__, __LINE__);
mergeOsdScreen(_xres, _yres, screenBuf);
@@ -395,7 +395,7 @@ bool CScreenShot::SavePng()
png_set_compression_level(png_ptr, Z_BEST_SPEED);
png_set_bgr(png_ptr);
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
png_set_invert_alpha(png_ptr);
#endif
png_write_info(png_ptr, info_ptr);

2
src/driver/screenshot.h
View File

@@ -72,7 +72,7 @@ class CScreenShot
void runThread();
static void cleanupThread(void *arg);
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
bool mergeOsdScreen(uint32_t dx, uint32_t dy, fb_pixel_t* osdData);
#endif
#endif // SCREENSHOT_INTERNAL

8
src/driver/vfd.cpp
View File

@@ -70,7 +70,7 @@ CVFD::CVFD()
has_led_segment = false;
}
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (fd >= 0) {
int ret = ioctl(fd, IOC_FP_GET_DISPLAY_CAPS, &caps);
if (ret < 0) {
@@ -370,7 +370,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_CS_HD2
#ifdef BOXMODEL_CST_HD2
ioctl(fd, IOC_FP_SET_COLON, 0x01);
#endif
}
@@ -568,7 +568,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_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (support_numbers && has_led_segment)
ioctl(fd, IOC_FP_SET_COLON, 0x00);
#endif
@@ -823,7 +823,7 @@ void CVFD::ShowNumber(int number)
if (number < 0)
return;
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_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_CS_HD2
#ifdef BOXMODEL_CST_HD2
fp_display_caps_t caps;
#endif
MODES mode;