diff --git a/acinclude.m4 b/acinclude.m4 index e0012b781..70ef4ce22 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -561,7 +561,7 @@ elif test "$BOXTYPE" = "tripledragon"; then elif test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) elif test "$BOXTYPE" = "coolstream"; then - AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream]) + AC_DEFINE(HAVE_CST_HARDWARE, 1, [building for a coolstream]) elif test "$BOXTYPE" = "armbox"; then AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox]) elif test "$BOXTYPE" = "mipsbox"; then diff --git a/lib/hardware/audio.h b/lib/hardware/audio.h index 7f2603721..a2d93938f 100644 --- a/lib/hardware/audio.h +++ b/lib/hardware/audio.h @@ -1,8 +1,8 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #elif USE_STB_HAL #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/lib/hardware/ca.h b/lib/hardware/ca.h index 9aaff0f0a..dd9abf66b 100644 --- a/lib/hardware/ca.h +++ b/lib/hardware/ca.h @@ -1,8 +1,8 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #elif USE_STB_HAL #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/lib/hardware/dmx.h b/lib/hardware/dmx.h index 2f1fcc764..20e7553a4 100644 --- a/lib/hardware/dmx.h +++ b/lib/hardware/dmx.h @@ -1,8 +1,8 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #elif USE_STB_HAL #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/lib/hardware/playback.h b/lib/hardware/playback.h index d19148243..735a16103 100644 --- a/lib/hardware/playback.h +++ b/lib/hardware/playback.h @@ -1,8 +1,8 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #elif USE_STB_HAL #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/lib/hardware/record.h b/lib/hardware/record.h index 3ebe5fac4..bb8313153 100644 --- a/lib/hardware/record.h +++ b/lib/hardware/record.h @@ -1,8 +1,8 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #elif USE_STB_HAL #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/lib/hardware/video.h b/lib/hardware/video.h index eed9e9546..8493a1975 100644 --- a/lib/hardware/video.h +++ b/lib/hardware/video.h @@ -1,10 +1,10 @@ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #include #elif USE_STB_HAL #include #include #else -#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/src/driver/audiodec/vis.cpp b/src/driver/audiodec/vis.cpp index 179d817a1..91e4f2015 100644 --- a/src/driver/audiodec/vis.cpp +++ b/src/driver/audiodec/vis.cpp @@ -20,7 +20,7 @@ #include #include -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #endif diff --git a/src/driver/display.h b/src/driver/display.h index f15d7d500..f52c89dec 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -1,5 +1,5 @@ /* helper for different display CVFD implementations */ -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #endif #if HAVE_TRIPLEDRAGON diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp index 0c9ee156e..a23f84bfc 100644 --- a/src/driver/fade.cpp +++ b/src/driver/fade.cpp @@ -29,7 +29,7 @@ #include #include -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #endif @@ -58,7 +58,7 @@ void COSDFader::StartFadeIn() frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha frameBuffer->setBlendLevel(fadeValue); -#if HAVE_SPARK_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) +#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_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_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) +#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_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_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) +#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2)) usleep(60000); #endif } else diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index dfa1c89b9..67399ac63 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -129,7 +129,7 @@ CFrameBuffer* CFrameBuffer::getInstance() #if HAVE_SPARK_HARDWARE frameBuffer = new CFbAccelSTi(); #endif -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #ifdef BOXMODEL_CS_HD1 frameBuffer = new CFbAccelCSHD1(); #endif @@ -1582,7 +1582,7 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode) { if (videoDecoder) { -#if HAVE_COOL_HARDWARE //FIXME: inside libcs no return value available +#if HAVE_CST_HARDWARE //FIXME: inside libcs no return value available videoDecoder->ShowPicture(picture.c_str()); ret = true; #else diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 854fc0f91..f1ab69733 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1403,7 +1403,13 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 if (trkey == rc_last_key) { /* only allow selected keys to be repeated */ if (mayRepeat(trkey, bAllowRepeatLR) || - (g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (g_info.hw_caps->can_shutdown)))) + (g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && +#if HAVE_CST_HARDWARE + (cs_get_revision() > 7) +#else + (g_info.hw_caps->can_shutdown) +#endif + ))) { #ifdef ENABLE_REPEAT_CHECK if (rc_last_repeat_key != trkey) { diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 64f15143c..22d242dcf 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -56,7 +56,7 @@ #include "debug.h" #include -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE #include #endif //#define ENABLE_SDT //FIXME @@ -1517,7 +1517,7 @@ void CTimeThread::run() debug(DEBUG_ERROR, "%s: get DVB time ch 0x%012" PRIx64 " (isOpen %d)", name.c_str(), current_service, isOpen()); int rc = 0; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* libcoolstream does not like the repeated read if the dmx is not yet running * (e.g. during neutrino start) and causes strange openthreads errors which in * turn cause complete malfunction of the dmx, so we cannot use the "speed up diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 983c1e7b5..b30ad0ca0 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -93,7 +93,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT { 1, LOCALE_AUDIOMENU_MONOLEFT }, { 2, LOCALE_AUDIOMENU_MONORIGHT } }; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #ifdef BOXMODEL_CS_HD2 #define AUDIOMENU_SRS_OPTION_COUNT 3 #else @@ -191,7 +191,7 @@ int CAudioSetup::showAudioSetup() //clock rec //CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* only coolstream has SRS stuff, so only compile it there */ //SRS //SRS algo @@ -251,7 +251,7 @@ int CAudioSetup::showAudioSetup() audioSettings->addItem(st); //audioSettings->addItem(as_clockrec); //--------------------------------------------------------- -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* only coolstream has SRS stuff, so only compile it there */ audioSettings->addItem(GenericMenuSeparatorLine); audioSettings->addItem(as_oj_srsonoff); diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp index a965dee44..cb85c684b 100644 --- a/src/gui/components/cc_timer.cpp +++ b/src/gui/components/cc_timer.cpp @@ -71,7 +71,7 @@ void CComponentsTimer::threadCallback(CComponentsTimer *tm) dprintf(DEBUG_DEBUG,"\033[32m[CComponentsTimer] thread [%p] [%s] [%s - %d] loop start \033[0m\n", tm->tm_thread, tm->tn.c_str(), __func__, __LINE__); -#if HAVE_COOL_HARDWARE //time offset +#if HAVE_CST_HARDWARE //time offset const int64_t MAX_COUNT = tm->tm_interval / 10; #else const int64_t MAX_COUNT = tm->tm_interval; diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index 06de5f33b..4934400d1 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -37,7 +37,7 @@ #include #include #include -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #else #include @@ -60,13 +60,28 @@ CInfoMenu::~CInfoMenu() { } -int CInfoMenu::exec(CMenuTarget* parent, const std::string &/*actionKey*/) +int CInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey) { int res = menu_return::RETURN_REPAINT; if (parent != NULL) parent->hide(); + if (actionKey == "cs_get_info") + { +#if HAVE_CST_HARDWARE + char str[1024]; + sprintf(str, "cs_get_revision(): 0x%02X\n", cs_get_revision()); + sprintf(str, "%scs_get_chip_type(): 0x%04X\n", str, cs_get_chip_type()); + ShowMsg(LOCALE_MESSAGEBOX_INFO, str, CMsgBox::mbrBack, CMsgBox::mbBack); + return res; +#endif + } + else if (actionKey == "imageinfo") + { + CImageInfo imageinfo; + return imageinfo.exec(NULL, ""); + } res = showMenu(); return res; diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 6cb547706..57a47f4ca 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -64,7 +64,7 @@ #define RC_HW_SELECT true #else #define RC_HW_SELECT false -#ifdef HAVE_COOL_HARDWARE +#ifdef HAVE_CST_HARDWARE #warning header coolstream/cs_ir_generic.h not found #warning you probably have an old driver installation #warning you´ll be missing the remotecontrol selection feature! diff --git a/src/gui/lua/lua_misc.cpp b/src/gui/lua/lua_misc.cpp index 739f7a568..eb97c5967 100644 --- a/src/gui/lua/lua_misc.cpp +++ b/src/gui/lua/lua_misc.cpp @@ -281,7 +281,7 @@ int CLuaInstMisc::GetRevision(lua_State *L) if (!D) return 0; */ unsigned int rev = 0; std::string hw = ""; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE hw = "Coolstream"; #endif rev = cs_get_revision(); diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 1ee53b343..bee868304 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -164,10 +164,13 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) fw_fileplay_video->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_VIDEO); personalize->addItem(movieplayer_menu, fw_fileplay_video, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY_VIDEO]); +#if !HAVE_CST_HARDWARE //fileplayback audio CMenuForwarder *fw_fileplay_audio = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, true, NULL, &CMoviePlayerGui::getInstance(), "fileplayback_audio", CRCInput::RC_yellow); fw_fileplay_audio->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO); personalize->addItem(movieplayer_menu, fw_fileplay_audio, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY_AUDIO]); +#endif + #if ENABLE_YOUTUBE_PLAYER //ytplayback CMenuForwarder *fw_ytplay = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_settings.youtube_enabled, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_blue); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 6e46a4574..3efef83a9 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -85,7 +85,7 @@ #include #endif -#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +#if HAVE_CST_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #define LCD_MODE CVFD::MODE_MENU_UTF8 #else #define LCD_MODE CVFD::MODE_MOVIE @@ -342,7 +342,7 @@ void CMoviePlayerGui::restoreNeutrino() CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE g_Zapit->unlockPlayBack(); #else CZapit::getInstance()->EnablePlayback(true); @@ -482,7 +482,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) break; } do { -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE is_file_player = true; #endif PlayFile(); @@ -1670,10 +1670,8 @@ void CMoviePlayerGui::PlayFileLoop(void) { bool first_start = true; bool update_lcd = true; -#if 0 neutrino_msg_t lastmsg = 0; -#endif -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE int eof = 0; int eof2 = 0; int position_tmp = 0; @@ -1773,7 +1771,7 @@ void CMoviePlayerGui::PlayFileLoop(void) #ifdef DEBUG printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent); #endif -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* in case ffmpeg report incorrect values */ if(file_prozent > 89 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){ if(position_tmp != position){ @@ -1802,7 +1800,7 @@ void CMoviePlayerGui::PlayFileLoop(void) eof = 0; #endif } -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE else { at_eof = true; @@ -1988,7 +1986,7 @@ void CMoviePlayerGui::PlayFileLoop(void) if (timeshift == TSHIFT_MODE_OFF) callInfoViewer(); } else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) { -#if HAVE_COOL_HARDWARE || HAVE_ARM_HARDWARE +#if HAVE_CST_HARDWARE || HAVE_ARM_HARDWARE if (selectChapter() != 0) #endif handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_bookmark, position); diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp index 07404c322..128c8c911 100644 --- a/src/gui/screensaver.cpp +++ b/src/gui/screensaver.cpp @@ -193,7 +193,7 @@ void CScreenSaver::ScreenSaverPrg(CScreenSaver *scr) scr->paint(); int corr = 1; -#if HAVE_COOL_HARDWARE //time offset +#if HAVE_CST_HARDWARE //time offset corr = 10; #endif int t = 1000/corr * g_settings.screensaver_timeout; //sleep and exit handle @@ -369,11 +369,11 @@ void CScreenSaver::paint() scr_clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]); scr_clock->enableSaveBg(); scr_clock->doPaintBg(false); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE paintImage("blackscreen.jpg", 0, 0, m_frameBuffer->getScreenWidth(true), m_frameBuffer->getScreenHeight(true)); #endif } -#if !HAVE_COOL_HARDWARE +#if !HAVE_CST_HARDWARE #if 0 //example for callback m_frameBuffer->OnFallbackShowFrame.connect(sigc::bind(sigc::mem_fun(CFrameBuffer::getInstance(), &CFrameBuffer::paintBoxRel), diff --git a/src/gui/streaminfo1.cpp b/src/gui/streaminfo1.cpp index 67b642884..2444526d1 100644 --- a/src/gui/streaminfo1.cpp +++ b/src/gui/streaminfo1.cpp @@ -575,7 +575,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) snprintf(buf, sizeof(buf), "%dx%d", xres, yres); g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE //Video SYSTEM ypos += iheight; snprintf(buf, sizeof(buf), "%s:", g_Locale->getText (LOCALE_STREAMINFO_VIDEOSYSTEM)); diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 28306717e..7785e8e6a 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -66,7 +66,7 @@ #include #include -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE extern int cs_test_card(int unit, char * str); #endif @@ -205,7 +205,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE else if (actionKey == "card0") { char str[255]; @@ -1244,7 +1244,7 @@ void CTestMenu::showHWTests(CMenuWidget *widget) widget->addIntroItems(); widget->addItem(new CMenuForwarder("VFD", true, NULL, this, "vfd")); widget->addItem(new CMenuForwarder("Network", true, NULL, this, "network")); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE widget->addItem(new CMenuForwarder("Smartcard 1", true, NULL, this, "card0")); widget->addItem(new CMenuForwarder("Smartcard 2", true, NULL, this, "card1")); #endif diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 0d11ebf55..e1bcb79cd 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -49,7 +49,7 @@ #include "subchannel_select.h" #include "favorites.h" #include "audio_select.h" -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include "streaminfo1.h" #else #include "streaminfo2.h" diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5bcf518ea..a64399797 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2606,7 +2606,7 @@ void CNeutrinoApp::InitSectiondClient() g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME); } -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #endif @@ -2614,7 +2614,7 @@ bool is_wakeup() { bool wakeup = false; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #ifndef FP_IOCTL_CLEAR_WAKEUP_TIMER #define FP_IOCTL_CLEAR_WAKEUP_TIMER 10 #endif @@ -2674,7 +2674,7 @@ int CNeutrinoApp::run(int argc, char **argv) TIMER_START(); cs_api_init(); cs_register_messenger(CSSendMessage); -#if defined(HAVE_COOL_HARDWARE) && defined(ENABLE_CHANGE_OSD_RESOLUTION) +#if defined(HAVE_CST_HARDWARE) && defined(ENABLE_CHANGE_OSD_RESOLUTION) cs_new_auto_videosystem(); #endif @@ -4448,7 +4448,7 @@ void CNeutrinoApp::ExitRun(int exit_code) printf("timer_minutes: %ld\n", timer_minutes); int leds = 0; int bright = 0; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE if (exit_code == CNeutrinoApp::EXIT_SHUTDOWN) { leds = 0x40; diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 06800b951..964956db2 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -59,7 +59,7 @@ extern cVideo * videoDecoder; extern CPlugins *g_Plugins;//for relodplugins extern CBouquetManager *g_bouquetManager; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #define RC_DEVICE "/dev/input/nevis_ir" #elif BOXMODEL_H7 #define RC_DEVICE "/dev/input/event2" diff --git a/src/rcsim.c b/src/rcsim.c index 0240d350e..aae718ce8 100644 --- a/src/rcsim.c +++ b/src/rcsim.c @@ -42,7 +42,7 @@ #if defined(HAVE_DBOX_HARDWARE) #define EVENTDEV "/dev/input/event0" -#elif defined (HAVE_COOL_HARDWARE) +#elif defined (HAVE_CST_HARDWARE) #define EVENTDEV "/dev/input/input0" #else #endif diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 7c7dc652d..6ed30fa28 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -589,7 +589,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK return ret; } -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE void CFanControlNotifier::setSpeed(unsigned int speed) { printf("FAN Speed %d\n", speed); diff --git a/src/zapit/include/zapit/capmt.h b/src/zapit/include/zapit/capmt.h index 4f29f4412..7a21e9d67 100644 --- a/src/zapit/include/zapit/capmt.h +++ b/src/zapit/include/zapit/capmt.h @@ -67,7 +67,7 @@ class CCam : public CBasicClient bool sendMessage(const char * const data, const size_t length, bool update = false); bool makeCaPmt(CZapitChannel * channel, bool add_private, uint8_t list = CAPMT_ONLY, const CaIdVector &caids = CaIdVector()); bool setCaPmt(bool update = false); -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE bool sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type, unsigned char scrambled = 0, casys_map_t camap = std::set(), int mode = 0 , bool enable = false); #else bool sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type); diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index a1c82111e..bdf31f841 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -143,7 +143,7 @@ bool CCam::setCaPmt(bool update) return sendMessage((char *)cabuf, calen, update); } -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE bool CCam::sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type, unsigned char scrambled, casys_map_t camap, int mode, bool enable) { return cCA::GetInstance()->SendCAPMT(tpid, source_demux, camask, @@ -241,12 +241,12 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start //INFO("channel %llx [%s] mode %d %s update %d", channel_id, channel->getName().c_str(), mode, start ? "START" : "STOP", force_update); /* FIXME until proper demux management */ -#if ! HAVE_COOL_HARDWARE && ! HAVE_GENERIC_HARDWARE +#if ! HAVE_CST_HARDWARE && ! HAVE_GENERIC_HARDWARE CFrontend *frontend = CFEManager::getInstance()->getFrontend(channel); #endif switch(mode) { case PLAY: -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE source = DEMUX_SOURCE_0; demux = LIVE_DEMUX; #else @@ -289,7 +289,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start mode, start ? "START" : "STOP", source, oldmask, newmask, force_update, rmode, mp); //INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no"); -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE /* stop decoding if record stops unless it's the live channel. TODO:PIP? */ /* all the modes: RECORD, STREAM, PIP except PLAY now stopping here !! */ if (mode && start == false && source != cDemux::GetSource(0)) { @@ -320,7 +320,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start cam->makeCaPmt(channel, false, list, caids); int len; unsigned char * buffer = channel->getRawPmt(len); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); #else cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); @@ -329,7 +329,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start } } -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE // CI if(oldmask == newmask) { INFO("\033[33m (oldmask == newmask)\033[0m"); @@ -361,7 +361,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start /* FIXME: back to live channel from playback dont parse pmt and call setCaPmt * (see CMD_SB_LOCK / UNLOCK PLAYBACK */ //channel->setRawPmt(NULL);//FIXME -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE StopCam(channel_id, cam); #ifdef BOXMODEL_CS_HD2 // hack for rezaping to the recording channel @@ -435,7 +435,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start cam->makeCaPmt(channel, false, list, caids); int len; unsigned char * buffer = channel->getRawPmt(len); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD); #endif if (tunerno >= 0 && tunerno != cDemux::GetSource(cam->getSource())) { @@ -445,12 +445,12 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start } else if(channel->scrambled) { useCI = true; INFO("CI: use CI for [%s]", channel->getName().c_str()); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); #endif } //list = CCam::CAPMT_MORE; -#if ! HAVE_COOL_HARDWARE +#if ! HAVE_CST_HARDWARE if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start)) { //temp debug output diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index c6393ef18..aee1c048c 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -736,7 +736,7 @@ CFrontend * CFEManager::allocateFE(CZapitChannel * channel, bool forrecord) #else channel->setRecordDemux(frontend->fenumber+1); channel->setPipDemux(frontend->fenumber+1); -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* I don't know if this check is necessary on cs, but it hurts on other hardware */ if(femap.size() > 1) #endif @@ -757,7 +757,7 @@ void CFEManager::setLiveFE(CFrontend * fe) { OpenThreads::ScopedLock m_lock(mutex); livefe = fe; -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE if(femap.size() > 1) #endif cDemux::SetSource(0, livefe->fenumber); diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index cc9eb2daa..50fc6f063 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -79,7 +79,7 @@ extern int zapit_debug; #define FE_COMMON_PROPS 2 #define FE_DVBS_PROPS 6 -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #define FE_DVBS2_PROPS 8 #else #define FE_DVBS2_PROPS 9 @@ -90,28 +90,28 @@ extern int zapit_debug; /* stolen from dvb.c from vlc */ static const struct dtv_property dvbs_cmdargs[] = { - { DTV_CLEAR, {0,0,0}, { 0 },0 }, - { DTV_FREQUENCY, {0,0,0}, { 0 },0 }, - { DTV_MODULATION, {0,0,0}, { QPSK },0 }, - { DTV_INVERSION, {0,0,0}, { INVERSION_AUTO },0 }, - { DTV_SYMBOL_RATE, {0,0,0}, { 27500000 },0 }, - { DTV_DELIVERY_SYSTEM, {0,0,0}, { SYS_DVBS },0 }, - { DTV_INNER_FEC, {0,0,0}, { FEC_AUTO },0 }, - { DTV_TUNE, {0,0,0}, { 0 },0 }, + { DTV_CLEAR, {0,0,0}, { 0 }, 0 }, + { DTV_FREQUENCY, {0,0,0}, { 0 }, 0 }, + { DTV_MODULATION, {0,0,0}, { QPSK }, 0 }, + { DTV_INVERSION, {0,0,0}, { INVERSION_AUTO }, 0 }, + { DTV_SYMBOL_RATE, {0,0,0}, { 27500000 }, 0 }, + { DTV_DELIVERY_SYSTEM, {0,0,0}, { SYS_DVBS }, 0 }, + { DTV_INNER_FEC, {0,0,0}, { FEC_AUTO }, 0 }, + { DTV_TUNE, {0,0,0}, { 0 }, 0 } }; static const struct dtv_property dvbs2_cmdargs[] = { - { DTV_CLEAR, {0,0,0}, { 0 },0 }, - { DTV_FREQUENCY, {}, { 0 },0 }, - { DTV_MODULATION, {}, { PSK_8 } ,0}, - { DTV_INVERSION, {}, { INVERSION_AUTO } ,0}, - { DTV_SYMBOL_RATE, {}, { 27500000 } ,0}, - { DTV_DELIVERY_SYSTEM, {}, { SYS_DVBS2 } ,0}, - { DTV_INNER_FEC, {}, { FEC_AUTO } ,0}, - { DTV_PILOT, {}, { PILOT_AUTO } ,0}, - { DTV_ROLLOFF, {}, { ROLLOFF_AUTO } ,0}, -#if ! HAVE_COOL_HARDWARE - { DTV_STREAM_ID, {}, { NO_STREAM_ID_FILTER } ,0}, + { DTV_CLEAR, {0,0,0}, { 0 }, 0 }, + { DTV_FREQUENCY, {} , { 0 }, 0 }, + { DTV_MODULATION, {} , { PSK_8 }, 0 }, + { DTV_INVERSION, {} , { INVERSION_AUTO }, 0 }, + { DTV_SYMBOL_RATE, {} , { 27500000 }, 0 }, + { DTV_DELIVERY_SYSTEM, {} , { SYS_DVBS2 }, 0 }, + { DTV_INNER_FEC, {} , { FEC_AUTO }, 0 }, + { DTV_PILOT, {} , { PILOT_AUTO }, 0 }, + { DTV_ROLLOFF, {} , { ROLLOFF_AUTO }, 0 }, +#if ! HAVE_CST_HARDWARE + { DTV_STREAM_ID, {} , { NO_STREAM_ID_FILTER }, 0 }, #endif { DTV_TUNE, {}, { 0 } ,0 } }; @@ -1591,10 +1591,11 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p cmdseq.props[MODULATION].u.data = feparams->modulation; cmdseq.props[ROLLOFF].u.data = feparams->rolloff; cmdseq.props[PILOTS].u.data = pilot; -#if ! HAVE_COOL_HARDWARE - cmdseq.props[MIS].u.data = feparams->plp_id | (feparams->pls_code << 8) | (feparams->pls_mode << 26); +#if ! HAVE_CST_HARDWARE + cmdseq.props[MIS].u.data = feparams->plp_id | (feparams->pls_code << 8) | (feparams->pls_mode << 26); #endif - if (zapit_debug) printf("[fe%d/%d] tuner pilot %d (feparams %d)\n", adapter, fenumber, pilot, feparams->pilot); + if (zapit_debug) + printf("[fe%d/%d] tuner pilot %d (feparams %d)\n", adapter, fenumber, pilot, feparams->pilot); } else { memcpy(cmdseq.props, dvbs_cmdargs, sizeof(dvbs_cmdargs)); nrOfProps = FE_DVBS_PROPS; diff --git a/src/zapit/src/scanpmt.cpp b/src/zapit/src/scanpmt.cpp index 592533ec7..c8c4ae7e2 100644 --- a/src/zapit/src/scanpmt.cpp +++ b/src/zapit/src/scanpmt.cpp @@ -397,7 +397,7 @@ int pmt_set_update_filter(CZapitChannel * const channel, int * fd) mask[2] = 0xFF; mask[4] = 0xFF; -#if 0 //HAVE_COOL_HARDWARE +#if 0 //HAVE_CST_HARDWARE printf("[pmt] set update filter, sid 0x%x pid 0x%x version %x\n", channel->getServiceId(), channel->getPmtPid(), channel->getCaPmt()->version_number); filter[3] = (((channel->getCaPmt()->version_number + 1) & 0x01) << 1) | 0x01; mask[3] = (0x01 << 1) | 0x01; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 8625e052b..2e6d5a232 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -55,7 +55,7 @@ #include #include -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE #include #include #include @@ -2294,7 +2294,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) #if ! HAVE_AZBOX_HARDWARE /* start video */ if (video_pid) { - #if HAVE_COOL_HARDWARE + #if HAVE_CST_HARDWARE videoDecoder->Start(0, pcr_pid, video_pid); videoDemux->Start(); #else @@ -2519,7 +2519,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) pipDecoder->SetDemux(pipDemux); #endif #else -#if HAVE_COOL_HARDWARE +#if HAVE_CST_HARDWARE /* work around broken drivers: when starting up with 720p50 image is pink on hd1 */ videoDecoder = new cVideo(VIDEO_STD_1080I50, videoDemux->getChannel(), videoDemux->getBuffer()); videoDecoder->SetVideoSystem(video_mode);