diff --git a/acinclude.m4 b/acinclude.m4 index 773b41b72..2c9257a51 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -477,17 +477,29 @@ AC_ARG_WITH(boxtype, esac], [BOXTYPE="coolstream"]) AC_ARG_WITH(boxmodel, - [ --with-boxmodel valid for coolstream: nevis, apollo + [ --with-boxmodel valid for coolstream: hd1, hd2 valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025 valid for ipbox: ip200, ip250, ip350, ip400], [case "${withval}" in - nevis|apollo) + hd1|hd2) if test "$BOXTYPE" = "coolstream"; then BOXMODEL="$withval" else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + nevis|apollo) + if test "$BOXTYPE" = "coolstream"; then + if test "$withval" = "nevis"; then + BOXMODEL="hd1" + fi + if test "$withval" = "apollo"; then + BOXMODEL="hd2" + fi + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025) if test "$BOXTYPE" = "dreambox"; then BOXMODEL="$withval" @@ -505,7 +517,7 @@ AC_ARG_WITH(boxmodel, *) AC_MSG_ERROR([unsupported value $withval for --with-boxmodel]) ;; - esac], [BOXMODEL="nevis"] + esac], [BOXMODEL="hd1"] [if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel]) fi]) @@ -520,8 +532,8 @@ AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox") AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream") AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") -AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis") -AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo") +AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1") +AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2") AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500") AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus") @@ -549,10 +561,10 @@ elif test "$BOXTYPE" = "generic"; then fi # TODO: do we need more defines? -if test "$BOXMODEL" = "nevis"; then - AC_DEFINE(BOXMODEL_NEVIS, 1, [coolstream hd1/neo/neo2/zee]) -elif test "$BOXMODEL" = "apollo"; then - AC_DEFINE(BOXMODEL_APOLLO, 1, [coolstream tank]) +if test "$BOXMODEL" = "hd1"; then + AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee]) +elif test "$BOXMODEL" = "hd2"; then + AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zeeČ/link]) elif test "$BOXMODEL" = "dm500"; then AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500]) elif test "$BOXMODEL" = "ip200"; then diff --git a/configure.ac b/configure.ac index b7d8c734f..a895e6bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,7 @@ if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then fi HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private' -if test "$BOXMODEL" = "apollo"; then +if test "$BOXMODEL" = "hd2"; then if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the header file.]) fi diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 26b6f561a..e781d565a 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -12,7 +12,7 @@ install_DATA = \ DejaVuLGCSansMono-Bold.ttf \ tuxtxt.otb -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 #install_DATA += UnDotum.ttf endif diff --git a/src/Makefile.am b/src/Makefile.am index aaf95490f..cf70612f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 MTDUTILSLIBS = \ system/mtdutils/libneutrino_system_mtdutils.a \ system/mtdutils/lib/libneutrino_system_mtdutils_lib.a @@ -145,14 +145,14 @@ if BOXTYPE_COOL neutrino_LDADD += -lcoolstream-mt -lca-sc if ENABLE_TMSDK else -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 neutrino_LDADD += -lca-ci -llnxtmvssUsr -llnxUKAL -llnxplatUsr -llnxtmasUsr -llnxdvbciUsr -llnxpvrUsr -llnxcssUsr -llnxnotifyqUsr -ltmpvrDataManager-cst -ltmpvrIndexStorage -llnxscsUsr else neutrino_LDADD += -lnxp endif endif -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 neutrino_LDADD += -liconv endif diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 393a5bf8e..b915465ee 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -46,7 +46,7 @@ libneutrino_driver_a_SOURCES = \ volume.cpp if BOXTYPE_COOL -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 libneutrino_driver_a_SOURCES += \ fb_accel_cs_hd2.cpp \ vfd.cpp diff --git a/src/driver/audiometadata.cpp b/src/driver/audiometadata.cpp index c94689be1..7dbe1bd08 100644 --- a/src/driver/audiometadata.cpp +++ b/src/driver/audiometadata.cpp @@ -40,7 +40,8 @@ // constructor CAudioMetaData::CAudioMetaData() { - clear(); + cover_temporary = false; + clear(); } // destructor diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp index a7bd27acf..3af188521 100644 --- a/src/driver/fade.cpp +++ b/src/driver/fade.cpp @@ -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 diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 8f90a29b9..93666f32b 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -124,10 +124,10 @@ CFrameBuffer* CFrameBuffer::getInstance() frameBuffer = new CFbAccelSTi(); #endif #if HAVE_COOL_HARDWARE -#ifdef BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 frameBuffer = new CFbAccelCSHD1(); #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 frameBuffer = new CFbAccelCSHD2(); #endif #endif @@ -516,7 +516,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) diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h index 0506795e0..b5f26da70 100644 --- a/src/driver/fb_generic.h +++ b/src/driver/fb_generic.h @@ -184,7 +184,7 @@ class CFrameBuffer : public sigc::trackable bool getActive() const; // is framebuffer active? void setActive(bool enable); // is framebuffer active? -#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 virtual void setupGXA() {}; virtual void add_gxa_sync_marker() {}; #endif diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 92f61fbbb..58dc8b392 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -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 @@ -588,7 +588,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 @@ -741,7 +741,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) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index eeb4cbfb6..477c6fb99 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef FBV_SUPPORT_GIF extern int fh_gif_getsize (const char *, int *, int *, int, int); @@ -168,7 +169,11 @@ bool CPictureViewer::DecodeImage (const std::string & _name, bool showBusySign, free (m_NextPic_Buffer); m_NextPic_Buffer = NULL; } - m_NextPic_Buffer = (unsigned char *) malloc (x * y * 3); + size_t bufsize = x * y * 3; + if (!checkfreemem(bufsize)){ + return false; + } + m_NextPic_Buffer = (unsigned char *) malloc (bufsize); if (m_NextPic_Buffer == NULL) { dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: malloc, %s\n", __func__, __LINE__, strerror(errno)); return false; @@ -443,7 +448,12 @@ void CPictureViewer::showBusy (int sx, int sy, int width, char r, char g, char b free (m_busy_buffer); m_busy_buffer = NULL; } - m_busy_buffer = (unsigned char *) malloc (width * width * cpp); + size_t bufsize = width * width * cpp; + if (!checkfreemem(bufsize)){ + cs_free_uncached (fb_buffer); + return; + } + m_busy_buffer = (unsigned char *) malloc (bufsize); if (m_busy_buffer == NULL) { dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: malloc\n", __func__, __LINE__); cs_free_uncached (fb_buffer); @@ -687,9 +697,13 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width, mode_str = "getIcon"; fh = fh_getsize(name.c_str(), &x, &y, INT_MAX, INT_MAX); + size_t bufsize = x * y * 4; + if (!checkfreemem(bufsize)) + return NULL; + if (fh) { - buffer = (unsigned char *) malloc(x * y * 4); + buffer = (unsigned char *) malloc(bufsize);//x * y * 4 if (buffer == NULL) { dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] mode %s: Error: malloc\n", __func__, __LINE__, mode_str.c_str()); @@ -710,6 +724,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width, if((GetImage) && (*width < 1 || *height < 1)){ dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] mode: %s, file: %s (Pos: %d %d, Dim: %d x %d)\n", __func__, __LINE__, mode_str.c_str(), name.c_str(), x, y, *width, *height); free(buffer); + buffer = NULL; return NULL; } // resize only getImage @@ -732,9 +747,11 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width, }else{ dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] mode %s: Error decoding file %s\n", __func__, __LINE__, mode_str.c_str(), name.c_str()); free(buffer); + buffer = NULL; return NULL; } free(buffer); + buffer = NULL; }else dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] mode: %s, file: %s Error: %s, buffer = %p (Pos: %d %d, Dim: %d x %d)\n", __func__, __LINE__, mode_str.c_str(), name.c_str(), strerror(errno), buffer, x, y, *width, *height); return ret; @@ -755,12 +772,15 @@ unsigned char * CPictureViewer::int_Resize(unsigned char *orgin, int ox, int oy, unsigned char * cr; if(dst == NULL) { - cr = (unsigned char*) malloc(dx * dy * ((alpha) ? 4 : 3)); - + size_t bufsize = dx * dy * ((alpha) ? 4 : 3); + if (!checkfreemem(bufsize)){ + return orgin; + } + cr = (unsigned char*) malloc(bufsize); if(cr == NULL) { dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Resize Error: malloc\n", __func__, __LINE__); - return(orgin); + return orgin; } }else cr = dst; @@ -847,6 +867,7 @@ unsigned char * CPictureViewer::int_Resize(unsigned char *orgin, int ox, int oy, } } free(orgin); + orgin = NULL; return(cr); } @@ -859,3 +880,14 @@ unsigned char * CPictureViewer::ResizeA(unsigned char *orgin, int ox, int oy, in { return int_Resize(orgin, ox, oy, dx, dy, COLOR, NULL, true); } + +bool CPictureViewer::checkfreemem(size_t bufsize) +{ + struct sysinfo info; + sysinfo( &info ); + 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; + } + return true; +} diff --git a/src/driver/pictureviewer/pictureviewer.h b/src/driver/pictureviewer/pictureviewer.h index 100441b6f..95e8aa9cc 100644 --- a/src/driver/pictureviewer/pictureviewer.h +++ b/src/driver/pictureviewer/pictureviewer.h @@ -115,6 +115,7 @@ class CPictureViewer void add_format(int (*picsize)(const char *,int *,int*,int,int),int (*picread)(const char *,unsigned char **,int*,int*), int (*id)(const char*)); unsigned char * int_Resize(unsigned char *orgin, int ox, int oy, int dx, int dy, ScalingMode type, unsigned char * dst, bool alpha); fb_pixel_t * int_getImage(const std::string & name, int *width, int *height, bool GetImage); + bool checkfreemem(size_t bufsize); }; diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 0f7869e43..5c6458506 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -39,7 +39,7 @@ #include #include -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H #include #endif diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp index b6b2fafdc..98b873ca0 100644 --- a/src/driver/screenshot.cpp +++ b/src/driver/screenshot.cpp @@ -77,7 +77,7 @@ bool CScreenShot::GetData() bool res = false; mutex.lock(); -#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 CFrameBuffer::getInstance()->setActive(false); #endif if (videoDecoder->getBlank()) @@ -86,7 +86,7 @@ bool CScreenShot::GetData() res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video); #endif -#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 /* sort of hack. GXA used to transfer/convert live image to RGB, * so setup GXA back */ CFrameBuffer::getInstance()->setupGXA(); @@ -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); diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index f52aac789..19cb5e7a3 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -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 } @@ -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_APOLLO +#ifdef BOXMODEL_CS_HD2 if (support_numbers && has_led_segment) ioctl(fd, IOC_FP_SET_COLON, 0x00); #endif @@ -819,7 +819,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; diff --git a/src/driver/vfd.h b/src/driver/vfd.h index 5f1c374a7..4a3ec64c0 100644 --- a/src/driver/vfd.h +++ b/src/driver/vfd.h @@ -76,7 +76,7 @@ class CVFD private: -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 fp_display_caps_t caps; #endif MODES mode; diff --git a/src/drivertool.c b/src/drivertool.c index 80432d776..4e753e868 100644 --- a/src/drivertool.c +++ b/src/drivertool.c @@ -32,7 +32,7 @@ #include -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H #include #endif diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp index 9267630da..3ddff948a 100644 --- a/src/eitd/edvbstring.cpp +++ b/src/eitd/edvbstring.cpp @@ -198,7 +198,7 @@ static unsigned long iso6937[96]={ 0x0138, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142, 0x00F8, 0x0153, 0x00DF, 0x00FE, 0x0167, 0x014B, 0x00AD }; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 const unsigned short cGB2312UNI[] = { // Start at 0xA100.so index have to be reduced. Maybe this can be optimized by removing the starts but for // now just 'make it work' :). @@ -2020,7 +2020,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid) { int newtable = 0; bool twochar = false; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 bool gb2312 = false; #endif if (!len) @@ -2070,7 +2070,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid) break; case 0x13: ++i; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 //printf("GB-2312-1980 enc.\n"); gb2312 = true; #endif @@ -2116,7 +2116,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid) //dprintf("recode:::: doVideoTexSuppl code %lX\n", code); } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 // GB2312 -> Unicode if (gb2312 && !code) { if (data[i] >= 0xA1) { diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 27f8cb3a4..848a747e3 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -94,7 +94,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT { 2, LOCALE_AUDIOMENU_MONORIGHT } }; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #define AUDIOMENU_SRS_OPTION_COUNT 3 #else #define AUDIOMENU_SRS_OPTION_COUNT 2 @@ -103,7 +103,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_SRS_OPTIONS[AUDIOMENU_SRS_OPTION_COUN { { 0 , LOCALE_AUDIO_SRS_ALGO_LIGHT }, { 1 , LOCALE_AUDIO_SRS_ALGO_NORMAL }, -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 { 2 , LOCALE_AUDIO_SRS_ALGO_HEAVY } #endif }; @@ -229,7 +229,7 @@ int CAudioSetup::showAudioSetup() audioSettings->addItem(GenericMenuSeparatorLine); audioSettings->addItem(as_oj_srsonoff); audioSettings->addItem(as_oj_algo); -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 audioSettings->addItem(as_oj_noise); #endif audioSettings->addItem(as_oj_volrev); @@ -246,7 +246,7 @@ int CAudioSetup::showAudioSetup() int res = audioSettings->exec(NULL, ""); selected = audioSettings->getSelected(); delete audioSettings; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 delete as_oj_noise; #endif if (!g_settings.easymenu) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 7db8c9910..e0510ec59 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -135,7 +135,7 @@ int CCAMMenuHandler::doMainMenu() cammenu->addItem(ca_init); cammenu->addItem(GenericMenuSeparator); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 int fecount = CFEManager::getInstance()->getFrontendCount(); char fename[fecount+1][255]; #endif @@ -152,7 +152,7 @@ int CCAMMenuHandler::doMainMenu() ci_mode->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CI_MODE); cammenu->addItem(ci_mode); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 CMenuOptionChooser::keyval_ext feselect[fecount+1]; feselect[0].key = -1; feselect[0].value = NONEXISTANT_LOCALE; diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 78f106b41..ffd0e3b0e 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2698,7 +2698,7 @@ void CChannelList::deleteChannel(bool ask) if (!bouquet || !bouquet->zapitBouquet) return; - if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMsgBox::mbrYes, CMsgBox::mbNoYes)!=CMsgBox::mbrYes) + if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMsgBox::mbrNo, CMsgBox::mbYes|CMsgBox::mbNo)!=CMsgBox::mbrYes) return; bouquet->zapitBouquet->removeService((*chanlist)[selected]->getChannelID()); diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index a303038bc..bcaccf6c7 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -222,7 +222,7 @@ void CComponentsPicture::initCCItem() { float h_ratio = float(height)*100/(float)dy; width = int(h_ratio*(float)dx/100); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (do_scale && (width > 10 || height > 10)) width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; #endif diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 82f33641d..44edbb257 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1825,7 +1825,7 @@ void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool& en case 6: /*DTS*/ if (apidtitle.find("DTS") == std::string::npos) apidtitle.append(" (DTS)"); -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 enabled = false; #endif break; diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp index 18db834ec..f44432096 100644 --- a/src/gui/pluginlist.cpp +++ b/src/gui/pluginlist.cpp @@ -77,7 +77,7 @@ int CPluginList::run() g_PluginList->startPlugin(number); if (!g_PluginList->getScriptOutput().empty()) { hide(); - ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL); + ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]); } return menu_return::RETURN_REPAINT; } diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 045314860..cc3ef8990 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -93,7 +93,7 @@ extern int allow_flash; #define FILEBROWSER_UPDATE_FILTER "img" #define MTD_OF_WHOLE_IMAGE 0 -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd0" #else #define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd3" @@ -353,7 +353,7 @@ bool CFlashUpdate::selectHttpImage(void) newVersion = versions[selected]; file_md5 = md5s[selected]; fileType = fileTypes[selected]; -//NI #ifdef BOXMODEL_APOLLO +//NI #ifdef BOXMODEL_CS_HD2 #if 0 if(fileType < '3') { int esize = CMTDInfo::getInstance()->getMTDEraseSize(sysfs); @@ -596,7 +596,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) #endif if(fileType < '3') { //flash it... -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 if (g_settings.apply_settings) { if (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_APPLY_SETTINGS), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) == CMsgBox::mbrYes) if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE)) { @@ -664,7 +664,7 @@ CFlashExpert::CFlashExpert() { selectedMTD = -1; width = 40; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 forceOtherFilename = false; otherFilename = ""; createimage_other = 0; @@ -681,7 +681,7 @@ CFlashExpert* CFlashExpert::getInstance() bool CFlashExpert::checkSize(int mtd, std::string &backupFile) { -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 if (mtd < 0) return false; #endif char errMsg[1024] = {0}; @@ -695,7 +695,7 @@ bool CFlashExpert::checkSize(int mtd, std::string &backupFile) uint64_t btotal = 0, bused = 0; long bsize = 0; uint64_t backupRequiredSize = 0; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (mtd == -1) { // check disk space for image creation if (!get_fs_usage("/", btotal, bused, &bsize)) { snprintf(errMsg, sizeof(errMsg)-1, g_Locale->getText(LOCALE_FLASHUPDATE_READ_VOLUME_ERROR), "root0"); @@ -731,7 +731,7 @@ bool CFlashExpert::checkSize(int mtd, std::string &backupFile) return true; } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 bool CFlashExpert::readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable) { FILE *fd = fopen(devtableFile.c_str(), "r"); @@ -815,7 +815,7 @@ void CFlashExpert::readmtd(int preadmtd) netGetHostname(hostName); std::string timeStr = getNowTimeStr("_%Y%m%d_%H%M"); std::string tankStr = ""; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 int eSize = CMTDInfo::getInstance()->getMTDEraseSize(CMTDInfo::getInstance()->findMTDsystem()); if (preadmtd == 0) { if (createimage_other == 0) { @@ -833,7 +833,7 @@ void CFlashExpert::readmtd(int preadmtd) else filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + tankStr + ".img"; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 std::string title = " (" + CMTDInfo::getInstance()->getMTDName(preadmtd) + ")"; std::string mountp = getJFFS2MountPoint(preadmtd); if (preadmtd == 0) { @@ -857,7 +857,7 @@ void CFlashExpert::readmtd(int preadmtd) } bool skipCheck = false; -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 if ((std::string)g_settings.update_dir == "/tmp") skipCheck = true; #else @@ -885,7 +885,7 @@ void CFlashExpert::readmtd(int preadmtd) sprintf(message, g_Locale->getText(LOCALE_FLASHUPDATE_SAVESUCCESS), filename.c_str()); sleep(1); hide(); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (!forceOtherFilename) ShowHint(LOCALE_MESSAGEBOX_INFO, message); #else @@ -947,7 +947,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey) for(int lx=0;lxgetMTDCount();lx++) { char sActionKey[20]; bool enabled = true; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 // disable write uboot / uldr / env if ((actionkey == "writemtd") && (lx == mtdInfo->findMTDNumberFromName("u-boot") || lx == mtdInfo->findMTDNumberFromName("uldr") || @@ -970,7 +970,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey) sprintf(sActionKey, "%s%d", actionkey.c_str(), lx); mtdselector->addItem(new CMenuForwarder(mtdInfo->getMTDName(lx).c_str(), enabled, NULL, this, sActionKey, CRCInput::convertDigitToKey(shortcut++))); } -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 if (actionkey == "writemtd") mtdselector->addItem(new CMenuForwarder("systemFS with settings", true, NULL, this, "writemtd10", CRCInput::convertDigitToKey(shortcut++))); #endif @@ -1059,7 +1059,7 @@ int CFlashExpert::exec(CMenuTarget* parent, const std::string & actionKey) return res; } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 CFlashExpertSetup::CFlashExpertSetup() { width = 40; @@ -1227,4 +1227,4 @@ g_settings.flashupdate_createimage_add_spare = 0; cfe->createimage_other = 0; return res; } -#endif // BOXMODEL_APOLLO +#endif // BOXMODEL_CS_HD2 diff --git a/src/gui/update.h b/src/gui/update.h index 7de87180a..f15925f19 100644 --- a/src/gui/update.h +++ b/src/gui/update.h @@ -38,7 +38,8 @@ #include -#ifdef BOXMODEL_APOLLO +#include +#ifdef BOXMODEL_CS_HD2 #include #endif @@ -81,13 +82,13 @@ class CFlashExpert : public CProgressWindow int showFileSelector(const std::string & actionkey); bool checkSize(int mtd, std::string &backupFile); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 bool readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable); void readmtdJFFS2(std::string &filename, std::string title="", std::string path="/", bool makeDevTable=true); #endif public: -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 bool forceOtherFilename; std::string otherFilename; int createimage_other; @@ -100,7 +101,7 @@ class CFlashExpert : public CProgressWindow }; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 class CFlashExpertSetup : public CMenuTarget { private: @@ -115,6 +116,6 @@ class CFlashExpertSetup : public CMenuTarget int exec(CMenuTarget* parent, const std::string &actionKey); }; -#endif // BOXMODEL_APOLLO +#endif // BOXMODEL_CS_HD2 #endif diff --git a/src/gui/update_ext.cpp b/src/gui/update_ext.cpp index f92df2c7d..0792a90f4 100644 --- a/src/gui/update_ext.cpp +++ b/src/gui/update_ext.cpp @@ -233,7 +233,7 @@ bool CExtUpdate::applySettings() if (mtdFilename.empty()) return ErrorReset(0, "error system mtd not found"); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 uint64_t mtdSize = 65536*1024; // FIXME hack, mtd size more than free RAM #else uint64_t mtdSize = mtdInfo->getMTDSize(mtdFilename); diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp index e0af074e7..598ecdc10 100644 --- a/src/gui/update_menue.cpp +++ b/src/gui/update_menue.cpp @@ -124,7 +124,7 @@ int CSoftwareUpdate::showSoftwareUpdate() #endif } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 softUpdate.addItem(GenericMenuSeparatorLine); if (g_settings.easymenu) diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index 9497add6a..1092b54f5 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -131,7 +131,7 @@ int CUpdateSettings::initMenu() CMenuOptionChooser *name_backup = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE2, &g_settings.softupdate_name_mode_backup, SOFTUPDATE_NAME_MODE2_OPTIONS, SOFTUPDATE_NAME_MODE2_OPTION_COUNT, true); // name_backup->setHint("", LOCALE_MENU_HINT_XXX); -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 CMenuOptionChooser *apply_settings = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_SETTINGS, &g_settings.apply_settings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier); // apply_settings->setHint("", LOCALE_MENU_HINT_XXX); @@ -152,7 +152,7 @@ int CUpdateSettings::initMenu() w_upsettings.addItem(fw_update_dir); w_upsettings.addItem(fw_url); w_upsettings.addItem(name_backup); -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 w_upsettings.addItem(GenericMenuSeparatorLine); w_upsettings.addItem(apply_settings); w_upsettings.addItem(name_apply); diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 5bfeeabe4..6515f171e 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -105,7 +105,7 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/) const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] = { { DISPLAY_AR_MODE_PANSCAN, LOCALE_VIDEOMENU_PANSCAN }, -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 { DISPLAY_AR_MODE_PANSCAN2, LOCALE_VIDEOMENU_PANSCAN2 }, #endif { DISPLAY_AR_MODE_LETTERBOX, LOCALE_VIDEOMENU_LETTERBOX }, @@ -197,7 +197,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" }, { VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" }, { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, #endif { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, @@ -206,7 +206,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" }, { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 { VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" }, { VIDEO_STD_1080P2397, NONEXISTANT_LOCALE, "1080p 23.97Hz"}, { VIDEO_STD_1080P2997, NONEXISTANT_LOCALE, "1080p 29.97Hz"}, @@ -249,7 +249,7 @@ int CVideoSettings::showVideoSetup() } else if (system_rev > 0x06) { -#if defined(BOXMODEL_APOLLO) && defined(ANALOG_MODE) +#if defined(BOXMODEL_CS_HD2) && defined(ANALOG_MODE) vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT, true, this); vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE); #else @@ -277,7 +277,7 @@ int CVideoSettings::showVideoSetup() CMenuOptionChooser * vs_dbdropt_ch = NULL; CMenuForwarder * vs_videomodes_fw = NULL; CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 CMenuForwarder * vs_automodes_fw = NULL; CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS); #endif @@ -296,7 +296,7 @@ int CVideoSettings::showVideoSetup() vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red); vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO); for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++) @@ -325,12 +325,12 @@ int CVideoSettings::showVideoSetup() if (!g_settings.easymenu) { videosetup->addItem(vs_dbdropt_ch); //dbdr options videosetup->addItem(vs_videomodes_fw); //video modes submenue -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 videosetup->addItem(vs_automodes_fw); //video auto modes submenue #endif } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (!g_settings.easymenu) { /* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */ CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this); @@ -373,7 +373,7 @@ void CVideoSettings::setVideoSettings() videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode1); videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode2); #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL); #else unsigned int system_rev = cs_get_revision(); @@ -398,7 +398,7 @@ void CVideoSettings::setVideoSettings() videoDecoder->SetDBDR(g_settings.video_dbdr); CAutoModeNotifier anotify; anotify.changeNotify(NONEXISTANT_LOCALE, 0); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 changeNotify(LOCALE_VIDEOMENU_BRIGHTNESS, NULL); changeNotify(LOCALE_VIDEOMENU_CONTRAST, NULL); changeNotify(LOCALE_VIDEOMENU_SATURATION, NULL); @@ -472,7 +472,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /* setupVideoSystem(true/*ask*/); return true; } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_BRIGHTNESS)) { videoDecoder->SetControl(VIDEO_CONTROL_BRIGHTNESS, g_settings.brightness); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 257125526..b36587e48 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -549,50 +549,57 @@ CMenuGlobal* CMenuGlobal::getInstance() CMenuWidget::CMenuWidget() { - nameString = g_Locale->getText(NONEXISTANT_LOCALE); - name = NONEXISTANT_LOCALE; - iconfile = ""; - selected = -1; + Init("", "", 0, 0); +} + +CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) +{ + Init(g_Locale->getText(Name), Icon, mwidth, w_index); +} + +CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) +{ + Init(Name, Icon, mwidth, w_index); +} + +void CMenuWidget::Init(const std::string &NameString, const std::string &Icon, const int mwidth, const mn_widget_id_t &w_index) +{ + //pos + x = y = 0; + + //caption and icon + nameString = NameString; + iconfile = Icon; + + //basic attributes iconOffset = 0; offx = offy = 0; from_wizard = SNeutrinoSettings::WIZARD_OFF; fade = true; sb_width = 0; savescreen = false; - background = NULL; preselected = -1; + nextShortcut = 1; + current_page = 0; + has_hints = false; + brief_hints = BRIEF_HINT_NO; + hint_painted = false; + hint_height = 0; + fbutton_count = 0; + fbutton_labels = NULL; + fbutton_width = 0; + fbutton_height = 0; + saveScreen_width = 0; + saveScreen_height = 0; + + //objects + background = NULL; details_line = NULL; info_box = NULL; header = NULL; - nextShortcut = 1; - x = y = 0; -} + frameBuffer = CFrameBuffer::getInstance(); + mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here -CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) -{ - name = Name; - nameString = g_Locale->getText(Name); - preselected = -1; - Init(Icon, mwidth, w_index); -} - -CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) -{ - name = NONEXISTANT_LOCALE; - nameString = Name; - preselected = -1; - Init(Icon, mwidth, w_index); -} - -void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widget_id_t &w_index) -{ - mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here - frameBuffer = CFrameBuffer::getInstance(); - iconfile = Icon; - details_line = NULL; - - info_box = NULL; - header = NULL; //handle select values if(w_index > MN_WIDGET_ID_MAX){ //error @@ -607,40 +614,18 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge //overwrite preselected value with global select value selected = (widget_index == NO_WIDGET_ID ? preselected : mglobal->v_selected[widget_index]); - + //dimension min_width = 0; width = 0; /* is set in paint() */ - - if (mwidth > 100) - { + if (mwidth > 100){ /* warn about abuse until we found all offenders... */ fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth); } - else - { + else{ min_width = frameBuffer->getScreenWidth(true) * mwidth / 100; if(min_width > (int) frameBuffer->getScreenWidth()) min_width = frameBuffer->getScreenWidth(); } - - current_page = 0; - offx = offy = 0; - from_wizard = SNeutrinoSettings::WIZARD_OFF; - fade = true; - savescreen = false; - background = NULL; - has_hints = false; - brief_hints = BRIEF_HINT_NO; - hint_painted = false; - hint_height = 0; - fbutton_count = 0; - fbutton_labels = NULL; - fbutton_width = 0; - fbutton_height = 0; - nextShortcut = 1; - saveScreen_width = 0; - saveScreen_height = 0; - x = y = 0; } void CMenuWidget::move(int xoff, int yoff) @@ -744,8 +729,6 @@ CMenuItem* CMenuWidget::getItem(const uint& item_id) const char *CMenuWidget::getName() { - if (name != NONEXISTANT_LOCALE) - return g_Locale->getText(name); return nameString.c_str(); } diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index de5908e7f..bf784e3cb 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -504,7 +504,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals unsigned int saveScreen_x; protected: std::string nameString; - neutrino_locale_t name; + CFrameBuffer *frameBuffer; std::vector items; std::vector page_start; @@ -544,7 +544,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals bool washidden; int nextShortcut; - void Init(const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index); + void Init(const std::string &NameString, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index); virtual void paintItems(); void checkHints(); void calcSize(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f141f2cba..f6534d3a8 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -970,7 +970,7 @@ int CNeutrinoApp::loadSetup(const char * fname) erg = 2; } -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 g_settings.brightness = configfile.getInt32("brightness", 0); g_settings.contrast = configfile.getInt32("contrast", 0); g_settings.saturation = configfile.getInt32("saturation", 0); @@ -1545,7 +1545,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("window_size", g_settings.window_size); configfile.setInt32("window_width", g_settings.window_width); configfile.setInt32("window_height", g_settings.window_height); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 configfile.setInt32("brightness", g_settings.brightness ); configfile.setInt32("contrast", g_settings.contrast ); configfile.setInt32("enable_sd_osd", g_settings.enable_sd_osd ); diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index 0a0ccec47..339d579a6 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -863,7 +863,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) if( boxname == "Armas ") boxname += "TripleDragon"; break; -#ifdef BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 case 6: boxname += "HD1"; break; @@ -879,7 +879,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) boxname += "Zee"; break; #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 case 9: boxname += "Tank"; break; @@ -918,7 +918,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string) switch(system_rev) { -#ifdef BOXMODEL_NEVIS +#ifdef BOXMODEL_CS_HD1 case 6: case 7: case 8: @@ -926,7 +926,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string) boxmodel = "Nevis"; break; #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 case 9: boxmodel = "Apollo"; break; diff --git a/src/system/Makefile.am b/src/system/Makefile.am index c0c5df8eb..4fdf2e4d7 100644 --- a/src/system/Makefile.am +++ b/src/system/Makefile.am @@ -1,4 +1,4 @@ -if BOXMODEL_APOLLO +if BOXMODEL_CS_HD2 SUBDIRS = mtdutils endif diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp index a211a1a47..a94cdca80 100644 --- a/src/system/flashtool.cpp +++ b/src/system/flashtool.cpp @@ -181,7 +181,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra std::string flashfile; bool skipCopy = false; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (strcmp(dn, "/tmp") != 0) { uint64_t btotal = 0, bused = 0; long bsize = 0; @@ -705,7 +705,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename ) std::string CMTDInfo::findMTDsystem() { -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 std::string sysfs = "root0"; #else std::string sysfs = "systemFS"; diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 9e8472124..a096b68e4 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -538,7 +538,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK CServiceManager::getInstance()->SatelliteList().clear(); CZapit::getInstance()->LoadSettings(); CZapit::getInstance()->GetConfig(zapitCfg); -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 /* flag file to erase /var partition on factory reset, will be done by init scripts */ FILE * fp = fopen("/var_init/etc/.reset", "w"); @@ -576,7 +576,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK void CFanControlNotifier::setSpeed(unsigned int speed) { printf("FAN Speed %d\n", speed); -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 int cfd = open("/dev/cs_control", O_RDONLY); if(cfd < 0) { perror("Cannot open /dev/cs_control"); @@ -617,7 +617,7 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi memset(modes, 0, sizeof(int)*VIDEO_STD_MAX+1); for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i]; #else modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i]; diff --git a/src/system/settings.h b/src/system/settings.h index 18cadd992..8f6babd87 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -42,7 +42,7 @@ #include #include -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16 #else #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12 @@ -181,7 +181,7 @@ struct SNeutrinoSettings int analog_mode1; int analog_mode2; int video_43mode; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 int brightness; int contrast; int saturation; diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index b95c7185e..15c9e26f9 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -315,7 +315,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start if (channel_map.size() > 1) list = CCam::CAPMT_ADD; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 INFO(" ##NI: channel_map.size() %d\n",channel_map.size()); int ci_use_count = 0; for (it = channel_map.begin(); it != channel_map.end(); ++it) @@ -375,7 +375,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start void CCamManager::SetCITuner(int tuner) { tunerno = tuner; -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (tunerno >= 0) cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)tunerno); #endif diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index dcad640e0..f0b5b5599 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -308,7 +308,7 @@ void CFrontend::getFEInfo(void) switch (info.type) { case FE_QPSK: deliverySystemMask |= DVB_S; -#ifndef BOXMODEL_NEVIS +#ifndef BOXMODEL_CS_HD1 if (info.caps & FE_CAN_2G_MODULATION) #endif deliverySystemMask |= DVB_S2; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index d6e2261ab..807589b9f 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -583,7 +583,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay StopPip(); #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 if (CCamManager::getInstance()->GetCITuner() < 0) cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)live_fe->getNumber()); #endif @@ -2361,7 +2361,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) /* FIXME until proper demux management */ int dnum = 1; #endif -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 videoDecoder = cVideo::GetDecoder(0); audioDecoder = cAudio::GetDecoder(0);