From 280d7d1db5660a5fe315c2ce1a33fe144abec31c Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 6 Aug 2024 06:41:45 +0200 Subject: [PATCH] dm800se/dm800sev2 added --- acinclude.m4 | 20 +++++++++++++------- src/driver/display.h | 2 +- src/driver/lcdd.cpp | 2 +- src/driver/simple_display.cpp | 2 +- src/gui/bookmarkmanager.cpp | 2 +- src/gui/bouquetlist.cpp | 2 +- src/gui/channellist.cpp | 4 ++-- src/gui/filebrowser.cpp | 2 +- src/gui/miscsettings_menu.cpp | 8 ++++---- src/gui/miscsettings_menu.h | 2 +- src/gui/moviebrowser/mb.cpp | 4 ++-- src/gui/movieplayer.cpp | 4 ++-- src/gui/pictureviewer.cpp | 4 ++-- src/gui/scan.cpp | 4 ++-- src/gui/timerlist.cpp | 2 +- src/gui/upnpbrowser.cpp | 4 ++-- src/gui/vfd_setup.cpp | 10 +++++----- src/gui/widget/keyboard_input.cpp | 2 +- src/gui/widget/menue.cpp | 4 ++-- src/gui/widget/stringinput.cpp | 2 +- src/gui/widget/stringinput_ext.cpp | 6 +++--- src/neutrino.cpp | 26 +++++++++++++------------- src/nhttpd/tuxboxapi/controlapi.cpp | 2 +- src/system/setting_helpers.cpp | 4 ++-- src/system/setting_helpers.h | 2 +- src/system/settings.h | 2 +- src/zapit/src/zapit.cpp | 2 +- 27 files changed, 68 insertions(+), 62 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 7250a9a7b..4341e502b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -319,7 +319,7 @@ AC_ARG_WITH(boxtype, BOXTYPE="armbox" BOXMODEL="$withval" ;; - vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000) + vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000|dm800se|dm800sev2) BOXTYPE="mipsbox" BOXMODEL="$withval" ;; @@ -333,7 +333,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, e4hdultra, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7, dm900, dm920]) -AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm7020hd, dm820, dm7080, dm8000]) +AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm7020hd, dm820, dm7080, dm8000, dm800se, dm800sev2]) AS_HELP_STRING([], [valid for generic: raspi]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|tf7700) @@ -357,7 +357,7 @@ AS_HELP_STRING([], [valid for generic: raspi]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000) + vuduo|vuduo2|vuuno|vuultimo|dm7020hd|dm820|dm7080|dm8000|dm800se|dm800sev2) if test "$BOXTYPE" = "mipsbox"; then BOXMODEL="$withval" else @@ -430,6 +430,8 @@ AM_CONDITIONAL(BOXMODEL_DM7080, test "$BOXMODEL" = "dm7080") AM_CONDITIONAL(BOXMODEL_DM900, test "$BOXMODEL" = "dm900") AM_CONDITIONAL(BOXMODEL_DM920, test "$BOXMODEL" = "dm920") AM_CONDITIONAL(BOXMODEL_DM8000, test "$BOXMODEL" = "dm8000") +AM_CONDITIONAL(BOXMODEL_DM800SE, test "$BOXMODEL" = "dm800se") +AM_CONDITIONAL(BOXMODEL_DM800SEV2, test "$BOXMODEL" = "dm800sev2") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus") @@ -440,9 +442,9 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" = "vuduo4k" -o "$BOXMODEL" = "vuduo4kse" -o "$BOXMODEL" = "vuultimo4k" -o "$BOXMODEL" = "vuzero4k" -o "$BOXMODEL" = "vuuno4kse" -o "$BOXMODEL" = "vuuno4k") AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$BOXMODEL" = "vuduo" -o "$BOXMODEL" = "vuduo2" -o "$BOXMODEL" = "vuuno" -o "$BOXMODEL" = "vuultimo") -AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080" -o "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm800se" -o "$BOXMODEL" = "dm800sev2" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080" -o "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") AM_CONDITIONAL(BOXMODEL_DREAMBOX_ARM, test "$BOXMODEL" = "dm900" -o "$BOXMODEL" = "dm920") -AM_CONDITIONAL(BOXMODEL_DREAMBOX_MIPS, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_MIPS, test "$BOXMODEL" = "dm7020hd" -o "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm800se" -o "$BOXMODEL" = "dm800sev2" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm7080") if test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) @@ -541,6 +543,10 @@ elif test "$BOXMODEL" = "dm920"; then AC_DEFINE(BOXMODEL_DM920, 1, [dm920]) elif test "$BOXMODEL" = "dm8000"; then AC_DEFINE(BOXMODEL_DM8000, 1, [dm8000]) +elif test "$BOXMODEL" = "dm800se"; then + AC_DEFINE(BOXMODEL_DM800SE, 1, [dm800se]) +elif test "$BOXMODEL" = "dm800sev2"; then + AC_DEFINE(BOXMODEL_DM800SEV2, 1, [dm800sev2]) elif test "$BOXMODEL" = "h7"; then AC_DEFINE(BOXMODEL_H7, 1, [h7]) elif test "$BOXMODEL" = "osmio4k"; then @@ -581,7 +587,7 @@ esac # all dreambox BOXMODELs case "$BOXMODEL" in - dm7020hd|dm8000|dm820|dm7080|dm900|dm920) + dm7020hd|dm8000|dm800se|dm800sev2|dm820|dm7080|dm900|dm920) AC_DEFINE(BOXMODEL_DREAMBOX_ALL, 1, [dreambox_all]) ;; esac @@ -595,7 +601,7 @@ esac # all dreambox mips BOXMODELs case "$BOXMODEL" in - dm7020hd|dm8000|dm820|dm7080) + dm7020hd|dm8000|dm800se|dm800sev2|dm820|dm7080) AC_DEFINE(BOXMODEL_DREAMBOX_MIPS, 1, [dreambox_mips]) ;; esac diff --git a/src/driver/display.h b/src/driver/display.h index 1f0d199b9..25575b830 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -3,7 +3,7 @@ #include #endif #if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM7020HD #include #define CVFD CLCD #else diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 5ca12e2ae..089f131b1 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -395,7 +395,7 @@ void CLCD::showTextScreen(const std::string &big, const std::string &small, /*co if (!has_lcd) return; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 // lcd to small +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 // lcd to small showmode = 0x01; #endif diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index bc2517ff1..f1a5e7bcd 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -150,7 +150,7 @@ static void setlcdparam(void) static void replace_umlauts(std::string __attribute__((unused)) &s) { -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUUNO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_E4HDULTRA || BOXMODEL_VUUNO || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 return; #else /* this is crude, it just replaces ÄÖÜ with AOU since the display can't show them anyway */ diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 18fffb0ea..3f73ea706 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -202,7 +202,7 @@ void CBookmarkManager::paintItem(int pos) // LCD Display if (i_selected) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, theBookmark.getName()); #else CVFD::getInstance()->showMenuText(0, theBookmark.getName(), -1, true); // UTF-8 diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index c5274652b..b3b3caa79 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -621,7 +621,7 @@ void CBouquetList::paintItem(int pos) if (i_selected) { if (npos < (int) Bouquets.size()) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lname); #else CVFD::getInstance()->showMenuText(0, lname, -1, true); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index b30f3ca94..52cfc5cb9 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2280,13 +2280,13 @@ void CChannelList::updateVfd() char nameAndDescription[255]; snprintf(nameAndDescription, sizeof(nameAndDescription), "%s - %s", chan->getName().c_str(), p_event->description.c_str()); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameAndDescription); #else CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8 #endif } else -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, chan->getName().c_str()); #else CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8 diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 73338e725..11dd61f04 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1213,7 +1213,7 @@ void CFileBrowser::paintItem(unsigned int pos) actual_file->Name = fname_temp; if (currpos == selected) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str()); #else CVFD::getInstance()->showMenuText(0, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str(), -1, true); // UTF-8 diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 74069fef1..65b013bb7 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -69,7 +69,7 @@ CMiscMenue::CMiscMenue() { width = 40; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO fanNotifier = NULL; #endif sectionsdConfigNotifier = NULL; @@ -279,7 +279,7 @@ int CMiscMenue::showMiscSettingsMenu() int res = misc_menue.exec(NULL, ""); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO delete fanNotifier; fanNotifier = NULL; #endif @@ -310,11 +310,11 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) mc->setHint("", LOCALE_MENU_HINT_CACHE_TXT); ms_general->addItem(mc); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed if (fanNotifier == NULL) fanNotifier = new CFanControlNotifier(); -#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) +#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) || defined (BOXMODEL_DM800SE) || defined (BOXMODEL_DM800SEV2) CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 0, 1, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); #elif BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 10, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index 7263333a2..e6d1b346a 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -36,7 +36,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver { private: -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CFanControlNotifier *fanNotifier; #endif CSectionsdConfigNotifier* sectionsdConfigNotifier; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 5a3757ff5..cd9e45e0b 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1519,7 +1519,7 @@ void CMovieBrowser::refreshLCD(void) if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) return; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_movieSelectionHandler->epgTitle.c_str()); #else CVFD::getInstance()->showMenuText(0, m_movieSelectionHandler->epgTitle.c_str(), -1, true); // UTF-8 @@ -3928,7 +3928,7 @@ int CMenuSelector::paint(bool selected) g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposName, y + height, dx - (stringstartposName - x), optionName, color); if (selected) -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, optionName); #else CVFD::getInstance()->showMenuText(0, optionName, -1, true); // UTF-8 diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index d2f756916..b2f996df2 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -492,7 +492,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime) } // CVFD::getInstance()->setMode(LCD_MODE); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str()); #else CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true); @@ -564,7 +564,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime) break; } lcd += name; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str()); #else CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8); diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index b7638690b..655c88aae 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -792,7 +792,7 @@ void CPictureViewerGui::view(unsigned int index, bool unscaled) m_unscaled = unscaled; selected=index; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str()); #else CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); @@ -847,7 +847,7 @@ void CPictureViewerGui::endView() void CPictureViewerGui::deletePicFile(unsigned int index, bool mode) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str()); #else CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 7c575c2c7..df132eb4c 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -410,7 +410,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); total = data; snprintf(str, sizeof(buffer), "scan: %d/%d", done, total); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); @@ -423,7 +423,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) sprintf(buffer, "%d/%d", done, total); paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); snprintf(str, sizeof(buffer), "scan %d/%d", done, total); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 2f38f368b..8b83b9323 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1392,7 +1392,7 @@ void CTimerList::paintItem(int pos) default: ; } -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, line1.c_str()); #else CVFD::getInstance()->showMenuText(0, line1.c_str(), -1, true); diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index d505f063f..1ae35acc1 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -953,7 +953,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) void CUpnpBrowserGui::paintDeviceInfo() { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_devices[m_selecteddevice].friendlyname.c_str()); #else CVFD::getInstance()->showMenuText(0, m_devices[m_selecteddevice].friendlyname.c_str(), -1, true); @@ -1127,7 +1127,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry) int preferred=entry->preferred; // LCD -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, entry->title.c_str()); #else CVFD::getInstance()->showMenuText(0, entry->title.c_str(), -1, true); diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 7f29cb76a..c08811a4d 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -150,7 +150,7 @@ int CVfdSetup::showSetup() oj = new CMenuOptionChooser("Power LCD"/*LOCALE_LCDMENU_POWER*/, &g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, new CLCDNotifier(), CRCInput::RC_nokey); vfds->addItem(oj); #endif -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 g_settings.lcd_setting[SNeutrinoSettings::LCD_INVERSE] = 0; #else //option invert @@ -167,7 +167,7 @@ int CVfdSetup::showSetup() vfds->addItem(oj); } -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 g_settings.lcd_info_line = 0; g_settings.lcd_scroll = 0; #else @@ -216,7 +216,7 @@ int CVfdSetup::showSetup() vfds->addItem(led_num); } -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_DM800SE && !defined BOXMODEL_DM800SEV2 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 #if ENABLE_LCD4LINUX && ENABLE_GRAPHLCD if (g_settings.glcd_enable != 0 && g_settings.lcd4l_support != 0) { g_settings.glcd_enable = 0; @@ -226,7 +226,7 @@ int CVfdSetup::showSetup() #endif #ifdef ENABLE_LCD4LINUX -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD) +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_DM800SE && !defined BOXMODEL_DM800SEV2 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD) if (g_settings.glcd_enable == 0) #endif { @@ -238,7 +238,7 @@ int CVfdSetup::showSetup() #ifdef ENABLE_GRAPHLCD GLCD_Menu glcdMenu; #ifdef ENABLE_LCD4LINUX -#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 +#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM7020HD && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM7080 && !defined BOXMODEL_DM900 && !defined BOXMODEL_DM920 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_DM800SE && !defined BOXMODEL_DM800SEV2 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 if (g_settings.lcd4l_support == 0) #endif #endif diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 5ae191322..8a0e0381a 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -515,7 +515,7 @@ int CKeyboardInput::exec(CMenuTarget *parent, const std::string &) if (changed) { changed = false; -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, inputString->c_str()); #else CVFD::getInstance()->showMenuText(1, inputString->c_str(), selected + 1); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index eafd38fd0..ec173d0d9 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -223,7 +223,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text, ssize_t len = strlen(left_text) + strlen(right_text) + 2; char str[len]; snprintf(str, len, "%s %s", left_text, right_text); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str); #else CVFD::getInstance()->showMenuText(0, str, -1, true); @@ -235,7 +235,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text, } else { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, left_text); #else CVFD::getInstance()->showMenuText(0, left_text, -1, true); diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index c94ec52d2..6902c4d07 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -436,7 +436,7 @@ int CStringInput::exec(CMenuTarget *parent, const std::string &) frameBuffer->blit(); if (*valueString != dispval) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selected + 1); diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index e35f1b236..33a45309b 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -196,7 +196,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { if (*valueString != dispval) { -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); @@ -238,7 +238,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false); inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); @@ -278,7 +278,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &) { inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false); inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str()); #else CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d395d4196..5abea4ab8 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -338,7 +338,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS} #if USE_STB_HAL -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD ,{ "lcd_epgmode" , 3 /*DEFAULT_LCD_EPGMODE*/ } #else ,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ } @@ -467,7 +467,7 @@ int CNeutrinoApp::loadSetup(const char * fname) if (g_settings.channel_mode_initial_radio > -1) g_settings.channel_mode_radio = g_settings.channel_mode_initial_radio; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO g_settings.fan_speed = configfile.getInt32( "fan_speed", 1); if (g_settings.fan_speed < 1) g_settings.fan_speed = 1; #endif @@ -1305,7 +1305,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "channel_mode_initial", g_settings.channel_mode_initial ); configfile.setInt32( "channel_mode_initial_radio", g_settings.channel_mode_initial_radio ); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO configfile.setInt32( "fan_speed", g_settings.fan_speed); #endif @@ -2586,7 +2586,7 @@ TIMER_START(); powerManager = new cPowerManager; powerManager->Open(); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif @@ -4310,7 +4310,7 @@ void CNeutrinoApp::ExitRun(int exit_code) delete g_RCInput; g_RCInput = NULL; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO CFanControlNotifier::setSpeed(0); #endif @@ -4354,7 +4354,7 @@ void CNeutrinoApp::saveEpg(int _mode) } CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_EPG_SAVING)); #else CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING)); @@ -4502,7 +4502,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) #ifdef ENABLE_GRAPHLCD nGLCD::StandbyMode(true); #endif -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "standby..."); #else CVFD::getInstance()->ShowText("standby..."); @@ -4568,7 +4568,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus(); #endif -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(1); #endif @@ -4584,7 +4584,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) // Active standby off powerManager->SetStandby(false, false); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "resume"); #else CVFD::getInstance()->ShowText("resume"); @@ -4621,7 +4621,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby) } #endif frameBuffer->setActive(true); -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO //fan speed CFanControlNotifier::setSpeed(g_settings.fan_speed); #endif @@ -5056,7 +5056,7 @@ void stop_daemons(bool stopall, bool for_flash) if (for_flash) { CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "Stop daemons..."); #else CVFD::getInstance()->ShowText("Stop daemons..."); @@ -5254,7 +5254,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #else g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play ); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM900 || BOXMODEL_DM920 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_play ); #else g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_pause ); @@ -5640,7 +5640,7 @@ void CNeutrinoApp::CheckFastScan(bool standby, bool reload) } if (standby || (new_fst != scansettings.fst_version)) { CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); -#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM7020HD +#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD)); #else CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD)); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 5f993d549..5b4d09d9c 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -70,7 +70,7 @@ extern CBouquetManager *g_bouquetManager; #define RC_DEVICE "/dev/input/event2" #define RC_DEVICE_FALLBACK "/dev/input/event1" -#elif BOXMODEL_DM8000 || BOXMODEL_DM7020HD || BOXMODEL_DM7080 || BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM920 +#elif BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM7020HD || BOXMODEL_DM7080 || BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM920 #define RC_DEVICE "/dev/input/event1" #define RC_DEVICE_FALLBACK "/dev/input/event4" diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 6b6567688..70ce93e1b 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -643,7 +643,7 @@ int CDataResetNotifier::exec(CMenuTarget * /*parent*/, const std::string &action return ret; } -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO #if HAVE_DUCKBOX_HARDWARE void CFanControlNotifier::setSpeed(unsigned int speed) { @@ -698,7 +698,7 @@ void CFanControlNotifier::setSpeed(unsigned int speed) #else void CFanControlNotifier::setSpeed(unsigned int __attribute__((unused)) speed) { -#if defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) +#if defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM800SE) || defined (BOXMODEL_DM800SEV2) || defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080) int cfd; cfd = open("/proc/stb/fp/fan_vlt", O_WRONLY); if (cfd < 0) diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index f8b6ce95e..1fd574c67 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -148,7 +148,7 @@ class CDataResetNotifier : public CMenuTarget int exec(CMenuTarget *parent, const std::string &actionKey); }; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO class CFanControlNotifier : public CChangeObserver { public: diff --git a/src/system/settings.h b/src/system/settings.h index f9d916469..3b0d1f3c1 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -229,7 +229,7 @@ struct SNeutrinoSettings int infobar_subchan_disp_pos; int infobar_buttons_usertitle; int infobar_analogclock; -#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO +#if BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO int fan_speed; #endif int infobar_show; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index e4089db59..3e64f6f59 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2149,7 +2149,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool __attribute__ ((unused)) blank) if (playbackStopForced) return false; -#if BOXMODEL_DM820 || BOXMODEL_DM7020HD || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM900 || BOXMODEL_DM920 +#if BOXMODEL_DM820 || BOXMODEL_DM7020HD || BOXMODEL_DM7080 || BOXMODEL_DM8000 || BOXMODEL_DM800SE || BOXMODEL_DM800SEV2 || BOXMODEL_DM900 || BOXMODEL_DM920 videoDecoder->Stop(standby ? false : blank); #else videoDecoder->Stop(false);